diff --git a/core/modules/datetime/tests/src/Functional/EntityResource/EntityTest/EntityTestDateonlyTest.php b/core/modules/datetime/tests/src/Functional/EntityResource/EntityTest/EntityTestDateonlyTest.php
index 1051ce4..0fb404d 100644
--- a/core/modules/datetime/tests/src/Functional/EntityResource/EntityTest/EntityTestDateonlyTest.php
+++ b/core/modules/datetime/tests/src/Functional/EntityResource/EntityTest/EntityTestDateonlyTest.php
@@ -7,8 +7,8 @@
 use Drupal\datetime\Plugin\Field\FieldType\DateTimeItem;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\Tests\entity_test\Functional\Rest\EntityTestResourceTestBase;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityTest\EntityTestResourceTestBase;
 use GuzzleHttp\RequestOptions;
 
 /**
diff --git a/core/modules/datetime/tests/src/Functional/EntityResource/EntityTest/EntityTestDatetimeTest.php b/core/modules/datetime/tests/src/Functional/EntityResource/EntityTest/EntityTestDatetimeTest.php
index ffce48c..cdd4d60 100644
--- a/core/modules/datetime/tests/src/Functional/EntityResource/EntityTest/EntityTestDatetimeTest.php
+++ b/core/modules/datetime/tests/src/Functional/EntityResource/EntityTest/EntityTestDatetimeTest.php
@@ -7,8 +7,8 @@
 use Drupal\datetime\Plugin\Field\FieldType\DateTimeItem;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\Tests\entity_test\Functional\Rest\EntityTestResourceTestBase;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityTest\EntityTestResourceTestBase;
 use GuzzleHttp\RequestOptions;
 
 /**
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonAnonTest.php
index 0eae866..eb19bac 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Action;
+namespace Drupal\Tests\system\Functional\Hal;
 
+use Drupal\Tests\system\Functional\Rest\ActionResourceTestBase;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Action\ActionResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonBasicAuthTest.php
index 5a43a5d..7441f6a 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonBasicAuthTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Action;
+namespace Drupal\Tests\system\Functional\Hal;
 
+use Drupal\Tests\system\Functional\Rest\ActionResourceTestBase;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Action\ActionResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonCookieTest.php
index 21f08c5..f013032 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonCookieTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Action;
+namespace Drupal\Tests\system\Functional\Hal;
 
+use Drupal\Tests\system\Functional\Rest\ActionResourceTestBase;
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Action\ActionResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideHalJsonAnonTest.php
index 552437a..d96d8e2 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\BaseFieldOverride;
+namespace Drupal\Tests\Core\Functional\Hal;
 
+use Drupal\Tests\Core\Functional\Rest\BaseFieldOverrideResourceTestBase;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\BaseFieldOverride\BaseFieldOverrideResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideHalJsonBasicAuthTest.php
index ba2249e..3e9c66d 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideHalJsonBasicAuthTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\BaseFieldOverride;
+namespace Drupal\Tests\Core\Functional\Hal;
 
+use Drupal\Tests\Core\Functional\Rest\BaseFieldOverrideResourceTestBase;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\BaseFieldOverride\BaseFieldOverrideResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideHalJsonCookieTest.php
index b05f153..a40e4e3 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideHalJsonCookieTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\BaseFieldOverride;
+namespace Drupal\Tests\Core\Functional\Hal;
 
+use Drupal\Tests\Core\Functional\Rest\BaseFieldOverrideResourceTestBase;
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\BaseFieldOverride\BaseFieldOverrideResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonAnonTest.php
index d0563c0..3069667 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Block;
+namespace Drupal\Tests\block\Functional\Hal;
 
+use Drupal\Tests\block\Functional\Rest\BlockResourceTestBase;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Block\BlockResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonBasicAuthTest.php
index 53bcd3e..f95f6d7 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonBasicAuthTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Block;
+namespace Drupal\Tests\block\Functional\Hal;
 
+use Drupal\Tests\block\Functional\Rest\BlockResourceTestBase;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Block\BlockResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonCookieTest.php
index 494bb4f..87df9ff 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonCookieTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Block;
+namespace Drupal\Tests\block\Functional\Hal;
 
+use Drupal\Tests\block\Functional\Rest\BlockResourceTestBase;
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Block\BlockResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/BlockContent/BlockContentHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/BlockContent/BlockContentHalJsonAnonTest.php
index d4ee9ab..33c1108 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/BlockContent/BlockContentHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/BlockContent/BlockContentHalJsonAnonTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\BlockContent;
+namespace Drupal\Tests\block_content\Functional\Hal;
 
 use Drupal\Core\Cache\Cache;
+use Drupal\Tests\block_content\Functional\Rest\BlockContentResourceTestBase;
 use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\BlockContent\BlockContentResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/BlockContent/BlockContentHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/BlockContent/BlockContentHalJsonBasicAuthTest.php
index 94d3ff4..b9b262e 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/BlockContent/BlockContentHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/BlockContent/BlockContentHalJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\BlockContent;
+namespace Drupal\Tests\block_content\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/BlockContent/BlockContentHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/BlockContent/BlockContentHalJsonCookieTest.php
index 9cc0f25..2446dfb 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/BlockContent/BlockContentHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/BlockContent/BlockContentHalJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\BlockContent;
+namespace Drupal\Tests\block_content\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeHalJsonAnonTest.php
index 006f8fb..3bfff10 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\BlockContentType;
+namespace Drupal\Tests\block_content\Functional\Hal;
 
+use Drupal\Tests\block_content\Functional\Rest\BlockContentTypeResourceTestBase;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\BlockContentType\BlockContentTypeResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeHalJsonBasicAuthTest.php
index 7d392cc..6112c2b 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeHalJsonBasicAuthTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\BlockContentType;
+namespace Drupal\Tests\block_content\Functional\Hal;
 
+use Drupal\Tests\block_content\Functional\Rest\BlockContentTypeResourceTestBase;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\BlockContentType\BlockContentTypeResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeHalJsonCookieTest.php
index 565bcf3..889d775 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeHalJsonCookieTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\BlockContentType;
+namespace Drupal\Tests\block_content\Functional\Hal;
 
+use Drupal\Tests\block_content\Functional\Rest\BlockContentTypeResourceTestBase;
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\BlockContentType\BlockContentTypeResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonAnonTest.php
index 3edd9b1..0ac02d9 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Comment;
+namespace Drupal\Tests\comment\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonBasicAuthTest.php
index 7e2dc57..7d766fd 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Comment;
+namespace Drupal\Tests\comment\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonCookieTest.php
index 292dc94..806cf3f 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Comment;
+namespace Drupal\Tests\comment\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonTestBase.php b/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonTestBase.php
index 1939e04..1d3b7c9 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonTestBase.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonTestBase.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Comment;
+namespace Drupal\Tests\comment\Functional\Hal;
 
 use Drupal\entity_test\Entity\EntityTest;
+use Drupal\Tests\comment\Functional\Rest\CommentResourceTestBase;
 use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Comment\CommentResourceTestBase;
 use Drupal\user\Entity\User;
 
 abstract class CommentHalJsonTestBase extends CommentResourceTestBase {
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/CommentType/CommentTypeHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/CommentType/CommentTypeHalJsonAnonTest.php
index 37cf717..179ae18 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/CommentType/CommentTypeHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/CommentType/CommentTypeHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\CommentType;
+namespace Drupal\Tests\comment\Functional\Hal;
 
+use Drupal\Tests\comment\Functional\Rest\CommentTypeResourceTestBase;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\CommentType\CommentTypeResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/CommentType/CommentTypeHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/CommentType/CommentTypeHalJsonBasicAuthTest.php
index 62b48af..3a014bd 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/CommentType/CommentTypeHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/CommentType/CommentTypeHalJsonBasicAuthTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\CommentType;
+namespace Drupal\Tests\comment\Functional\Hal;
 
+use Drupal\Tests\comment\Functional\Rest\CommentTypeResourceTestBase;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\CommentType\CommentTypeResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/CommentType/CommentTypeHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/CommentType/CommentTypeHalJsonCookieTest.php
index 4a2913b..9d6440e 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/CommentType/CommentTypeHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/CommentType/CommentTypeHalJsonCookieTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\CommentType;
+namespace Drupal\Tests\comment\Functional\Hal;
 
+use Drupal\Tests\comment\Functional\Rest\CommentTypeResourceTestBase;
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\CommentType\CommentTypeResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonAnonTest.php
index dbe2a3d..d874f45 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\ConfigTest;
+namespace Drupal\Tests\config_test\Functional\Hal;
 
+use Drupal\Tests\config_test\Functional\Rest\ConfigTestResourceTestBase;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ConfigTest\ConfigTestResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonBasicAuthTest.php
index 99345ed..01a69c3 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonBasicAuthTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\ConfigTest;
+namespace Drupal\Tests\config_test\Functional\Hal;
 
+use Drupal\Tests\config_test\Functional\Rest\ConfigTestResourceTestBase;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ConfigTest\ConfigTestResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonCookieTest.php
index d892abf..4f02a86 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonCookieTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\ConfigTest;
+namespace Drupal\Tests\config_test\Functional\Hal;
 
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ConfigTest\ConfigTestResourceTestBase;
+use Drupal\Tests\config_test\Functional\Rest\ConfigTestResourceTestBase;
+use Drupal\Tests\rest\Functional\CookieResourceTestTrait;;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonAnonTest.php
index 4152a5f..c548c17 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\ConfigurableLanguage;
+namespace Drupal\Tests\language\Functional\Hal;
 
+use Drupal\Tests\language\Functional\Rest\ConfigurableLanguageResourceTestBase;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ConfigurableLanguage\ConfigurableLanguageResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonBasicAuthTest.php
index dea13fc..3239b7e 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonBasicAuthTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\ConfigurableLanguage;
+namespace Drupal\Tests\language\Functional\Hal;
 
+use Drupal\Tests\language\Functional\Rest\ConfigurableLanguageResourceTestBase;
 use Drupal\Tests\rest\Functional\BasicAuthResourceWithInterfaceTranslationTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ConfigurableLanguage\ConfigurableLanguageResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonCookieTest.php
index 357adc0..9ad7561 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonCookieTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\ConfigurableLanguage;
+namespace Drupal\Tests\language\Functional\Hal;
 
+use Drupal\Tests\language\Functional\Rest\ConfigurableLanguageResourceTestBase;
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ConfigurableLanguage\ConfigurableLanguageResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/ContactForm/ContactFormHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/ContactForm/ContactFormHalJsonAnonTest.php
index 57d6177..e863c97 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ContactForm/ContactFormHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/ContactForm/ContactFormHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\ContactForm;
+namespace Drupal\Tests\contact\Functional\Hal;
 
+use Drupal\Tests\contact\Functional\Rest\ContactFormResourceTestBase;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ContactForm\ContactFormResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/ContactForm/ContactFormHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/ContactForm/ContactFormHalJsonBasicAuthTest.php
index 9aec186..7280cfd 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ContactForm/ContactFormHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/ContactForm/ContactFormHalJsonBasicAuthTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\ContactForm;
+namespace Drupal\Tests\contact\Functional\Hal;
 
+use Drupal\Tests\contact\Functional\Rest\ContactFormResourceTestBase;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ContactForm\ContactFormResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/ContactForm/ContactFormHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/ContactForm/ContactFormHalJsonCookieTest.php
index 0d78991..2592ae7 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ContactForm/ContactFormHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/ContactForm/ContactFormHalJsonCookieTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\ContactForm;
+namespace Drupal\Tests\contact\Functional\Hal;
 
+use Drupal\Tests\contact\Functional\Rest\ContactFormResourceTestBase;
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ContactForm\ContactFormResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsHalJsonAnonTest.php
index e90485d..d5b7947 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\ContentLanguageSettings;
+namespace Drupal\Tests\language\Functional\Hal;
 
+use Drupal\Tests\language\Functional\Rest\ContentLanguageSettingsResourceTestBase;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ContentLanguageSettings\ContentLanguageSettingsResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsHalJsonBasicAuthTest.php
index 71f4fab..61306ea 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsHalJsonBasicAuthTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\ContentLanguageSettings;
+namespace Drupal\Tests\language\Functional\Hal;
 
+use Drupal\Tests\language\Functional\Rest\ContentLanguageSettingsResourceTestBase;
 use Drupal\Tests\rest\Functional\BasicAuthResourceWithInterfaceTranslationTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ContentLanguageSettings\ContentLanguageSettingsResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsHalJsonCookieTest.php
index 4cc572f..63584f6 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsHalJsonCookieTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\ContentLanguageSettings;
+namespace Drupal\Tests\language\Functional\Hal;
 
+use Drupal\Tests\language\Functional\Rest\ContentLanguageSettingsResourceTestBase;
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ContentLanguageSettings\ContentLanguageSettingsResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/DateFormat/DateFormatHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/DateFormat/DateFormatHalJsonAnonTest.php
index 1bd6eb8..4d763cf 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/DateFormat/DateFormatHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/DateFormat/DateFormatHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\DateFormat;
+namespace Drupal\Tests\Core\Functional\Hal;
 
+use Drupal\Tests\Core\Functional\Rest\DateFormatResourceTestBase;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\DateFormat\DateFormatResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/DateFormat/DateFormatHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/DateFormat/DateFormatHalJsonBasicAuthTest.php
index 2627c99..4d6266f 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/DateFormat/DateFormatHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/DateFormat/DateFormatHalJsonBasicAuthTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\DateFormat;
+namespace Drupal\Tests\Core\Functional\Hal;
 
+use Drupal\Tests\Core\Functional\Rest\DateFormatResourceTestBase;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\DateFormat\DateFormatResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/DateFormat/DateFormatHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/DateFormat/DateFormatHalJsonCookieTest.php
index 2367d6c..53b668e 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/DateFormat/DateFormatHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/DateFormat/DateFormatHalJsonCookieTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\DateFormat;
+namespace Drupal\Tests\Core\Functional\Hal;
 
+use Drupal\Tests\Core\Functional\Rest\DateFormatResourceTestBase;
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\DateFormat\DateFormatResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Editor/EditorHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Editor/EditorHalJsonAnonTest.php
index 9b68c54..97d917d 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Editor/EditorHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Editor/EditorHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Editor;
+namespace Drupal\Tests\editor\Functional\Hal;
 
+use Drupal\Tests\editor\Functional\Rest\EditorResourceTestBase;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Editor\EditorResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Editor/EditorHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Editor/EditorHalJsonBasicAuthTest.php
index 9a317a5..05f496b 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Editor/EditorHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Editor/EditorHalJsonBasicAuthTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Editor;
+namespace Drupal\Tests\editor\Functional\Hal;
 
+use Drupal\Tests\editor\Functional\Rest\EditorResourceTestBase;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Editor\EditorResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Editor/EditorHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Editor/EditorHalJsonCookieTest.php
index a59392f..4fe7ec9 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Editor/EditorHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Editor/EditorHalJsonCookieTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Editor;
+namespace Drupal\Tests\editor\Functional\Hal;
 
+use Drupal\Tests\editor\Functional\Rest\EditorResourceTestBase;
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Editor\EditorResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayHalJsonAnonTest.php
index 199d0c2..7eda44d 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityFormDisplay;
+namespace Drupal\Tests\Core\Functional\Hal;
 
+use Drupal\Tests\Core\Functional\Rest\EntityFormDisplayResourceTestBase;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityFormDisplay\EntityFormDisplayResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayHalJsonBasicAuthTest.php
index 7e1bc51..5f58751 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayHalJsonBasicAuthTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityFormDisplay;
+namespace Drupal\Tests\Core\Functional\Hal;
 
+use Drupal\Tests\Core\Functional\Rest\EntityFormDisplayResourceTestBase;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityFormDisplay\EntityFormDisplayResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayHalJsonCookieTest.php
index 5c62956..e6f2379 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayHalJsonCookieTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityFormDisplay;
+namespace Drupal\Tests\Core\Functional\Hal;
 
+use Drupal\Tests\Core\Functional\Rest\EntityFormDisplayResourceTestBase;
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityFormDisplay\EntityFormDisplayResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeHalJsonAnonTest.php
index 3e99823..7fd26f4 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityFormMode;
+namespace Drupal\Tests\Core\Functional\Hal;
 
+use Drupal\Tests\Core\Functional\Rest\EntityFormModeResourceTestBase;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityFormMode\EntityFormModeResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeHalJsonBasicAuthTest.php
index 56d4525..0ea3cb9 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeHalJsonBasicAuthTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityFormMode;
+namespace Drupal\Tests\Core\Functional\Hal;
 
+use Drupal\Tests\Core\Functional\Rest\EntityFormModeResourceTestBase;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityFormMode\EntityFormModeResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeHalJsonCookieTest.php
index a84bf6d..8cea180 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeHalJsonCookieTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityFormMode;
+namespace Drupal\Tests\Core\Functional\Hal;
 
+use Drupal\Tests\Core\Functional\Rest\EntityFormModeResourceTestBase;
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityFormMode\EntityFormModeResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonAnonTest.php
index eff0b97..2012324 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonAnonTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityTest;
+namespace Drupal\Tests\entity_test\Functional\Hal;
 
+use Drupal\Tests\entity_test\Functional\Rest\EntityTestResourceTestBase;
 use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityTest\EntityTestResourceTestBase;
 use Drupal\Tests\rest\Functional\EntityResource\FormatSpecificGetBcRouteTestTrait;
 use Drupal\user\Entity\User;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonBasicAuthTest.php
index 65ad0db..18fad4b 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityTest;
+namespace Drupal\Tests\entity_test\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonCookieTest.php
index efca317..bee58ed 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityTest;
+namespace Drupal\Tests\entity_test\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonInternalPropertyNormalizerTest.php b/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonInternalPropertyNormalizerTest.php
index 819a125..73d70d3 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonInternalPropertyNormalizerTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonInternalPropertyNormalizerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityTest;
+namespace Drupal\Tests\entity_test\Functional\Hal;
 
 use Drupal\Core\Cache\Cache;
 use Drupal\field\Entity\FieldConfig;
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleHalJsonAnonTest.php
index 9e6bcb3..77988aa 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleHalJsonAnonTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityTestBundle;
+namespace Drupal\Tests\entity_test\Functional\Hal;
 
+use Drupal\Tests\entity_test\Functional\Rest\EntityTestBundleResourceTestBase;
 use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityTestBundle\EntityTestBundleResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleHalJsonBasicAuthTest.php
index 09e5970..47e44d2 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleHalJsonBasicAuthTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityTestBundle;
+namespace Drupal\Tests\entity_test\Functional\Hal;
 
+use Drupal\Tests\entity_test\Functional\Rest\EntityTestBundleResourceTestBase;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityTestBundle\EntityTestBundleResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleHalJsonCookieTest.php
index 7f499fa..3e8b442 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleHalJsonCookieTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityTestBundle;
+namespace Drupal\Tests\entity_test\Functional\Hal;
 
+use Drupal\Tests\entity_test\Functional\Rest\EntityTestBundleResourceTestBase;
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityTestBundle\EntityTestBundleResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelHalJsonAnonTest.php
index f95ea5c..ca6e395 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelHalJsonAnonTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityTestLabel;
+namespace Drupal\Tests\entity_test\Functional\Hal;
 
+use Drupal\Tests\entity_test\Functional\Rest\EntityTestLabelResourceTestBase;
 use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityTestLabel\EntityTestLabelResourceTestBase;
 use Drupal\user\Entity\User;
 
 /**
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelHalJsonBasicAuthTest.php
index b3824aa..dfae2e4 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelHalJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityTestLabel;
+namespace Drupal\Tests\entity_test\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelHalJsonCookieTest.php
index fa74cb3..3e37340 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelHalJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityTestLabel;
+namespace Drupal\Tests\entity_test\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayHalJsonAnonTest.php
index 6fbebad..a89d439 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityViewDisplay;
+namespace Drupal\Tests\Core\Functional\Hal;
 
+use Drupal\Tests\Core\Functional\Rest\EntityViewDisplayResourceTestBase;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityViewDisplay\EntityViewDisplayResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayHalJsonBasicAuthTest.php
index 2c894f7..bf9f265 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayHalJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityViewDisplay;
+namespace Drupal\Tests\Core\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayHalJsonCookieTest.php
index b8c7131..d9cc4eb 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayHalJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityViewDisplay;
+namespace Drupal\Tests\Core\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeHalJsonAnonTest.php
index d1d4a74..c873196 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityViewMode;
+namespace Drupal\Tests\Core\Functional\Hal;
 
+use Drupal\Tests\Core\Functional\Rest\EntityViewModeResourceTestBase;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityViewMode\EntityViewModeResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeHalJsonBasicAuthTest.php
index a79c3fd..673da0b 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeHalJsonBasicAuthTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityViewMode;
+namespace Drupal\Tests\Core\Functional\Hal;
 
+use Drupal\Tests\Core\Functional\Rest\EntityViewModeResourceTestBase;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityViewMode\EntityViewModeResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeHalJsonCookieTest.php
index 493de9a..7528297 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeHalJsonCookieTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityViewMode;
+namespace Drupal\Tests\Core\Functional\Hal;
 
+use Drupal\Tests\Core\Functional\Rest\EntityViewModeResourceTestBase;
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityViewMode\EntityViewModeResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonAnonTest.php
index 293b7e4..56f164b 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Feed;
+namespace Drupal\Tests\aggregator\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonBasicAuthTest.php
index c3f91a7..58bb473 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Feed;
+namespace Drupal\Tests\aggregator\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonCookieTest.php
index fb4d64e..dd574d9 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Feed;
+namespace Drupal\Tests\aggregator\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonTestBase.php b/core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonTestBase.php
index 4318132..4089559 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonTestBase.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonTestBase.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Feed;
+namespace Drupal\Tests\aggregator\Functional\Hal;
 
-use Drupal\Tests\rest\Functional\EntityResource\Feed\FeedResourceTestBase;
+use Drupal\Tests\aggregator\Functional\Rest\FeedResourceTestBase;
 use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
 
 abstract class FeedHalJsonTestBase extends FeedResourceTestBase {
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/FieldConfig/FieldConfigHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/FieldConfig/FieldConfigHalJsonAnonTest.php
index 54a418a..2137336 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/FieldConfig/FieldConfigHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/FieldConfig/FieldConfigHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\FieldConfig;
+namespace Drupal\Tests\field\Functional\Hal;
 
+use Drupal\Tests\field\Functional\Rest\FieldConfigResourceTestBase;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\FieldConfig\FieldConfigResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/FieldConfig/FieldConfigHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/FieldConfig/FieldConfigHalJsonBasicAuthTest.php
index 74b60aa..8a299a4 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/FieldConfig/FieldConfigHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/FieldConfig/FieldConfigHalJsonBasicAuthTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\FieldConfig;
+namespace Drupal\Tests\field\Functional\Hal;
 
+use Drupal\Tests\field\Functional\Rest\FieldConfigResourceTestBase;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\FieldConfig\FieldConfigResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/FieldConfig/FieldConfigHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/FieldConfig/FieldConfigHalJsonCookieTest.php
index e6491f4..c9f5ce0 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/FieldConfig/FieldConfigHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/FieldConfig/FieldConfigHalJsonCookieTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\FieldConfig;
+namespace Drupal\Tests\field\Functional\Hal;
 
+use Drupal\Tests\field\Functional\Rest\FieldConfigResourceTestBase;
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\FieldConfig\FieldConfigResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigHalJsonAnonTest.php
index 1b90193..7e74390 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\FieldStorageConfig;
+namespace Drupal\Tests\field\Functional\Hal;
 
+use Drupal\Tests\field\Functional\Rest\FieldStorageConfigResourceTestBase;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\FieldStorageConfig\FieldStorageConfigResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigHalJsonBasicAuthTest.php
index 957e73b..e3c2a3f 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigHalJsonBasicAuthTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\FieldStorageConfig;
+namespace Drupal\Tests\field\Functional\Hal;
 
+use Drupal\Tests\field\Functional\Rest\FieldStorageConfigResourceTestBase;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\FieldStorageConfig\FieldStorageConfigResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigHalJsonCookieTest.php
index 20d47a7..51df456 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigHalJsonCookieTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\FieldStorageConfig;
+namespace Drupal\Tests\field\Functional\Hal;
 
+use Drupal\Tests\field\Functional\Rest\FieldStorageConfigResourceTestBase;
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\FieldStorageConfig\FieldStorageConfigResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/File/FileHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/File/FileHalJsonAnonTest.php
index ffd64ac..6a13100 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/File/FileHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/File/FileHalJsonAnonTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\File;
+namespace Drupal\Tests\file\Functional\Hal;
 
 use Drupal\Core\Cache\Cache;
+use Drupal\Tests\file\Functional\Rest\FileResourceTestBase;
 use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\File\FileResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/File/FileHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/File/FileHalJsonBasicAuthTest.php
index 3b1e3fe..9101071 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/File/FileHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/File/FileHalJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\File;
+namespace Drupal\Tests\file\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/File/FileHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/File/FileHalJsonCookieTest.php
index 8d62372..7069e9b 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/File/FileHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/File/FileHalJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\File;
+namespace Drupal\Tests\file\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonAnonTest.php
index b0d1a61..3a7c633 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\FilterFormat;
+namespace Drupal\Tests\filter\Functional\Hal;
 
+use Drupal\Tests\filter\Functional\Rest\FilterFormatResourceTestBase;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\FilterFormat\FilterFormatResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonBasicAuthTest.php
index fa40970..c76293d 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonBasicAuthTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\FilterFormat;
+namespace Drupal\Tests\filter\Functional\Hal;
 
+use Drupal\Tests\filter\Functional\Rest\FilterFormatResourceTestBase;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\FilterFormat\FilterFormatResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonCookieTest.php
index 1957793..d2a8654 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonCookieTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\FilterFormat;
+namespace Drupal\Tests\filter\Functional\Hal;
 
+use Drupal\Tests\filter\Functional\Rest\FilterFormatResourceTestBase;
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\FilterFormat\FilterFormatResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonAnonTest.php
index 34cfd4b..61da51f 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\ImageStyle;
+namespace Drupal\Tests\image\Functional\Hal;
 
+use Drupal\Tests\image\Functional\Rest\ImageStyleResourceTestBase;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ImageStyle\ImageStyleResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonBasicAuthTest.php
index 61cc149..a6ff494 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonBasicAuthTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\ImageStyle;
+namespace Drupal\Tests\image\Functional\Hal;
 
+use Drupal\Tests\image\Functional\Rest\ImageStyleResourceTestBase;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ImageStyle\ImageStyleResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonCookieTest.php
index aa49653..731e356 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonCookieTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\ImageStyle;
+namespace Drupal\Tests\image\Functional\Hal;
 
+use Drupal\Tests\image\Functional\Rest\ImageStyleResourceTestBase;
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ImageStyle\ImageStyleResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonAnonTest.php
index 6c35159..20d37fa 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Item;
+namespace Drupal\Tests\aggregator\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonBasicAuthTest.php
index 2c96fbc..767c702 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Item;
+namespace Drupal\Tests\aggregator\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonCookieTest.php
index 9c39918..161a735 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Item;
+namespace Drupal\Tests\aggregator\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonTestBase.php b/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonTestBase.php
index 24157e5..c786b7b 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonTestBase.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonTestBase.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Item;
+namespace Drupal\Tests\aggregator\Functional\Hal;
 
 use Drupal\aggregator\Entity\Feed;
+use Drupal\Tests\aggregator\Functional\Rest\ItemResourceTestBase;
 use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Item\ItemResourceTestBase;
 
 /**
  * ResourceTestBase for Item entity.
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Media/MediaHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Media/MediaHalJsonAnonTest.php
index c5ca04a..b090b81 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Media/MediaHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Media/MediaHalJsonAnonTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Media;
+namespace Drupal\Tests\media\Functional\Hal;
 
 use Drupal\Core\Cache\Cache;
 use Drupal\file\Entity\File;
 use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
+use Drupal\Tests\media\Functional\Rest\MediaResourceTestBase;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Media\MediaResourceTestBase;
 use Drupal\user\Entity\User;
 
 /**
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Media/MediaHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Media/MediaHalJsonBasicAuthTest.php
index a645cbfb..73d37b3 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Media/MediaHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Media/MediaHalJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Media;
+namespace Drupal\Tests\media\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Media/MediaHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Media/MediaHalJsonCookieTest.php
index a197eab..798cf39 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Media/MediaHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Media/MediaHalJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Media;
+namespace Drupal\Tests\media\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/MediaType/MediaTypeHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/MediaType/MediaTypeHalJsonAnonTest.php
index 1b83df1..6a5611f 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/MediaType/MediaTypeHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/MediaType/MediaTypeHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\MediaType;
+namespace Drupal\Tests\media\Functional\Hal;
 
+use Drupal\Tests\media\Functional\Rest\MediaTypeResourceTestBase;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\MediaType\MediaTypeResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/MediaType/MediaTypeHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/MediaType/MediaTypeHalJsonBasicAuthTest.php
index 20c29f2..0ef13e9 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/MediaType/MediaTypeHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/MediaType/MediaTypeHalJsonBasicAuthTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\MediaType;
+namespace Drupal\Tests\media\Functional\Hal;
 
+use Drupal\Tests\media\Functional\Rest\MediaTypeResourceTestBase;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\MediaType\MediaTypeResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/MediaType/MediaTypeHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/MediaType/MediaTypeHalJsonCookieTest.php
index 8c60485..c66b499 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/MediaType/MediaTypeHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/MediaType/MediaTypeHalJsonCookieTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\MediaType;
+namespace Drupal\Tests\media\Functional\Hal;
 
+use Drupal\Tests\media\Functional\Rest\MediaTypeResourceTestBase;
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\MediaType\MediaTypeResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Menu/MenuHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Menu/MenuHalJsonAnonTest.php
index ace7df7..0200624 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Menu/MenuHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Menu/MenuHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Menu;
+namespace Drupal\Tests\system\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Menu\MenuResourceTestBase;
+use Drupal\Tests\system\Functional\Rest\MenuResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Menu/MenuHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Menu/MenuHalJsonBasicAuthTest.php
index 82242e1..cce118b 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Menu/MenuHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Menu/MenuHalJsonBasicAuthTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Menu;
+namespace Drupal\Tests\system\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Menu\MenuResourceTestBase;
+use Drupal\Tests\system\Functional\Rest\MenuResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Menu/MenuHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Menu/MenuHalJsonCookieTest.php
index 0c1ff4b..9f7346f 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Menu/MenuHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Menu/MenuHalJsonCookieTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Menu;
+namespace Drupal\Tests\system\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Menu\MenuResourceTestBase;
+use Drupal\Tests\system\Functional\Rest\MenuResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentHalJsonAnonTest.php
index c4c8d94..d374d2b 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentHalJsonAnonTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\MenuLinkContent;
+namespace Drupal\Tests\menu_link_content\Functional\Hal;
 
 use Drupal\Core\Cache\Cache;
 use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
+use Drupal\Tests\menu_link_content\Functional\Rest\MenuLinkContentResourceTestBase;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\MenuLinkContent\MenuLinkContentResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentHalJsonBasicAuthTest.php
index 3af8362..40e93a0 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentHalJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\MenuLinkContent;
+namespace Drupal\Tests\menu_link_content\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentHalJsonCookieTest.php
index 1bcc1f8..32cba4a 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentHalJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\MenuLinkContent;
+namespace Drupal\Tests\menu_link_content\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Message/MessageHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Message/MessageHalJsonAnonTest.php
index a9b3ae1..088a872 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Message/MessageHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Message/MessageHalJsonAnonTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Message;
+namespace Drupal\Tests\contact\Functional\Hal;
 
+use Drupal\Tests\contact\Functional\Rest\MessageResourceTestBase;
 use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Message\MessageResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Message/MessageHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Message/MessageHalJsonBasicAuthTest.php
index a24fd6e..363dbd7 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Message/MessageHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Message/MessageHalJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Message;
+namespace Drupal\Tests\contact\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Message/MessageHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Message/MessageHalJsonCookieTest.php
index c6ea4ac..0353cd2 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Message/MessageHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Message/MessageHalJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Message;
+namespace Drupal\Tests\contact\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonBasicAuthTest.php
index 6ae1285..0c973a1 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Node;
+namespace Drupal\Tests\node\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonCookieTest.php
index 19ed363..e29a587 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Node;
+namespace Drupal\Tests\node\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/NodeType/NodeTypeHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/NodeType/NodeTypeHalJsonAnonTest.php
index 5a46564..68f531c 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/NodeType/NodeTypeHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/NodeType/NodeTypeHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\NodeType;
+namespace Drupal\Tests\node\Functional\Hal;
 
+use Drupal\Tests\node\Functional\Rest\NodeTypeResourceTestBase;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\NodeType\NodeTypeResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/NodeType/NodeTypeHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/NodeType/NodeTypeHalJsonBasicAuthTest.php
index f1b4bca..fb7098b 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/NodeType/NodeTypeHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/NodeType/NodeTypeHalJsonBasicAuthTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\NodeType;
+namespace Drupal\Tests\node\Functional\Hal;
 
+use Drupal\Tests\node\Functional\Rest\NodeTypeResourceTestBase;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\NodeType\NodeTypeResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/NodeType/NodeTypeHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/NodeType/NodeTypeHalJsonCookieTest.php
index 0b2f9b2..9d7f5a9 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/NodeType/NodeTypeHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/NodeType/NodeTypeHalJsonCookieTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\NodeType;
+namespace Drupal\Tests\node\Functional\Hal;
 
+use Drupal\Tests\node\Functional\Rest\NodeTypeResourceTestBase;
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\NodeType\NodeTypeResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/RdfMapping/RdfMappingHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/RdfMapping/RdfMappingHalJsonAnonTest.php
index c8931d7..2d241e9 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/RdfMapping/RdfMappingHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/RdfMapping/RdfMappingHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\RdfMapping;
+namespace Drupal\Tests\rdf\Functional\Hal;
 
+use Drupal\Tests\rdf\Functional\Rest\RdfMappingResourceTestBase;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\RdfMapping\RdfMappingResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/RdfMapping/RdfMappingHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/RdfMapping/RdfMappingHalJsonBasicAuthTest.php
index 00bc05d..346ad22 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/RdfMapping/RdfMappingHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/RdfMapping/RdfMappingHalJsonBasicAuthTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\RdfMapping;
+namespace Drupal\Tests\rdf\Functional\Hal;
 
+use Drupal\Tests\rdf\Functional\Rest\RdfMappingResourceTestBase;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\RdfMapping\RdfMappingResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/RdfMapping/RdfMappingHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/RdfMapping/RdfMappingHalJsonCookieTest.php
index 458ec7b..ff90d90 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/RdfMapping/RdfMappingHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/RdfMapping/RdfMappingHalJsonCookieTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\RdfMapping;
+namespace Drupal\Tests\rdf\Functional\Hal;
 
+use Drupal\Tests\rdf\Functional\Rest\RdfMappingResourceTestBase;
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\RdfMapping\RdfMappingResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleHalJsonAnonTest.php
index bb8b50e..50dc197 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\ResponsiveImageStyle;
+namespace Drupal\Tests\responsive_image\Functional\Hal;
 
+use Drupal\Tests\responsive_image\Functional\Rest\ResponsiveImageStyleResourceTestBase;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ResponsiveImageStyle\ResponsiveImageStyleResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleHalJsonBasicAuthTest.php
index 3ce0c72..1f45a2d 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleHalJsonBasicAuthTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\ResponsiveImageStyle;
+namespace Drupal\Tests\responsive_image\Functional\Hal;
 
+use Drupal\Tests\responsive_image\Functional\Rest\ResponsiveImageStyleResourceTestBase;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ResponsiveImageStyle\ResponsiveImageStyleResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleHalJsonCookieTest.php
index 926de66..85d9543 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleHalJsonCookieTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\ResponsiveImageStyle;
+namespace Drupal\Tests\responsive_image\Functional\Hal;
 
+use Drupal\Tests\responsive_image\Functional\Rest\ResponsiveImageStyleResourceTestBase;
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ResponsiveImageStyle\ResponsiveImageStyleResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigHalJsonAnonTest.php
index 021812b..72ccd45 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\RestResourceConfig;
+namespace Drupal\Tests\rest\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\RestResourceConfig\RestResourceConfigResourceTestBase;
+use Drupal\Tests\rest\Functional\Rest\RestResourceConfigResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigHalJsonBasicAuthTest.php
index 495cc04..e5e9a7e 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigHalJsonBasicAuthTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\RestResourceConfig;
+namespace Drupal\Tests\rest\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\RestResourceConfig\RestResourceConfigResourceTestBase;
+use Drupal\Tests\rest\Functional\Rest\RestResourceConfigResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigHalJsonCookieTest.php
index 7747b1e..606d3fd 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigHalJsonCookieTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\RestResourceConfig;
+namespace Drupal\Tests\rest\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\RestResourceConfig\RestResourceConfigResourceTestBase;
+use Drupal\Tests\rest\Functional\Rest\RestResourceConfigResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonAnonTest.php
index ca39204..a08a1d0 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Role;
+namespace Drupal\Tests\user\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Role\RoleResourceTestBase;
+use Drupal\Tests\user\Functional\Rest\RoleResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonBasicAuthTest.php
index 090f153..1e613e5 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonBasicAuthTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Role;
+namespace Drupal\Tests\user\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Role\RoleResourceTestBase;
+use Drupal\Tests\user\Functional\Rest\RoleResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonCookieTest.php
index a98046a..0074e05 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonCookieTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Role;
+namespace Drupal\Tests\user\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Role\RoleResourceTestBase;
+use Drupal\Tests\user\Functional\Rest\RoleResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/SearchPage/SearchPageHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/SearchPage/SearchPageHalJsonAnonTest.php
index 28777a4..cd00798 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/SearchPage/SearchPageHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/SearchPage/SearchPageHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\SearchPage;
+namespace Drupal\Tests\search\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\SearchPage\SearchPageResourceTestBase;
+use Drupal\Tests\search\Functional\Rest\SearchPageResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/SearchPage/SearchPageHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/SearchPage/SearchPageHalJsonBasicAuthTest.php
index bb48bbe..d1ff293 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/SearchPage/SearchPageHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/SearchPage/SearchPageHalJsonBasicAuthTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\SearchPage;
+namespace Drupal\Tests\search\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\SearchPage\SearchPageResourceTestBase;
+use Drupal\Tests\search\Functional\Rest\SearchPageResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/SearchPage/SearchPageHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/SearchPage/SearchPageHalJsonCookieTest.php
index 772a4be..a09fa5f 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/SearchPage/SearchPageHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/SearchPage/SearchPageHalJsonCookieTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\SearchPage;
+namespace Drupal\Tests\search\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\SearchPage\SearchPageResourceTestBase;
+use Drupal\Tests\search\Functional\Rest\SearchPageResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Shortcut/ShortcutHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Shortcut/ShortcutHalJsonAnonTest.php
index c9e8dc0..ba6c8a7 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Shortcut/ShortcutHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Shortcut/ShortcutHalJsonAnonTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Shortcut;
+namespace Drupal\Tests\shortcut\Functional\Hal;
 
 use Drupal\Core\Cache\Cache;
 use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Shortcut\ShortcutResourceTestBase;
+use Drupal\Tests\shortcut\Functional\Rest\ShortcutResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Shortcut/ShortcutHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Shortcut/ShortcutHalJsonBasicAuthTest.php
index a5be6db..784c3eb 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Shortcut/ShortcutHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Shortcut/ShortcutHalJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Shortcut;
+namespace Drupal\Tests\shortcut\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Shortcut/ShortcutHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Shortcut/ShortcutHalJsonCookieTest.php
index a48a61f..7b3b834 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Shortcut/ShortcutHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Shortcut/ShortcutHalJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Shortcut;
+namespace Drupal\Tests\shortcut\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetHalJsonAnonTest.php
index a1cdf27..b3faae7 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\ShortcutSet;
+namespace Drupal\Tests\shortcut\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ShortcutSet\ShortcutSetResourceTestBase;
+use Drupal\Tests\shortcut\Functional\Rest\ShortcutSetResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetHalJsonBasicAuthTest.php
index d6cce1d..d3a7057 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetHalJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\ShortcutSet;
+namespace Drupal\Tests\shortcut\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetHalJsonCookieTest.php
index e7bbf40..786936e 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetHalJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\ShortcutSet;
+namespace Drupal\Tests\shortcut\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonAnonTest.php
index e19fb1b..ee3effc 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonAnonTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Term;
+namespace Drupal\Tests\taxonomy\Functional\Hal;
 
 use Drupal\taxonomy\Entity\Term;
 use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Term\TermResourceTestBase;
+use Drupal\Tests\taxonomy\Functional\Rest\TermResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonBasicAuthTest.php
index 5863338..5766156 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Term;
+namespace Drupal\Tests\taxonomy\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonCookieTest.php
index 23ccd20..f949e7a 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Term;
+namespace Drupal\Tests\taxonomy\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Tour/TourHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Tour/TourHalJsonAnonTest.php
index 536d634..1461fc1 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Tour/TourHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Tour/TourHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Tour;
+namespace Drupal\Tests\tour\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Tour\TourResourceTestBase;
+use Drupal\Tests\tour\Functional\Rest\TourResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Tour/TourHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Tour/TourHalJsonBasicAuthTest.php
index 07462f1..c79f55e 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Tour/TourHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Tour/TourHalJsonBasicAuthTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Tour;
+namespace Drupal\Tests\tour\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Tour\TourResourceTestBase;
+use Drupal\Tests\tour\Functional\Rest\TourResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Tour/TourHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Tour/TourHalJsonCookieTest.php
index cf1b447..6a7737d 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Tour/TourHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Tour/TourHalJsonCookieTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Tour;
+namespace Drupal\Tests\tour\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Tour\TourResourceTestBase;
+use Drupal\Tests\tour\Functional\Rest\TourResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonAnonTest.php
index 7398f28..b33c686 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonAnonTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\User;
+namespace Drupal\Tests\user\Functional\Hal;
 
 use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\User\UserResourceTestBase;
+use Drupal\Tests\user\Functional\Rest\UserResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonBasicAuthTest.php
index 985b24c..7da859e 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\User;
+namespace Drupal\Tests\user\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonCookieTest.php
index b4a121b..e5e785c 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\User;
+namespace Drupal\Tests\user\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/View/ViewHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/View/ViewHalJsonAnonTest.php
index 432bd3f..134b00f 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/View/ViewHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/View/ViewHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\View;
+namespace Drupal\Tests\views\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\View\ViewResourceTestBase;
+use Drupal\Tests\views\Functional\Rest\ViewResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/View/ViewHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/View/ViewHalJsonBasicAuthTest.php
index 1c5ffc2..87c3985 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/View/ViewHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/View/ViewHalJsonBasicAuthTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\View;
+namespace Drupal\Tests\views\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\View\ViewResourceTestBase;
+use Drupal\Tests\views\Functional\Rest\ViewResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/View/ViewHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/View/ViewHalJsonCookieTest.php
index e6b3cbe..aa5aa4f 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/View/ViewHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/View/ViewHalJsonCookieTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\View;
+namespace Drupal\Tests\views\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\View\ViewResourceTestBase;
+use Drupal\Tests\views\Functional\Rest\ViewResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonAnonTest.php
index d4f4bcf..e2c1bc8 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonAnonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Vocabulary;
+namespace Drupal\Tests\taxonomy\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Vocabulary\VocabularyResourceTestBase;
+use Drupal\Tests\taxonomy\Functional\Rest\VocabularyResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonBasicAuthTest.php
index d53b836..d8c17e6 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonBasicAuthTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Vocabulary;
+namespace Drupal\Tests\taxonomy\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Vocabulary\VocabularyResourceTestBase;
+use Drupal\Tests\taxonomy\Functional\Rest\VocabularyResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonCookieTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonCookieTest.php
index dd37532..13a44db 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonCookieTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonCookieTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Vocabulary;
+namespace Drupal\Tests\taxonomy\Functional\Hal;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Vocabulary\VocabularyResourceTestBase;
+use Drupal\Tests\taxonomy\Functional\Rest\VocabularyResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonAnonTest.php b/core/modules/node/tests/src/Functional/Rest/NodeHalJsonAnonTest.php
similarity index 95%
rename from core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonAnonTest.php
rename to core/modules/node/tests/src/Functional/Rest/NodeHalJsonAnonTest.php
index e218a73..01bb471 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonAnonTest.php
+++ b/core/modules/node/tests/src/Functional/Rest/NodeHalJsonAnonTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Node;
+namespace Drupal\Tests\node\Functional\Rest;
 
 use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
+use Drupal\Tests\node\Functional\Rest\NodeResourceTestBase;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Node\NodeResourceTestBase;
 use Drupal\user\Entity\User;
 
 /**
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionJsonAnonTest.php
index 4d55c25..07a7a5b 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Action;
+namespace Drupal\Tests\system\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionJsonBasicAuthTest.php
index bc998ed..fdc516b 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Action;
+namespace Drupal\Tests\system\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionJsonCookieTest.php
index ab7c506..0766f03 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Action;
+namespace Drupal\Tests\system\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionResourceTestBase.php
index 76aff4b..5134e91 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Action;
+namespace Drupal\Tests\system\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
 use Drupal\system\Entity\Action;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionXmlAnonTest.php
index 3bce75e..e45af98 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Action;
+namespace Drupal\Tests\system\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionXmlBasicAuthTest.php
index a81051d..f11459b 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Action;
+namespace Drupal\Tests\system\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionXmlCookieTest.php
index 85b28ac..dbee6fa 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Action;
+namespace Drupal\Tests\system\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideJsonAnonTest.php
index e16284d..c70f7ed 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\BaseFieldOverride;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideJsonBasicAuthTest.php
index 010fa8d..2a23263 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\BaseFieldOverride;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideJsonCookieTest.php
index dd4f8ec..d1337c3 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\BaseFieldOverride;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideResourceTestBase.php
index 1f4b03a..fc5efcb 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\BaseFieldOverride;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Core\Field\Entity\BaseFieldOverride;
 use Drupal\node\Entity\NodeType;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideXmlAnonTest.php
index 17e8bbf..7f06bf5 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\BaseFieldOverride;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideXmlBasicAuthTest.php
index 7793c90..30cec05 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\BaseFieldOverride;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideXmlCookieTest.php
index d8b86e1..6f638da 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\BaseFieldOverride;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonAnonTest.php
index 2312de0..1d98bcc 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Block;
+namespace Drupal\Tests\block\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonBasicAuthTest.php
index ea690b4..9c2a272 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Block;
+namespace Drupal\Tests\block\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonCookieTest.php
index c15ff8f..adef298 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Block;
+namespace Drupal\Tests\block\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockResourceTestBase.php
index 13a4568..998690c 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Block;
+namespace Drupal\Tests\block\Functional\Rest;
 
 use Drupal\block\Entity\Block;
 use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockXmlAnonTest.php
index 7861e2e..923f02d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Block;
+namespace Drupal\Tests\block\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockXmlBasicAuthTest.php
index 6594f4f..2b720d1 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Block;
+namespace Drupal\Tests\block\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockXmlCookieTest.php
index 34a0937..9474dbd 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Block;
+namespace Drupal\Tests\block\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentJsonAnonTest.php
index 16688cb..844f927 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\BlockContent;
+namespace Drupal\Tests\block_content\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentJsonBasicAuthTest.php
index c804632..63bf314 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\BlockContent;
+namespace Drupal\Tests\block_content\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentJsonCookieTest.php
index 75bb3c2..4c27734 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\BlockContent;
+namespace Drupal\Tests\block_content\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentResourceTestBase.php
index 5766817..2bad721 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\BlockContent;
+namespace Drupal\Tests\block_content\Functional\Rest;
 
 use Drupal\block_content\Entity\BlockContent;
 use Drupal\block_content\Entity\BlockContentType;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentXmlAnonTest.php
index 5f13cf0..fba08ed 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\BlockContent;
+namespace Drupal\Tests\block_content\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentXmlBasicAuthTest.php
index c02d2f0..199abea 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\BlockContent;
+namespace Drupal\Tests\block_content\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentXmlCookieTest.php
index 6a605d4..6251455 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\BlockContent;
+namespace Drupal\Tests\block_content\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeJsonAnonTest.php
index 9671708..3fcbd43 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\BlockContentType;
+namespace Drupal\Tests\block_content\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeJsonBasicAuthTest.php
index e46afdc..a993d1f 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\BlockContentType;
+namespace Drupal\Tests\block_content\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeJsonCookieTest.php
index 653d5c0..c938f13 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\BlockContentType;
+namespace Drupal\Tests\block_content\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeResourceTestBase.php
index f96f40e..13d6ed2 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\BlockContentType;
+namespace Drupal\Tests\block_content\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
 use Drupal\block_content\Entity\BlockContentType;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeXmlAnonTest.php
index 924b2b7..2277d6b 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\BlockContentType;
+namespace Drupal\Tests\block_content\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeXmlBasicAuthTest.php
index 0f294c5..a878c7d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\BlockContentType;
+namespace Drupal\Tests\block_content\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeXmlCookieTest.php
index bd39e01..836c330 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\BlockContentType;
+namespace Drupal\Tests\block_content\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonAnonTest.php
index 5aef7cf..a3a6cfe 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Comment;
+namespace Drupal\Tests\comment\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonBasicAuthTest.php
index e05d733..a4f7255 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Comment;
+namespace Drupal\Tests\comment\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonCookieTest.php
index 945b34a..f2c78a2 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Comment;
+namespace Drupal\Tests\comment\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentResourceTestBase.php
index d309854..f25567d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Comment;
+namespace Drupal\Tests\comment\Functional\Rest;
 
 use Drupal\comment\Entity\Comment;
 use Drupal\comment\Entity\CommentType;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentXmlAnonTest.php
index aa45f5c..c2e529e 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Comment;
+namespace Drupal\Tests\comment\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentXmlBasicAuthTest.php
index c167ea7..d1f38e4 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Comment;
+namespace Drupal\Tests\comment\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentXmlCookieTest.php
index 1ece71b..e06cf26 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Comment;
+namespace Drupal\Tests\comment\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeJsonAnonTest.php
index ac27de0..496e20a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\CommentType;
+namespace Drupal\Tests\comment\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeJsonBasicAuthTest.php
index b91bad8..c947dbc 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\CommentType;
+namespace Drupal\Tests\comment\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeJsonCookieTest.php
index 5915e29..ddbdf27 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\CommentType;
+namespace Drupal\Tests\comment\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeResourceTestBase.php
index 9d88211..5d9b413 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\CommentType;
+namespace Drupal\Tests\comment\Functional\Rest;
 
 use Drupal\comment\Entity\CommentType;
 use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeXmlAnonTest.php
index bfda97a..96d6c41 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\CommentType;
+namespace Drupal\Tests\comment\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeXmlBasicAuthTest.php
index 04b114a..e92f2bc 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\CommentType;
+namespace Drupal\Tests\comment\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeXmlCookieTest.php
index 545b8c1..01f42db 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\CommentType;
+namespace Drupal\Tests\comment\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonAnonTest.php
index 32997dc..0121b1f 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ConfigTest;
+namespace Drupal\Tests\config_test\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonBasicAuthTest.php
index 1144e76..87c4158 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ConfigTest;
+namespace Drupal\Tests\config_test\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonCookieTest.php
index fe25786..173d761 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ConfigTest;
+namespace Drupal\Tests\config_test\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestResourceTestBase.php
index 9fe073b..9ab65d7 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ConfigTest;
+namespace Drupal\Tests\config_test\Functional\Rest;
 
 use Drupal\config_test\Entity\ConfigTest;
 use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestXmlAnonTest.php
index 2df1af7..451e86d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ConfigTest;
+namespace Drupal\Tests\config_test\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestXmlBasicAuthTest.php
index b1e6f76..c65028f 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ConfigTest;
+namespace Drupal\Tests\config_test\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestXmlCookieTest.php
index 6e8bf50..540b14e 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ConfigTest;
+namespace Drupal\Tests\config_test\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonAnonTest.php
index debfa4c..7533e31 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ConfigurableLanguage;
+namespace Drupal\Tests\language\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonBasicAuthTest.php
index 8b768f3..847e781 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ConfigurableLanguage;
+namespace Drupal\Tests\language\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceWithInterfaceTranslationTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonCookieTest.php
index 9972ed0..cd3d9ce 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ConfigurableLanguage;
+namespace Drupal\Tests\language\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageResourceTestBase.php
index cf5be74..a0dd460 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ConfigurableLanguage;
+namespace Drupal\Tests\language\Functional\Rest;
 
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Url;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageXmlAnonTest.php
index a698aad..882b7bf 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ConfigurableLanguage;
+namespace Drupal\Tests\language\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageXmlBasicAuthTest.php
index 66bdf4d..7a79c4d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ConfigurableLanguage;
+namespace Drupal\Tests\language\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceWithInterfaceTranslationTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageXmlCookieTest.php
index 9420fdf..7755d76 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ConfigurableLanguage;
+namespace Drupal\Tests\language\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormJsonAnonTest.php
index a5f3602..fecbf68 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ContactForm;
+namespace Drupal\Tests\contact\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormJsonBasicAuthTest.php
index c41b9a4..8e92a91 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ContactForm;
+namespace Drupal\Tests\contact\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormJsonCookieTest.php
index 2b8d913..6ba6660 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ContactForm;
+namespace Drupal\Tests\contact\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormResourceTestBase.php
index 51e297a..98edc5a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ContactForm;
+namespace Drupal\Tests\contact\Functional\Rest;
 
 use Drupal\contact\Entity\ContactForm;
 use Drupal\Tests\rest\Functional\BcTimestampNormalizerUnixTestTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormXmlAnonTest.php
index 0c4b6cb..2931edd 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ContactForm;
+namespace Drupal\Tests\contact\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormXmlBasicAuthTest.php
index 215501d..dfc4b64 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ContactForm;
+namespace Drupal\Tests\contact\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormXmlCookieTest.php
index 6134733..cdcd2da 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ContactForm;
+namespace Drupal\Tests\contact\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsJsonAnonTest.php
index 344c733..1bece31 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ContentLanguageSettings;
+namespace Drupal\Tests\language\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsJsonBasicAuthTest.php
index 4644815..14437a9 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ContentLanguageSettings;
+namespace Drupal\Tests\language\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceWithInterfaceTranslationTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsJsonCookieTest.php
index b0af529..84da808 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ContentLanguageSettings;
+namespace Drupal\Tests\language\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsResourceTestBase.php
index a8b3f8c..6283484 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ContentLanguageSettings;
+namespace Drupal\Tests\language\Functional\Rest;
 
 use Drupal\language\Entity\ContentLanguageSettings;
 use Drupal\node\Entity\NodeType;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsXmlAnonTest.php
index eb1bdce..fd65193 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ContentLanguageSettings;
+namespace Drupal\Tests\language\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsXmlBasicAuthTest.php
index eb4e9c2..741e75b 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ContentLanguageSettings;
+namespace Drupal\Tests\language\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceWithInterfaceTranslationTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsXmlCookieTest.php
index 2ccb6f9..a5b4968 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ContentLanguageSettings;
+namespace Drupal\Tests\language\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatJsonAnonTest.php
index 9fe8ea2..903bd36 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\DateFormat;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatJsonBasicAuthTest.php
index 71f1f7f..0ee48b2 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\DateFormat;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatJsonCookieTest.php
index 07c305f..f099245 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\DateFormat;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatResourceTestBase.php
index 8fce0fe..ab9ce43 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\DateFormat;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Core\Datetime\Entity\DateFormat;
 use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatXmlAnonTest.php
index 6a5873a..db346b4 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\DateFormat;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatXmlBasicAuthTest.php
index 488a93e..60e40ac 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\DateFormat;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatXmlCookieTest.php
index 4818395..d73d226 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\DateFormat;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorJsonAnonTest.php
index b01ac2a..3809f0a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Editor;
+namespace Drupal\Tests\editor\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorJsonBasicAuthTest.php
index 265bd48..f0c3010 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Editor;
+namespace Drupal\Tests\editor\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorJsonCookieTest.php
index b4f509a..95f1024 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Editor;
+namespace Drupal\Tests\editor\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorResourceTestBase.php
index 4eb4a6e..2dc43dc 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Editor;
+namespace Drupal\Tests\editor\Functional\Rest;
 
 use Drupal\editor\Entity\Editor;
 use Drupal\filter\Entity\FilterFormat;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorXmlAnonTest.php
index 763f9f9..d5be1f6 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Editor;
+namespace Drupal\Tests\editor\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorXmlBasicAuthTest.php
index aa1c042..acab40b 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Editor;
+namespace Drupal\Tests\editor\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorXmlCookieTest.php
index 61dbcfe..8940095 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Editor;
+namespace Drupal\Tests\editor\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayJsonAnonTest.php
index 68a6167..672645c 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityFormDisplay;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayJsonBasicAuthTest.php
index 940e73b..15ccc6b 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityFormDisplay;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayJsonCookieTest.php
index eba9c46..2cb9e82 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityFormDisplay;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayResourceTestBase.php
index cc4cf58..9a7542e 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityFormDisplay;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
 use Drupal\node\Entity\NodeType;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayXmlAnonTest.php
index 9d0a290..b736846 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityFormDisplay;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayXmlBasicAuthTest.php
index 03a5f4d..5803df6 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityFormDisplay;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayXmlCookieTest.php
index 6fc9d50..9f7f0df 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityFormDisplay;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeJsonAnonTest.php
index bdb4dfa..1383ecf 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityFormMode;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeJsonBasicAuthTest.php
index 989cd5b..782c091 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityFormMode;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeJsonCookieTest.php
index 655e0cc..ec293f3 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityFormMode;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeResourceTestBase.php
index a9035e0..73f3552 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityFormMode;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
 use Drupal\Core\Entity\Entity\EntityFormMode;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeXmlAnonTest.php
index 4e8ecef..d2bb26b 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityFormMode;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeXmlBasicAuthTest.php
index 53b8f35..44ae231 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityFormMode;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeXmlCookieTest.php
index 76d9c95..c5d997a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityFormMode;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceRestTestCoverageTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceRestTestCoverageTest.php
index 6421472..a3f87e4 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceRestTestCoverageTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceRestTestCoverageTest.php
@@ -57,12 +57,10 @@ protected function setUp() {
    * Tests that all core content/config entity types have REST test coverage.
    */
   public function testEntityTypeRestTestCoverage() {
-    $default_test_locations = [
+    $tests = [
       // Test coverage for formats provided by the 'serialization' module.
       'serialization' => [
-        'possible paths' => [
-          '\Drupal\Tests\rest\Functional\EntityResource\CLASS\CLASS',
-        ],
+        'path' => '\Drupal\Tests\PROVIDER\Functional\Rest\CLASS',
         'class suffix' => [
           'JsonAnonTest',
           'JsonBasicAuthTest',
@@ -74,9 +72,7 @@ public function testEntityTypeRestTestCoverage() {
       ],
       // Test coverage for formats provided by the 'hal' module.
       'hal' => [
-        'possible paths' => [
-          '\Drupal\Tests\hal\Functional\EntityResource\CLASS\CLASS',
-        ],
+        'path' => '\Drupal\Tests\PROVIDER\Functional\Hal\CLASS',
         'class suffix' => [
           'HalJsonAnonTest',
           'HalJsonBasicAuthTest',
@@ -92,21 +88,13 @@ public function testEntityTypeRestTestCoverage() {
       $class_name = end($parts);
       $module_name = $parts[1];
 
-      // The test class can live either in the REST/HAL module, or in the module
-      // providing the entity type.
-      $tests = $default_test_locations;
-      $tests['serialization']['possible paths'][] = '\Drupal\Tests\\' . $module_name . '\Functional\Rest\CLASS';
-      $tests['hal']['possible paths'][] = '\Drupal\Tests\\' . $module_name . '\Functional\Hal\CLASS';
-
       foreach ($tests as $module => $info) {
-        $possible_paths = $info['possible paths'];
+        $path = $info['path'];
         $missing_tests = [];
         foreach ($info['class suffix'] as $postfix) {
-          foreach ($possible_paths as $path) {
-            $class = str_replace('CLASS', $class_name, $path . $postfix);
-            if (class_exists($class)) {
-              continue 2;
-            }
+          $class = str_replace(['PROVIDER', 'CLASS'], [$module_name, $class_name], $path . $postfix);
+          if (class_exists($class)) {
+            continue;
           }
           $missing_tests[] = $postfix;
         }
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonAnonTest.php
index 1deeec0..58d15b3 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityTest;
+namespace Drupal\Tests\entity_test\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\FormatSpecificGetBcRouteTestTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonBasicAuthTest.php
index aff854e..cd647e8 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityTest;
+namespace Drupal\Tests\entity_test\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonCookieTest.php
index c0090d5..b76de42 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityTest;
+namespace Drupal\Tests\entity_test\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonInternalPropertyNormalizerTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonInternalPropertyNormalizerTest.php
index 1944718..7ac9d89 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonInternalPropertyNormalizerTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonInternalPropertyNormalizerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityTest;
+namespace Drupal\Tests\entity_test\Functional\Rest;
 
 use Drupal\Core\Cache\Cache;
 use Drupal\field\Entity\FieldConfig;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestXmlAnonTest.php
index 52dcad4..a5548f9 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityTest;
+namespace Drupal\Tests\entity_test\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\FormatSpecificGetBcRouteTestTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestXmlBasicAuthTest.php
index 55c7246..d0501af 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityTest;
+namespace Drupal\Tests\entity_test\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestXmlCookieTest.php
index 247ebd8..7fe4930 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityTest;
+namespace Drupal\Tests\entity_test\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleJsonAnonTest.php
index 1df26f3..08eb700 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityTestBundle;
+namespace Drupal\Tests\entity_test\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleJsonBasicAuthTest.php
index 0220801..d1a7adb 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityTestBundle;
+namespace Drupal\Tests\entity_test\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleJsonCookieTest.php
index 56fecfd..313c9b9 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityTestBundle;
+namespace Drupal\Tests\entity_test\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleResourceTestBase.php
index f43d877..cf167bc 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityTestBundle;
+namespace Drupal\Tests\entity_test\Functional\Rest;
 
 use Drupal\entity_test\Entity\EntityTestBundle;
 use Drupal\Tests\rest\Functional\BcTimestampNormalizerUnixTestTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleXmlAnonTest.php
index 2b99274..e88314b 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityTestBundle;
+namespace Drupal\Tests\entity_test\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleXmlBasicAuthTest.php
index 2c5a4e4..701c15b 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityTestBundle;
+namespace Drupal\Tests\entity_test\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleXmlCookieTest.php
index fdf6e0a..2f3ee33 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityTestBundle;
+namespace Drupal\Tests\entity_test\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelJsonAnonTest.php
index 10c4ec4..31a476d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityTestLabel;
+namespace Drupal\Tests\entity_test\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelJsonBasicAuthTest.php
index 2a43e03..61cfea1 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityTestLabel;
+namespace Drupal\Tests\entity_test\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelJsonCookieTest.php
index 2fec09d..20bb701 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityTestLabel;
+namespace Drupal\Tests\entity_test\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelResourceTestBase.php
index 2257d6c..08a6552 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityTestLabel;
+namespace Drupal\Tests\entity_test\Functional\Rest;
 
 use Drupal\entity_test\Entity\EntityTestLabel;
 use Drupal\Tests\rest\Functional\BcTimestampNormalizerUnixTestTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelXmlAnonTest.php
index ef2005a..ac1bd86 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityTestLabel;
+namespace Drupal\Tests\entity_test\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelXmlBasicAuthTest.php
index 1754d55..e671098 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityTestLabel;
+namespace Drupal\Tests\entity_test\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelXmlCookieTest.php
index 406d360..f859c7f 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityTestLabel;
+namespace Drupal\Tests\entity_test\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayJsonAnonTest.php
index cf7d671..4977158 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityViewDisplay;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayJsonBasicAuthTest.php
index 457c42f..392e6ca 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityViewDisplay;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayJsonCookieTest.php
index cc186df..fbb56d1 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityViewDisplay;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayResourceTestBase.php
index ccc3aad..a4df649 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityViewDisplay;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
 use Drupal\node\Entity\NodeType;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayXmlAnonTest.php
index e4bc039..917f1af 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityViewDisplay;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayXmlBasicAuthTest.php
index 547592d..8d19249 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityViewDisplay;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayXmlCookieTest.php
index 0ecf3a2..1ce8b52 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityViewDisplay;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeJsonAnonTest.php
index b74b825..42fd7e1 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityViewMode;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeJsonBasicAuthTest.php
index 986b31d..205d6c5 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityViewMode;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeJsonCookieTest.php
index 78822f5..756749d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityViewMode;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeResourceTestBase.php
index 28cb9b0..d5c8d18 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityViewMode;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
 use Drupal\Core\Entity\Entity\EntityViewMode;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeXmlAnonTest.php
index 534de74..76fa1f0 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityViewMode;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeXmlBasicAuthTest.php
index 57a1f86..d09b2eb 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityViewMode;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeXmlCookieTest.php
index 72b0323..b39e3ea 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityViewMode;
+namespace Drupal\Tests\Core\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedJsonAnonTest.php
index a4b8e0d..1550d74 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Feed;
+namespace Drupal\Tests\aggregator\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedJsonBasicAuthTest.php
index e5685c9..e918ab9 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Feed;
+namespace Drupal\Tests\aggregator\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedJsonCookieTest.php
index 7c1cc9f8..e5e0c86 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Feed;
+namespace Drupal\Tests\aggregator\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedResourceTestBase.php
index a89bde1..ddf97df 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Feed;
+namespace Drupal\Tests\aggregator\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BcTimestampNormalizerUnixTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedXmlAnonTest.php
index f2a3233..41b03a6 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Feed;
+namespace Drupal\Tests\aggregator\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedXmlBasicAuthTest.php
index 08dc65d..450cc49 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Feed;
+namespace Drupal\Tests\aggregator\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedXmlCookieTest.php
index 377690a..3fee585 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Feed;
+namespace Drupal\Tests\aggregator\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigJsonAnonTest.php
index 0e6883a..d11e46c 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\FieldConfig;
+namespace Drupal\Tests\field\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigJsonBasicAuthTest.php
index 2ab43d3..d27354e 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\FieldConfig;
+namespace Drupal\Tests\field\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigJsonCookieTest.php
index 22c2225..089bd8f 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\FieldConfig;
+namespace Drupal\Tests\field\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigResourceTestBase.php
index 05c05f4..40ce43f 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\FieldConfig;
+namespace Drupal\Tests\field\Functional\Rest;
 
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigXmlAnonTest.php
index d775189..8809e60 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\FieldConfig;
+namespace Drupal\Tests\field\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigXmlBasicAuthTest.php
index ed82264..109f2dc 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\FieldConfig;
+namespace Drupal\Tests\field\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigXmlCookieTest.php
index 4e715d0..d8aebdd 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\FieldConfig;
+namespace Drupal\Tests\field\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigJsonAnonTest.php
index 582a0b0..5e58c2a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\FieldStorageConfig;
+namespace Drupal\Tests\field\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigJsonBasicAuthTest.php
index 4219cad..9aa875a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\FieldStorageConfig;
+namespace Drupal\Tests\field\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigJsonCookieTest.php
index c40aa7d..fbcf42b 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\FieldStorageConfig;
+namespace Drupal\Tests\field\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigResourceTestBase.php
index aafc253..0d0fb6d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\FieldStorageConfig;
+namespace Drupal\Tests\field\Functional\Rest;
 
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigXmlAnonTest.php
index c5f3a91..4af918b 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\FieldStorageConfig;
+namespace Drupal\Tests\field\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigXmlBasicAuthTest.php
index 6f55722..d6fe68f 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\FieldStorageConfig;
+namespace Drupal\Tests\field\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigXmlCookieTest.php
index e629df2..6672a0d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\FieldStorageConfig;
+namespace Drupal\Tests\field\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/File/FileJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/File/FileJsonAnonTest.php
index b3adf6e..5d76ea2 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/File/FileJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/File/FileJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\File;
+namespace Drupal\Tests\file\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/File/FileJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/File/FileJsonBasicAuthTest.php
index 971555c..87a65ac 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/File/FileJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/File/FileJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\File;
+namespace Drupal\Tests\file\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/File/FileJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/File/FileJsonCookieTest.php
index cffd869..9c79720 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/File/FileJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/File/FileJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\File;
+namespace Drupal\Tests\file\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/File/FileResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/File/FileResourceTestBase.php
index 267f453..80baddf 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/File/FileResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/File/FileResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\File;
+namespace Drupal\Tests\file\Functional\Rest;
 
 use Drupal\file\Entity\File;
 use Drupal\Tests\rest\Functional\BcTimestampNormalizerUnixTestTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/File/FileXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/File/FileXmlAnonTest.php
index 2fad087..8360096 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/File/FileXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/File/FileXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\File;
+namespace Drupal\Tests\file\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/File/FileXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/File/FileXmlBasicAuthTest.php
index 55a69c4..66e9986 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/File/FileXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/File/FileXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\File;
+namespace Drupal\Tests\file\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/File/FileXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/File/FileXmlCookieTest.php
index cd90097..4b7db03 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/File/FileXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/File/FileXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\File;
+namespace Drupal\Tests\file\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatJsonAnonTest.php
index 60a24fb..772ccab 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\FilterFormat;
+namespace Drupal\Tests\filter\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatJsonBasicAuthTest.php
index 4e143c3..53ba6ce 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\FilterFormat;
+namespace Drupal\Tests\filter\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatJsonCookieTest.php
index 73c0c22..432142a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\FilterFormat;
+namespace Drupal\Tests\filter\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatResourceTestBase.php
index 4d65e00..5a0174a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\FilterFormat;
+namespace Drupal\Tests\filter\Functional\Rest;
 
 use Drupal\filter\Entity\FilterFormat;
 use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatXmlAnonTest.php
index 8eddfa1..25b84cf 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\FilterFormat;
+namespace Drupal\Tests\filter\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatXmlBasicAuthTest.php
index d1aa25d..6c0c62d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\FilterFormat;
+namespace Drupal\Tests\filter\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatXmlCookieTest.php
index 9437b73..1c3be31 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\FilterFormat;
+namespace Drupal\Tests\filter\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleJsonAnonTest.php
index 0089f8e..e367fb6 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ImageStyle;
+namespace Drupal\Tests\image\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleJsonBasicAuthTest.php
index 1011750..ab6ae57 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ImageStyle;
+namespace Drupal\Tests\image\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleJsonCookieTest.php
index 321baae..5021233 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ImageStyle;
+namespace Drupal\Tests\image\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleResourceTestBase.php
index ccd68d9..190d2b9 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ImageStyle;
+namespace Drupal\Tests\image\Functional\Rest;
 
 use Drupal\image\Entity\ImageStyle;
 use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleXmlAnonTest.php
index 1714c27..427641a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ImageStyle;
+namespace Drupal\Tests\image\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleXmlBasicAuthTest.php
index 54febc6..cd376a3 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ImageStyle;
+namespace Drupal\Tests\image\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleXmlCookieTest.php
index 5cbb29a..7ca459a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ImageStyle;
+namespace Drupal\Tests\image\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemJsonAnonTest.php
index dac1b0a..13e24c3 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Item;
+namespace Drupal\Tests\aggregator\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemJsonBasicAuthTest.php
index 19b6179..15f800d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Item;
+namespace Drupal\Tests\aggregator\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemJsonCookieTest.php
index 1c149d7..1e6567b 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Item;
+namespace Drupal\Tests\aggregator\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemResourceTestBase.php
index c7bd57a..c7163e0 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Item;
+namespace Drupal\Tests\aggregator\Functional\Rest;
 
 use Drupal\aggregator\Entity\Feed;
 use Drupal\aggregator\Entity\Item;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemXmlAnonTest.php
index 72a3035..f61a878 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Item;
+namespace Drupal\Tests\aggregator\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemXmlBasicAuthTest.php
index 8da0a58..438a423 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Item;
+namespace Drupal\Tests\aggregator\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemXmlCookieTest.php
index 5fae069..6914406 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Item;
+namespace Drupal\Tests\aggregator\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaJsonAnonTest.php
index d9a3550..0aae16a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Media;
+namespace Drupal\Tests\media\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaJsonBasicAuthTest.php
index f499b79..b124487 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Media;
+namespace Drupal\Tests\media\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaJsonCookieTest.php
index 0cb8626..9c6786f 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Media;
+namespace Drupal\Tests\media\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaResourceTestBase.php
index 85548ad..96f4cd3 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Media;
+namespace Drupal\Tests\media\Functional\Rest;
 
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Url;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaXmlAnonTest.php
index 4b02454..7877949 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Media;
+namespace Drupal\Tests\media\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaXmlBasicAuthTest.php
index bf6cf33..971e75f 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Media;
+namespace Drupal\Tests\media\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaXmlCookieTest.php
index b6e03c3..f67f7b4 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Media;
+namespace Drupal\Tests\media\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeJsonAnonTest.php
index 2e4b630..6ee494de 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\MediaType;
+namespace Drupal\Tests\media\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeJsonBasicAuthTest.php
index 052b19d..84b1a01 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\MediaType;
+namespace Drupal\Tests\media\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeJsonCookieTest.php
index b956c98..90c27b2 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\MediaType;
+namespace Drupal\Tests\media\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeResourceTestBase.php
index ac72737..a11f8ef 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\MediaType;
+namespace Drupal\Tests\media\Functional\Rest;
 
 use Drupal\media\Entity\MediaType;
 use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeXmlAnonTest.php
index d39fd73..083d80a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\MediaType;
+namespace Drupal\Tests\media\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeXmlBasicAuthTest.php
index 834a83a..95de211 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\MediaType;
+namespace Drupal\Tests\media\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeXmlCookieTest.php
index 088d746..3b6a53d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\MediaType;
+namespace Drupal\Tests\media\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuJsonAnonTest.php
index 9a83ce9..468deb5 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Menu;
+namespace Drupal\Tests\system\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuJsonBasicAuthTest.php
index b419eaf..1d35d42 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Menu;
+namespace Drupal\Tests\system\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuJsonCookieTest.php
index 9ecce92..d923875 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Menu;
+namespace Drupal\Tests\system\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuResourceTestBase.php
index dd7f552..91953eb 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Menu;
+namespace Drupal\Tests\system\Functional\Rest;
 
 use Drupal\system\Entity\Menu;
 use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuXmlAnonTest.php
index 2258450..e1c23b5 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Menu;
+namespace Drupal\Tests\system\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuXmlBasicAuthTest.php
index 62e1d59..0910430 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Menu;
+namespace Drupal\Tests\system\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuXmlCookieTest.php
index 5a5cdfa..a229b6a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Menu;
+namespace Drupal\Tests\system\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentJsonAnonTest.php
index 219cc53..fefd6b1 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\MenuLinkContent;
+namespace Drupal\Tests\menu_link_content\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentJsonBasicAuthTest.php
index 952088b..269e949 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\MenuLinkContent;
+namespace Drupal\Tests\menu_link_content\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentJsonCookieTest.php
index 73b4567..0567952 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\MenuLinkContent;
+namespace Drupal\Tests\menu_link_content\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentResourceTestBase.php
index 0b1f967..abfb356 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\MenuLinkContent;
+namespace Drupal\Tests\menu_link_content\Functional\Rest;
 
 use Drupal\menu_link_content\Entity\MenuLinkContent;
 use Drupal\Tests\rest\Functional\BcTimestampNormalizerUnixTestTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentXmlAnonTest.php
index 5141cb7..7c39dae 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\MenuLinkContent;
+namespace Drupal\Tests\menu_link_content\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentXmlBasicAuthTest.php
index 6a62f36..7bbf966 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\MenuLinkContent;
+namespace Drupal\Tests\menu_link_content\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentXmlCookieTest.php
index f73d493..8b56dde 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\MenuLinkContent;
+namespace Drupal\Tests\menu_link_content\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageJsonAnonTest.php
index 9f5b858..a5b2954 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Message;
+namespace Drupal\Tests\contact\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageJsonBasicAuthTest.php
index 1232fb7..f7f759a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Message;
+namespace Drupal\Tests\contact\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageJsonCookieTest.php
index ebe7281..0444a5a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Message;
+namespace Drupal\Tests\contact\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageResourceTestBase.php
index 3f1cab9..f0ff8f8 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Message;
+namespace Drupal\Tests\contact\Functional\Rest;
 
 use Drupal\contact\Entity\ContactForm;
 use Drupal\contact\Entity\Message;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageXmlAnonTest.php
index 8157127..6b9b10d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Message;
+namespace Drupal\Tests\contact\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageXmlBasicAuthTest.php
index 496abc8..152a94a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Message;
+namespace Drupal\Tests\contact\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageXmlCookieTest.php
index 14e27d9..ecdf0db 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Message;
+namespace Drupal\Tests\contact\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonAnonTest.php
index 47239db..fa44d13 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Node;
+namespace Drupal\Tests\node\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonBasicAuthTest.php
index ff7746d..d4ce479 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Node;
+namespace Drupal\Tests\node\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonCookieTest.php
index 490155e..0e070bc 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Node;
+namespace Drupal\Tests\node\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeXmlAnonTest.php
index 7818bd3..83e98a1 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Node;
+namespace Drupal\Tests\node\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeXmlBasicAuthTest.php
index 0ea9601..ce80974 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Node;
+namespace Drupal\Tests\node\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeXmlCookieTest.php
index 0a31d21..288d5a1 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Node;
+namespace Drupal\Tests\node\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeJsonAnonTest.php
index 7050ff1..ab30b17 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\NodeType;
+namespace Drupal\Tests\node\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeJsonBasicAuthTest.php
index cee2364..e1874e4 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\NodeType;
+namespace Drupal\Tests\node\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeJsonCookieTest.php
index a0bc036..26608fc 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\NodeType;
+namespace Drupal\Tests\node\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeResourceTestBase.php
index c374bfb..d74824d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\NodeType;
+namespace Drupal\Tests\node\Functional\Rest;
 
 use Drupal\node\Entity\NodeType;
 use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeXmlAnonTest.php
index b3aa416..c21a9d4 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\NodeType;
+namespace Drupal\Tests\node\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeXmlBasicAuthTest.php
index f26e980..29413dc 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\NodeType;
+namespace Drupal\Tests\node\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeXmlCookieTest.php
index ab0c998..1326f29 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\NodeType;
+namespace Drupal\Tests\node\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingJsonAnonTest.php
index d1d89ae..bb53cc7 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\RdfMapping;
+namespace Drupal\Tests\rdf\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingJsonBasicAuthTest.php
index 857d8c7..9537336 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\RdfMapping;
+namespace Drupal\Tests\rdf\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingJsonCookieTest.php
index c154059..392d45e 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\RdfMapping;
+namespace Drupal\Tests\rdf\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingResourceTestBase.php
index c826be0..ffe5bd4 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\RdfMapping;
+namespace Drupal\Tests\rdf\Functional\Rest;
 
 use Drupal\node\Entity\NodeType;
 use Drupal\rdf\Entity\RdfMapping;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingXmlAnonTest.php
index 448ac47..ab6922b 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\RdfMapping;
+namespace Drupal\Tests\rdf\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingXmlBasicAuthTest.php
index 8f3bae3..9cf6b97 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\RdfMapping;
+namespace Drupal\Tests\rdf\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingXmlCookieTest.php
index a45e5b2..1519e5a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\RdfMapping;
+namespace Drupal\Tests\rdf\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleJsonAnonTest.php
index 7aafd1f..42b3098 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ResponsiveImageStyle;
+namespace Drupal\Tests\responsive_image\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleJsonBasicAuthTest.php
index dbd6e7c..b3c9127 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ResponsiveImageStyle;
+namespace Drupal\Tests\responsive_image\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleJsonCookieTest.php
index 41574fd..e89122e 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ResponsiveImageStyle;
+namespace Drupal\Tests\responsive_image\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleResourceTestBase.php
index 4221314..dbef272 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ResponsiveImageStyle;
+namespace Drupal\Tests\responsive_image\Functional\Rest;
 
 use Drupal\responsive_image\Entity\ResponsiveImageStyle;
 use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleXmlAnonTest.php
index db55fb7..8493edd 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ResponsiveImageStyle;
+namespace Drupal\Tests\responsive_image\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleXmlBasicAuthTest.php
index fbdeb0c..e850e99 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ResponsiveImageStyle;
+namespace Drupal\Tests\responsive_image\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleXmlCookieTest.php
index 66c13d2..f63f91c 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ResponsiveImageStyle;
+namespace Drupal\Tests\responsive_image\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigJsonAnonTest.php
index df07140..ce35590 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\RestResourceConfig;
+namespace Drupal\Tests\rest\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigJsonBasicAuthTest.php
index 136474b..8ac8463 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\RestResourceConfig;
+namespace Drupal\Tests\rest\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigJsonCookieTest.php
index 5ed09d0..4971f59 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\RestResourceConfig;
+namespace Drupal\Tests\rest\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigResourceTestBase.php
index a19e2ef..a0b0b2e 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\RestResourceConfig;
+namespace Drupal\Tests\rest\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
 use Drupal\rest\Entity\RestResourceConfig;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigXmlAnonTest.php
index 21971cc..a508b55 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\RestResourceConfig;
+namespace Drupal\Tests\rest\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigXmlBasicAuthTest.php
index edbb150..c5034b4 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\RestResourceConfig;
+namespace Drupal\Tests\rest\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigXmlCookieTest.php
index 7901894..377a449 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\RestResourceConfig;
+namespace Drupal\Tests\rest\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonAnonTest.php
index eb0b05f..16e3e03 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Role;
+namespace Drupal\Tests\user\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonBasicAuthTest.php
index 267a3b8..79d16cb 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Role;
+namespace Drupal\Tests\user\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonCookieTest.php
index 8740316..6c31ab0 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Role;
+namespace Drupal\Tests\user\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleResourceTestBase.php
index ee719c4..18ff484 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Role;
+namespace Drupal\Tests\user\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
 use Drupal\user\Entity\Role;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleXmlAnonTest.php
index e780bee..14910a6 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Role;
+namespace Drupal\Tests\user\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleXmlBasicAuthTest.php
index 9fef07d..fa98edd 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Role;
+namespace Drupal\Tests\user\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleXmlCookieTest.php
index 8e0b0e2..5e04d7c 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Role;
+namespace Drupal\Tests\user\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageJsonAnonTest.php
index a3aff54..9708192 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\SearchPage;
+namespace Drupal\Tests\search\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageJsonBasicAuthTest.php
index 0ee5556..f311ce9 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\SearchPage;
+namespace Drupal\Tests\search\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageJsonCookieTest.php
index c74a357..8e7c889 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\SearchPage;
+namespace Drupal\Tests\search\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageResourceTestBase.php
index eca9ca8..e711a34 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\SearchPage;
+namespace Drupal\Tests\search\Functional\Rest;
 
 use Drupal\search\Entity\SearchPage;
 use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageXmlAnonTest.php
index dce277d..5f4698e 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\SearchPage;
+namespace Drupal\Tests\search\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageXmlBasicAuthTest.php
index 784a978..7a2c3c8 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\SearchPage;
+namespace Drupal\Tests\search\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageXmlCookieTest.php
index f54e7b1..3ad901d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\SearchPage;
+namespace Drupal\Tests\search\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutJsonAnonTest.php
index 8f317b3..04456fa 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Shortcut;
+namespace Drupal\Tests\shortcut\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutJsonBasicAuthTest.php
index 31f1117..e0859e3 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Shortcut;
+namespace Drupal\Tests\shortcut\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutJsonCookieTest.php
index 3a043c8..7bf2102 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Shortcut;
+namespace Drupal\Tests\shortcut\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutResourceTestBase.php
index 36be5b5..92b99b9 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Shortcut;
+namespace Drupal\Tests\shortcut\Functional\Rest;
 
 use Drupal\shortcut\Entity\Shortcut;
 use Drupal\shortcut\Entity\ShortcutSet;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutXmlAnonTest.php
index 5929d32..56c5c68 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Shortcut;
+namespace Drupal\Tests\shortcut\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutXmlBasicAuthTest.php
index 161ecf2..9645aed 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Shortcut;
+namespace Drupal\Tests\shortcut\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutXmlCookieTest.php
index 7623e29..899b51d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Shortcut;
+namespace Drupal\Tests\shortcut\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetJsonAnonTest.php
index 3720ac6..96750b5 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ShortcutSet;
+namespace Drupal\Tests\shortcut\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetJsonBasicAuthTest.php
index 388b9de..6ddaf54 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ShortcutSet;
+namespace Drupal\Tests\shortcut\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetJsonCookieTest.php
index 28df3dd..60fe840 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ShortcutSet;
+namespace Drupal\Tests\shortcut\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetResourceTestBase.php
index 97ae1a6..b25f028 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ShortcutSet;
+namespace Drupal\Tests\shortcut\Functional\Rest;
 
 use Drupal\shortcut\Entity\ShortcutSet;
 use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetXmlAnonTest.php
index eedd888..75ad14e 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ShortcutSet;
+namespace Drupal\Tests\shortcut\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetXmlBasicAuthTest.php
index d18007c..50c6e71 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ShortcutSet;
+namespace Drupal\Tests\shortcut\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetXmlCookieTest.php
index c4387ee..71dccd1 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\ShortcutSet;
+namespace Drupal\Tests\shortcut\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonAnonTest.php
index 90a85e7..7d87337 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Term;
+namespace Drupal\Tests\taxonomy\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonBasicAuthTest.php
index 97df5c8..959e2bb 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Term;
+namespace Drupal\Tests\taxonomy\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonCookieTest.php
index ccf066b..88dd70c 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Term;
+namespace Drupal\Tests\taxonomy\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/Term/TermResourceTestBase.php
index ce60904..a33eaa9 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Term/TermResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Term;
+namespace Drupal\Tests\taxonomy\Functional\Rest;
 
 use Drupal\Core\Cache\Cache;
 use Drupal\taxonomy\Entity\Term;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Term/TermXmlAnonTest.php
index 8f47ae6..69abeaf 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Term/TermXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Term;
+namespace Drupal\Tests\taxonomy\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Term/TermXmlBasicAuthTest.php
index 9cbfbea..8eacb85 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Term/TermXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Term;
+namespace Drupal\Tests\taxonomy\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Term/TermXmlCookieTest.php
index ace67e0..3de95fd 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Term/TermXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Term;
+namespace Drupal\Tests\taxonomy\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourJsonAnonTest.php
index 0551a0b..530fbe7 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Tour;
+namespace Drupal\Tests\tour\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourJsonBasicAuthTest.php
index 67d7fd3..fb1ff69 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Tour;
+namespace Drupal\Tests\tour\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourJsonCookieTest.php
index 9cb4db4..c173395 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Tour;
+namespace Drupal\Tests\tour\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourResourceTestBase.php
index 294e3ee..a0f35f5 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Tour;
+namespace Drupal\Tests\tour\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
 use Drupal\tour\Entity\Tour;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourXmlAnonTest.php
index 4c96e37..8f44c87 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Tour;
+namespace Drupal\Tests\tour\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourXmlBasicAuthTest.php
index 1f1860b..618b41d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Tour;
+namespace Drupal\Tests\tour\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourXmlCookieTest.php
index 10845c1..4d65bff 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Tour;
+namespace Drupal\Tests\tour\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonAnonTest.php
index 176f3be..5b7e09e 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\User;
+namespace Drupal\Tests\user\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonBasicAuthTest.php
index ea6ddea..7a1ea26 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\User;
+namespace Drupal\Tests\user\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonCookieTest.php
index 9fae07d..6e325d8 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\User;
+namespace Drupal\Tests\user\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/User/UserResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/User/UserResourceTestBase.php
index 7974cba..65a0caa 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/User/UserResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/User/UserResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\User;
+namespace Drupal\Tests\user\Functional\Rest;
 
 use Drupal\Core\Url;
 use Drupal\Tests\rest\Functional\BcTimestampNormalizerUnixTestTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/User/UserXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/User/UserXmlAnonTest.php
index 8f1d483..4629192 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/User/UserXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/User/UserXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\User;
+namespace Drupal\Tests\user\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/User/UserXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/User/UserXmlBasicAuthTest.php
index 2281d33..fc98598 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/User/UserXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/User/UserXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\User;
+namespace Drupal\Tests\user\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/User/UserXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/User/UserXmlCookieTest.php
index 3e01ce0..9a0c724 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/User/UserXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/User/UserXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\User;
+namespace Drupal\Tests\user\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/View/ViewJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/View/ViewJsonAnonTest.php
index 3cfd4b1..694aee1 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/View/ViewJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/View/ViewJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\View;
+namespace Drupal\Tests\views\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/View/ViewJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/View/ViewJsonBasicAuthTest.php
index 98854f2..4ebe08c 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/View/ViewJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/View/ViewJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\View;
+namespace Drupal\Tests\views\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/View/ViewJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/View/ViewJsonCookieTest.php
index f5fa797..feeeab2 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/View/ViewJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/View/ViewJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\View;
+namespace Drupal\Tests\views\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/View/ViewResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/View/ViewResourceTestBase.php
index 26ec7bb..b572563 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/View/ViewResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/View/ViewResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\View;
+namespace Drupal\Tests\views\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
 use Drupal\views\Entity\View;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/View/ViewXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/View/ViewXmlAnonTest.php
index 2bef328..7582a54 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/View/ViewXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/View/ViewXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\View;
+namespace Drupal\Tests\views\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/View/ViewXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/View/ViewXmlBasicAuthTest.php
index 3059b5c..ba9e58b 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/View/ViewXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/View/ViewXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\View;
+namespace Drupal\Tests\views\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/View/ViewXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/View/ViewXmlCookieTest.php
index 24786a3..8f362a0 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/View/ViewXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/View/ViewXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\View;
+namespace Drupal\Tests\views\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonAnonTest.php
index 40f26ab..a85da93 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Vocabulary;
+namespace Drupal\Tests\taxonomy\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonBasicAuthTest.php
index 492a8ad..ec0d67e 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Vocabulary;
+namespace Drupal\Tests\taxonomy\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonCookieTest.php
index db8b657..51c79a6 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Vocabulary;
+namespace Drupal\Tests\taxonomy\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyResourceTestBase.php
index 5d03512..b1e87d9 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Vocabulary;
+namespace Drupal\Tests\taxonomy\Functional\Rest;
 
 use Drupal\taxonomy\Entity\Vocabulary;
 use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyXmlAnonTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyXmlAnonTest.php
index 3e2a300..ac8da3d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyXmlAnonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Vocabulary;
+namespace Drupal\Tests\taxonomy\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyXmlBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyXmlBasicAuthTest.php
index a62c5be..52b3741 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyXmlBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Vocabulary;
+namespace Drupal\Tests\taxonomy\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyXmlCookieTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyXmlCookieTest.php
index e1cd931..51e7e20 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyXmlCookieTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Vocabulary;
+namespace Drupal\Tests\taxonomy\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;