reorganized test file names