Issue #3265685: Fix Drupal 9 tests

Jonathan Hedstrom requested to merge issue/message-3265685:3265685-fix-drupal-9 into 8.x-1.x Feb 22, 2022