One more rspec matchers fix and a spec fix.