Fix tests to run and pass on windows
Merge pull request #1073 from tefra/fix-tests-under-win

Fix tests to run and pass on windows