Added changed testfiles (new naming conventions)