Merge "Increase coverage for Env module"