Issue #3439905: Fix shortcut tests

Nicolae Procopanrequested to merge
issue/drupal-3439905:3439905-fix-shortcut-tests into 11.x

Closes #3439905

Merge request reports