Merge pull request #2408 from phkelley/win32_test_fixes

Win32 test fixes