Fix fatal typo
Add testcase for matcher and matcher_base_class