Make tests pass with new testdata