[3.2] Testing Improvements