Fix api_manager failing tests about cohorts