Add category
Improve tests