Another attempt to fix the windows build,
Wrote some more tests.