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

windows test fixes