Add the RSpec collection matchers back in (removed from RSpec 3), and update specs that check the number of errors on an object to use the older and more readable (in my personal opinion) syntax.