Fix Rspec deprecation warnings when running test

suite.

[ci skip]
Start making tests pass for Rails master 4.2.0.alpha