Modified tests to run with windows