Fix up iFC XML in UTs
Merge pull request #710 from Metaswitch/ifc_uts

[No reviewer] Fix up iFC XML in UTs