shoulda matchers, rspec tweaks