Add class matching tests