Test updates
Updates after code review
Merge pull request #66 from Metaswitch/hss_overload

[Reviewer: Rob] Hss overload