EZP-20438 - Refactired MatcherFactory tests and added tests for ContentMatcherFactory and BlockMatcherFactory