[PATCH conductor 0/2] Fixes tests to follow string changes