windows test fixes
Merge pull request #776 from qwcode/win_fixes

windows test fixes