Made more unit-tests work on Windows