ensure that the env config is not mutated after test
Merge branch 'restore_env_after_test' into adhoc_email