[PATCH conductor] Fix 3 failing api upstream tests.