This *should* make tests pass on windows
Merge pull request #235 from mhaskel/windows_test_fixes

This *should* make tests pass on windows