Minor fixes on two tests that are failing on windows.