Enhance Testing Environment