Changed categorymodel and started testing categorymodel