Updated tests so that they can run under Windows.