Windows fixes
Merge pull request #228 from mhaskel/moar_test_fixes

Windows fixes