[PATCH conductor] Fixing failing rspec tests