More tests to try and fix this for windows