Correct header sorting for testsuite. Required manual patching, so maybe errors...