Add equals to Category
Add WhereCategoryIs
Fix broken CategoryTest