Update rspec
Update for rspec deprecations
Use let
Update rspec calls