updated notifier. updated tests.