Updated matchers to fix deprecation warnings in RSpec 3