Change unit tests so that they work on Windows as well as Unix