Merge pull request #754 from Masterminds/fix/windows

Fix tests on windows and add win CI testing