Fix up UTs after removing origin host parameter
Merge branch 'sto563' of github.com:Metaswitch/sprout into sto563