Add category column to devicemodel and change testdevices in usage