Add test for matcher
Fix vital error