Major Test Environment Section Overhaul