[4.0] Testing Improvements