Make testdata more standard conformant