Fix failing specs for users and annotation_categories controllers