Wrote notifiers and fixed test