more renaming of test files