Test Ordering Fix

Previously if the environment was overridden, it was not set back to
its original state properly.  This change updates the
application_helper to work properly.

[#69073918]
Merge 69073918-test-ordering-fix to master

[Completes #69073918]