Extract matcher specs
Refactor Matcher