Update rspec, tweak expectations.