Fix all deprecation warnings after upgrade to rspec 3