Merge "Refactor unit test for Notification Error Handler"