Updated tests to work on *nix environments