Fix UTs
Merge pull request #41 from Metaswitch/fix_uts

[No reviewer] Fix UTs