Remove deprecated matchers
Fix tests on Rails < 4.1