[PATCH conductor 2/2] Cucumber test fixes to match string changes