Added more test for matchers. Renamed some matchers.