Complete should matchers refactor