[No reviewer] Fix up iFC XML in UTs