Adds more tests for matchers