[Issue 10163] Cleanup configure/test integration