Fix unit test failures on Windows platform
Merge pull request #101 from chuckdumont/master

Fix unit test failures on Windows platform