[PATCH 0/2 conductor] fix a few broken tests