Update to using existing with_clean_env