Fixing the testsuite for Windows