[PATCH conductor 2/3] Update the RSpec and Cucumber tests