Add logical or class matcher factory
Add class matcher factory tests