Add tests and improve notifiers
Use adapter in notifiers