Fixed another Windows bug and added a timeout of 10s to windows unit test