Fix tests, add categories and subcategories