Win fix

This fixes various tests that unnecessarily fail on windows.