Added unit tests for Matcher classes