Use types more
Fix notifier tests
Rename notifier to notification for tests