Improved unit-tests on Windows