Send notifications to admins
Correct issues around unit tests, tidy some code