PR #120: Fixing tests from Drupal 8 backports.