More test file "cleanup".