Fixes some tests to pass on windows
Merge pull request #335 from oliverh855/master

Fixes some tests to pass on windows