refactoring to use predefined matchers