More test file path fixes