Issue #3347181: 10.1.x compatibility: tests are failing against Drupal 10.1.x due to upstream changes