Fixing test fails on 11.1

This is failing on the block render cache redirect, likely due to changing the block repeatedly in the test class, so the cache redirects somehow aren't invalidated, so it fails with:

User warning: Trying to overwrite a cache redirect with one that has nothing in common, old one at address "languages:language_interface, theme, user.permissions" was pointing to "url.path", new one points to "url.query_args". in Drupal\Core\Cache\VariationCache->set() (line 138 of core/lib/Drupal/Core/Cache/VariationCache.php).

Note: The error message really should use $keys too, right now it's impossible to say *which* cache redirect actually has a redirect problem.

EntityTest (11.x only) is fixed with 🐛 BC layer missing __isset()/__unset() for $entity->original propery Active

Merged.

Automatically closed - issue fixed for 2 weeks with no activity.