More test file changes