Fix deprecation warnings after upgrade to rspec 2.13