Rename test files to match naming convention