Various changes to Testdata.java