Fix up UT breakages
Merge pull request #171 from Metaswitch/memento-alarms

[No reviewer] Fix up UT breakages