Minor file name refactoring for tests