patches for tests to support building on windows
patches for tests to support building on windows - cleanup
Merge pull request #26 from DedMaroz/master

building support on windows