WIP on unit tests and new functionality to set up a notifier