Issue #3038668 by jibran, andypost, Berdir, amateescu: Fix tests following a change in Drupal 8.7.0: #2976035