Update rspec and fix deprecations