More test file updates