Refactor matcher test suite