Merge "Format regression test files"