Speed up tests on Windows
Merge pull request #155 from schlamar/speed-up-tests

Speed up tests on Windows