Add extra UTs
Merge pull request #25 from Metaswitch/uts

[No reviewer] Add extra UTs