Fix Windows test bots after changing to non-cygwin build