[wip] - more tests pass on windows

Wanna see how these do on appveyor