Add more to environment variable tests