Update testcases to match what is currently output by the CFE