Improve test coverage. Hope the test_file changes work the same on windows.