Fix issue with changes to jeff gem, and clean up rspec warnings