Slightly change file and test names from r85152 to better reflect test (refs #6999)