Changed naming of test output XML files for consistency