NotificationService refactoring + 14 individual test files for
notificaiton work