Updating tests so they can pass on windows also, doesn't affect unix
systems