Commit for adding option to modify env variables from with test cases, UT included.