Update gem deps and fix specs for latest rspec \o/