Deal with RSpec deprecations.
Finish RSpec