AutoTestManager improvements