reorganizing testData/ to new model