Fix tests to run and pass on windows