Another attempt to fix unit tests on Windows