added custom matchers and reduced rubocop offenses