Fixed tests for windows