Fix one test on windows, and disable another