Updated tests for Windows