Various UT fixes
Merge pull request #10 from Metaswitch/various-ut-fixes

Reviewer Rob - Various UT fixes