Changed files in testdata directory to conform with changes made previously.