Fixed some tests for Windows