Refactored notificaiton tests and controller