Add category set tests