More readable tests, conforming to *nix standards