Tests pass again, but on windows