Added unit tests for matchers