Fixed Windows test issues
Merge pull request #379 from adamwy/windows

Fixed Windows test issues