Fix UTs (broken by interaction between two recent merges)
Merge pull request #256 from Metaswitch/ut_fix

[No review required] Fix UTs (broken by interaction between two recent merges)