Fixed tests for Windows.
Hopefully add AppVeyor support