updates tests and documentation with category support