Updated to new testfiles