[WIN] - Make all tests pass
Merge pull request #2560 from raytiley/more-win-tests

[WIN] - Make all tests pass