updates in testfiles and headers