Issue 3440169: Reapplied changes to tests

Marc-Oliver Teschkerequested to merge
issue/drupal-3440169:3440169-when-using-drupalget-11.0.x into 11.0.x

Closes #3440169

Merge request reports