Correct parsing of testfiles