Improve BaseMatcher spec.