Finish off Cx UTs
Delete old launder_message function (oops) and merge in latest
Merge pull request #48 from Metaswitch/cx_uts_fix_vg

Reviewer AMC/Optional: Finish off Cx UTs