Make tests pass on win.
Merge pull request #2134 from dereuromark/master-test-case

Make tests pass on win.