Made Windows tests match UNIX