Add more tests for matchers