Sensible conversions to new RSpec syntax, keeping "should" matchers