Fixed tests on Windows.
Merge pull request #1045 from schlamar/fix-win-tests

Fixed tests on Windows.