Rspec 3 fixes

We don't specify an rspec version in our Gemfile so here are fixes to make specs run again.