Re: [PATCH 2/4] [cmd] Prevent external env vars causing tests to fail