Add category presence validations. Fix specs.