change Notifier for new logic and add Notifier Test