Create TDD NotificationSystemTest and refactor some class