Rename test files to have more concise names