updated for new tests
Merge branch 'master' of https://github.com/jmaher/alert_manager