Fix windows test failures