[Finishes #58420942] Add a required id and fix a test