removed categories, fixed all specs