Fixed tests for Windows