Add more tests for consumer, change cls_types to cls_type