[BUGFIX] Fix tests according to changes in #57199