Notifier refactor and Specs