Fix failing tests for Notifier