[PATCH Conductor 0/1] Fix api tests upstream