Changing tests to work also on Windows