diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonAnonTest.php b/core/modules/aggregator/tests/src/Functional/Hal/FeedHalJsonAnonTest.php
similarity index 81%
rename from core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonAnonTest.php
rename to core/modules/aggregator/tests/src/Functional/Hal/FeedHalJsonAnonTest.php
index 293b7e4f7c..56f164b447 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonAnonTest.php
+++ b/core/modules/aggregator/tests/src/Functional/Hal/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/aggregator/tests/src/Functional/Hal/FeedHalJsonBasicAuthTest.php
similarity index 85%
rename from core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonBasicAuthTest.php
rename to core/modules/aggregator/tests/src/Functional/Hal/FeedHalJsonBasicAuthTest.php
index c3f91a7466..58bb47351a 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonBasicAuthTest.php
+++ b/core/modules/aggregator/tests/src/Functional/Hal/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/aggregator/tests/src/Functional/Hal/FeedHalJsonCookieTest.php
similarity index 80%
rename from core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonCookieTest.php
rename to core/modules/aggregator/tests/src/Functional/Hal/FeedHalJsonCookieTest.php
index fb4d64e76b..dd574d988d 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonCookieTest.php
+++ b/core/modules/aggregator/tests/src/Functional/Hal/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/aggregator/tests/src/Functional/Hal/FeedHalJsonTestBase.php
similarity index 90%
rename from core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonTestBase.php
rename to core/modules/aggregator/tests/src/Functional/Hal/FeedHalJsonTestBase.php
index 43181323e3..408955949f 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonTestBase.php
+++ b/core/modules/aggregator/tests/src/Functional/Hal/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/Item/ItemHalJsonAnonTest.php b/core/modules/aggregator/tests/src/Functional/Hal/ItemHalJsonAnonTest.php
similarity index 87%
rename from core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonAnonTest.php
rename to core/modules/aggregator/tests/src/Functional/Hal/ItemHalJsonAnonTest.php
index 6c35159685..20d37fa1ee 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonAnonTest.php
+++ b/core/modules/aggregator/tests/src/Functional/Hal/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/aggregator/tests/src/Functional/Hal/ItemHalJsonBasicAuthTest.php
similarity index 89%
rename from core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonBasicAuthTest.php
rename to core/modules/aggregator/tests/src/Functional/Hal/ItemHalJsonBasicAuthTest.php
index 2c96fbc68a..767c7025a4 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonBasicAuthTest.php
+++ b/core/modules/aggregator/tests/src/Functional/Hal/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/aggregator/tests/src/Functional/Hal/ItemHalJsonCookieTest.php
similarity index 89%
rename from core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonCookieTest.php
rename to core/modules/aggregator/tests/src/Functional/Hal/ItemHalJsonCookieTest.php
index 9c39918b55..161a735766 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonCookieTest.php
+++ b/core/modules/aggregator/tests/src/Functional/Hal/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/aggregator/tests/src/Functional/Hal/ItemHalJsonTestBase.php
similarity index 94%
rename from core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonTestBase.php
rename to core/modules/aggregator/tests/src/Functional/Hal/ItemHalJsonTestBase.php
index 24157e5979..c786b7b181 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonTestBase.php
+++ b/core/modules/aggregator/tests/src/Functional/Hal/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/rest/tests/src/Functional/EntityResource/Feed/FeedJsonAnonTest.php b/core/modules/aggregator/tests/src/Functional/Rest/FeedJsonAnonTest.php
similarity index 84%
rename from core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedJsonAnonTest.php
rename to core/modules/aggregator/tests/src/Functional/Rest/FeedJsonAnonTest.php
index a4b8e0dcdb..1550d74607 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedJsonAnonTest.php
+++ b/core/modules/aggregator/tests/src/Functional/Rest/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/aggregator/tests/src/Functional/Rest/FeedJsonBasicAuthTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedJsonBasicAuthTest.php
rename to core/modules/aggregator/tests/src/Functional/Rest/FeedJsonBasicAuthTest.php
index e5685c9cd6..e918ab9819 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedJsonBasicAuthTest.php
+++ b/core/modules/aggregator/tests/src/Functional/Rest/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/aggregator/tests/src/Functional/Rest/FeedJsonCookieTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedJsonCookieTest.php
rename to core/modules/aggregator/tests/src/Functional/Rest/FeedJsonCookieTest.php
index 7c1cc9f87a..e5e0c86a48 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedJsonCookieTest.php
+++ b/core/modules/aggregator/tests/src/Functional/Rest/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/aggregator/tests/src/Functional/Rest/FeedResourceTestBase.php
similarity index 96%
rename from core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedResourceTestBase.php
rename to core/modules/aggregator/tests/src/Functional/Rest/FeedResourceTestBase.php
index a89bde1b69..accaf0d97c 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedResourceTestBase.php
+++ b/core/modules/aggregator/tests/src/Functional/Rest/FeedResourceTestBase.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Feed;
+namespace Drupal\Tests\aggregator\Functional\Rest;
 
+use Drupal\Tests\entity_test\Functional\Rest\EntityTestResourceTestBase;
 use Drupal\Tests\rest\Functional\BcTimestampNormalizerUnixTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
 use Drupal\aggregator\Entity\Feed;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedXmlAnonTest.php b/core/modules/aggregator/tests/src/Functional/Rest/FeedXmlAnonTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedXmlAnonTest.php
rename to core/modules/aggregator/tests/src/Functional/Rest/FeedXmlAnonTest.php
index f2a3233df4..41b03a6a8a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedXmlAnonTest.php
+++ b/core/modules/aggregator/tests/src/Functional/Rest/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/aggregator/tests/src/Functional/Rest/FeedXmlBasicAuthTest.php
similarity index 91%
rename from core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedXmlBasicAuthTest.php
rename to core/modules/aggregator/tests/src/Functional/Rest/FeedXmlBasicAuthTest.php
index 08dc65d59e..450cc49eff 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedXmlBasicAuthTest.php
+++ b/core/modules/aggregator/tests/src/Functional/Rest/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/aggregator/tests/src/Functional/Rest/FeedXmlCookieTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedXmlCookieTest.php
rename to core/modules/aggregator/tests/src/Functional/Rest/FeedXmlCookieTest.php
index 377690ab3f..3fee585d07 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedXmlCookieTest.php
+++ b/core/modules/aggregator/tests/src/Functional/Rest/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/Item/ItemJsonAnonTest.php b/core/modules/aggregator/tests/src/Functional/Rest/ItemJsonAnonTest.php
similarity index 84%
rename from core/modules/rest/tests/src/Functional/EntityResource/Item/ItemJsonAnonTest.php
rename to core/modules/aggregator/tests/src/Functional/Rest/ItemJsonAnonTest.php
index dac1b0a6d0..13e24c3a45 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemJsonAnonTest.php
+++ b/core/modules/aggregator/tests/src/Functional/Rest/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/aggregator/tests/src/Functional/Rest/ItemJsonBasicAuthTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/Item/ItemJsonBasicAuthTest.php
rename to core/modules/aggregator/tests/src/Functional/Rest/ItemJsonBasicAuthTest.php
index 19b6179c7b..15f800d138 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemJsonBasicAuthTest.php
+++ b/core/modules/aggregator/tests/src/Functional/Rest/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/aggregator/tests/src/Functional/Rest/ItemJsonCookieTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/Item/ItemJsonCookieTest.php
rename to core/modules/aggregator/tests/src/Functional/Rest/ItemJsonCookieTest.php
index 1c149d7c62..1e6567b3e9 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemJsonCookieTest.php
+++ b/core/modules/aggregator/tests/src/Functional/Rest/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/aggregator/tests/src/Functional/Rest/ItemResourceTestBase.php
similarity index 98%
rename from core/modules/rest/tests/src/Functional/EntityResource/Item/ItemResourceTestBase.php
rename to core/modules/aggregator/tests/src/Functional/Rest/ItemResourceTestBase.php
index c7bd57a5c6..c7163e098a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemResourceTestBase.php
+++ b/core/modules/aggregator/tests/src/Functional/Rest/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/aggregator/tests/src/Functional/Rest/ItemXmlAnonTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/Item/ItemXmlAnonTest.php
rename to core/modules/aggregator/tests/src/Functional/Rest/ItemXmlAnonTest.php
index 72a30352b2..f61a878413 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemXmlAnonTest.php
+++ b/core/modules/aggregator/tests/src/Functional/Rest/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/aggregator/tests/src/Functional/Rest/ItemXmlBasicAuthTest.php
similarity index 91%
rename from core/modules/rest/tests/src/Functional/EntityResource/Item/ItemXmlBasicAuthTest.php
rename to core/modules/aggregator/tests/src/Functional/Rest/ItemXmlBasicAuthTest.php
index 8da0a58bad..438a4233ca 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemXmlBasicAuthTest.php
+++ b/core/modules/aggregator/tests/src/Functional/Rest/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/aggregator/tests/src/Functional/Rest/ItemXmlCookieTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/Item/ItemXmlCookieTest.php
rename to core/modules/aggregator/tests/src/Functional/Rest/ItemXmlCookieTest.php
index 5fae0691f8..69144066ad 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemXmlCookieTest.php
+++ b/core/modules/aggregator/tests/src/Functional/Rest/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/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonAnonTest.php b/core/modules/block/tests/src/Functional/Hal/BlockHalJsonAnonTest.php
similarity index 74%
rename from core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonAnonTest.php
rename to core/modules/block/tests/src/Functional/Hal/BlockHalJsonAnonTest.php
index d0563c0da2..3069667c2d 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonAnonTest.php
+++ b/core/modules/block/tests/src/Functional/Hal/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/block/tests/src/Functional/Hal/BlockHalJsonBasicAuthTest.php
similarity index 78%
rename from core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonBasicAuthTest.php
rename to core/modules/block/tests/src/Functional/Hal/BlockHalJsonBasicAuthTest.php
index 53bcd3e197..f95f6d732b 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonBasicAuthTest.php
+++ b/core/modules/block/tests/src/Functional/Hal/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/block/tests/src/Functional/Hal/BlockHalJsonCookieTest.php
similarity index 77%
rename from core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonCookieTest.php
rename to core/modules/block/tests/src/Functional/Hal/BlockHalJsonCookieTest.php
index 494bb4fe8d..87df9ff580 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonCookieTest.php
+++ b/core/modules/block/tests/src/Functional/Hal/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/rest/tests/src/Functional/EntityResource/Block/BlockJsonAnonTest.php b/core/modules/block/tests/src/Functional/Rest/BlockJsonAnonTest.php
similarity index 84%
rename from core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonAnonTest.php
rename to core/modules/block/tests/src/Functional/Rest/BlockJsonAnonTest.php
index 2312de02c4..1d98bcc88d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonAnonTest.php
+++ b/core/modules/block/tests/src/Functional/Rest/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/block/tests/src/Functional/Rest/BlockJsonBasicAuthTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonBasicAuthTest.php
rename to core/modules/block/tests/src/Functional/Rest/BlockJsonBasicAuthTest.php
index ea690b49a4..9c2a272826 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonBasicAuthTest.php
+++ b/core/modules/block/tests/src/Functional/Rest/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/block/tests/src/Functional/Rest/BlockJsonCookieTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonCookieTest.php
rename to core/modules/block/tests/src/Functional/Rest/BlockJsonCookieTest.php
index c15ff8f2df..adef298b8b 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonCookieTest.php
+++ b/core/modules/block/tests/src/Functional/Rest/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/block/tests/src/Functional/Rest/BlockResourceTestBase.php
similarity index 98%
rename from core/modules/rest/tests/src/Functional/EntityResource/Block/BlockResourceTestBase.php
rename to core/modules/block/tests/src/Functional/Rest/BlockResourceTestBase.php
index 13a456842f..998690caa8 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockResourceTestBase.php
+++ b/core/modules/block/tests/src/Functional/Rest/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/block/tests/src/Functional/Rest/BlockXmlAnonTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/Block/BlockXmlAnonTest.php
rename to core/modules/block/tests/src/Functional/Rest/BlockXmlAnonTest.php
index 7861e2e587..923f02d83f 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockXmlAnonTest.php
+++ b/core/modules/block/tests/src/Functional/Rest/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/block/tests/src/Functional/Rest/BlockXmlBasicAuthTest.php
similarity index 91%
rename from core/modules/rest/tests/src/Functional/EntityResource/Block/BlockXmlBasicAuthTest.php
rename to core/modules/block/tests/src/Functional/Rest/BlockXmlBasicAuthTest.php
index 6594f4fdeb..2b720d1d9f 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockXmlBasicAuthTest.php
+++ b/core/modules/block/tests/src/Functional/Rest/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/block/tests/src/Functional/Rest/BlockXmlCookieTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/Block/BlockXmlCookieTest.php
rename to core/modules/block/tests/src/Functional/Rest/BlockXmlCookieTest.php
index 34a0937126..9474dbdf0d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockXmlCookieTest.php
+++ b/core/modules/block/tests/src/Functional/Rest/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/hal/tests/src/Functional/EntityResource/BlockContent/BlockContentHalJsonAnonTest.php b/core/modules/block_content/tests/src/Functional/Hal/BlockContentHalJsonAnonTest.php
similarity index 90%
rename from core/modules/hal/tests/src/Functional/EntityResource/BlockContent/BlockContentHalJsonAnonTest.php
rename to core/modules/block_content/tests/src/Functional/Hal/BlockContentHalJsonAnonTest.php
index d4ee9ab0e1..33c1108d24 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/BlockContent/BlockContentHalJsonAnonTest.php
+++ b/core/modules/block_content/tests/src/Functional/Hal/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/block_content/tests/src/Functional/Hal/BlockContentHalJsonBasicAuthTest.php
similarity index 84%
rename from core/modules/hal/tests/src/Functional/EntityResource/BlockContent/BlockContentHalJsonBasicAuthTest.php
rename to core/modules/block_content/tests/src/Functional/Hal/BlockContentHalJsonBasicAuthTest.php
index 94d3ff4ec5..b9b262e9be 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/BlockContent/BlockContentHalJsonBasicAuthTest.php
+++ b/core/modules/block_content/tests/src/Functional/Hal/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/block_content/tests/src/Functional/Hal/BlockContentHalJsonCookieTest.php
similarity index 79%
rename from core/modules/hal/tests/src/Functional/EntityResource/BlockContent/BlockContentHalJsonCookieTest.php
rename to core/modules/block_content/tests/src/Functional/Hal/BlockContentHalJsonCookieTest.php
index 9cc0f25138..2446dfb657 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/BlockContent/BlockContentHalJsonCookieTest.php
+++ b/core/modules/block_content/tests/src/Functional/Hal/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/block_content/tests/src/Functional/Hal/BlockContentTypeHalJsonAnonTest.php
similarity index 71%
rename from core/modules/hal/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeHalJsonAnonTest.php
rename to core/modules/block_content/tests/src/Functional/Hal/BlockContentTypeHalJsonAnonTest.php
index 006f8fb544..3bfff1068a 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeHalJsonAnonTest.php
+++ b/core/modules/block_content/tests/src/Functional/Hal/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/block_content/tests/src/Functional/Hal/BlockContentTypeHalJsonBasicAuthTest.php
similarity index 75%
rename from core/modules/hal/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeHalJsonBasicAuthTest.php
rename to core/modules/block_content/tests/src/Functional/Hal/BlockContentTypeHalJsonBasicAuthTest.php
index 7d392cc319..6112c2b60a 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeHalJsonBasicAuthTest.php
+++ b/core/modules/block_content/tests/src/Functional/Hal/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/block_content/tests/src/Functional/Hal/BlockContentTypeHalJsonCookieTest.php
similarity index 74%
rename from core/modules/hal/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeHalJsonCookieTest.php
rename to core/modules/block_content/tests/src/Functional/Hal/BlockContentTypeHalJsonCookieTest.php
index 565bcf3d75..889d775cde 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeHalJsonCookieTest.php
+++ b/core/modules/block_content/tests/src/Functional/Hal/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/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentJsonAnonTest.php b/core/modules/block_content/tests/src/Functional/Rest/BlockContentJsonAnonTest.php
similarity index 83%
rename from core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentJsonAnonTest.php
rename to core/modules/block_content/tests/src/Functional/Rest/BlockContentJsonAnonTest.php
index 16688cb52d..844f9278b5 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentJsonAnonTest.php
+++ b/core/modules/block_content/tests/src/Functional/Rest/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/block_content/tests/src/Functional/Rest/BlockContentJsonBasicAuthTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentJsonBasicAuthTest.php
rename to core/modules/block_content/tests/src/Functional/Rest/BlockContentJsonBasicAuthTest.php
index c804632a69..63bf314eb5 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentJsonBasicAuthTest.php
+++ b/core/modules/block_content/tests/src/Functional/Rest/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/block_content/tests/src/Functional/Rest/BlockContentJsonCookieTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentJsonCookieTest.php
rename to core/modules/block_content/tests/src/Functional/Rest/BlockContentJsonCookieTest.php
index 75bb3c2fda..4c27734072 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentJsonCookieTest.php
+++ b/core/modules/block_content/tests/src/Functional/Rest/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/block_content/tests/src/Functional/Rest/BlockContentResourceTestBase.php
similarity index 98%
rename from core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentResourceTestBase.php
rename to core/modules/block_content/tests/src/Functional/Rest/BlockContentResourceTestBase.php
index f5b3fdcc15..54098a1b9b 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentResourceTestBase.php
+++ b/core/modules/block_content/tests/src/Functional/Rest/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/BlockContentType/BlockContentTypeJsonAnonTest.php b/core/modules/block_content/tests/src/Functional/Rest/BlockContentTypeJsonAnonTest.php
similarity index 82%
rename from core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeJsonAnonTest.php
rename to core/modules/block_content/tests/src/Functional/Rest/BlockContentTypeJsonAnonTest.php
index 9671708ac9..3fcbd43f53 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeJsonAnonTest.php
+++ b/core/modules/block_content/tests/src/Functional/Rest/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/block_content/tests/src/Functional/Rest/BlockContentTypeJsonBasicAuthTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeJsonBasicAuthTest.php
rename to core/modules/block_content/tests/src/Functional/Rest/BlockContentTypeJsonBasicAuthTest.php
index e46afdcbe0..a993d1f1bd 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeJsonBasicAuthTest.php
+++ b/core/modules/block_content/tests/src/Functional/Rest/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/block_content/tests/src/Functional/Rest/BlockContentTypeJsonCookieTest.php
similarity index 85%
rename from core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeJsonCookieTest.php
rename to core/modules/block_content/tests/src/Functional/Rest/BlockContentTypeJsonCookieTest.php
index 653d5c0233..c938f1393d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeJsonCookieTest.php
+++ b/core/modules/block_content/tests/src/Functional/Rest/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/block_content/tests/src/Functional/Rest/BlockContentTypeResourceTestBase.php
similarity index 95%
rename from core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeResourceTestBase.php
rename to core/modules/block_content/tests/src/Functional/Rest/BlockContentTypeResourceTestBase.php
index f96f40ec86..13d6ed2d00 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeResourceTestBase.php
+++ b/core/modules/block_content/tests/src/Functional/Rest/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/block_content/tests/src/Functional/Rest/BlockContentTypeXmlAnonTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeXmlAnonTest.php
rename to core/modules/block_content/tests/src/Functional/Rest/BlockContentTypeXmlAnonTest.php
index 924b2b7dea..2277d6b978 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeXmlAnonTest.php
+++ b/core/modules/block_content/tests/src/Functional/Rest/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/block_content/tests/src/Functional/Rest/BlockContentTypeXmlBasicAuthTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeXmlBasicAuthTest.php
rename to core/modules/block_content/tests/src/Functional/Rest/BlockContentTypeXmlBasicAuthTest.php
index 0f294c5325..a878c7d5b3 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeXmlBasicAuthTest.php
+++ b/core/modules/block_content/tests/src/Functional/Rest/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/block_content/tests/src/Functional/Rest/BlockContentTypeXmlCookieTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeXmlCookieTest.php
rename to core/modules/block_content/tests/src/Functional/Rest/BlockContentTypeXmlCookieTest.php
index bd39e01670..836c330dce 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeXmlCookieTest.php
+++ b/core/modules/block_content/tests/src/Functional/Rest/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/BlockContent/BlockContentXmlAnonTest.php b/core/modules/block_content/tests/src/Functional/Rest/BlockContentXmlAnonTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentXmlAnonTest.php
rename to core/modules/block_content/tests/src/Functional/Rest/BlockContentXmlAnonTest.php
index 5f13cf0c43..fba08ed473 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentXmlAnonTest.php
+++ b/core/modules/block_content/tests/src/Functional/Rest/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/block_content/tests/src/Functional/Rest/BlockContentXmlBasicAuthTest.php
similarity index 90%
rename from core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentXmlBasicAuthTest.php
rename to core/modules/block_content/tests/src/Functional/Rest/BlockContentXmlBasicAuthTest.php
index c02d2f0d4d..199abea08d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentXmlBasicAuthTest.php
+++ b/core/modules/block_content/tests/src/Functional/Rest/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/block_content/tests/src/Functional/Rest/BlockContentXmlCookieTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentXmlCookieTest.php
rename to core/modules/block_content/tests/src/Functional/Rest/BlockContentXmlCookieTest.php
index 6a605d49da..6251455952 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentXmlCookieTest.php
+++ b/core/modules/block_content/tests/src/Functional/Rest/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/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonAnonTest.php b/core/modules/comment/tests/src/Functional/Hal/CommentHalJsonAnonTest.php
similarity index 92%
rename from core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonAnonTest.php
rename to core/modules/comment/tests/src/Functional/Hal/CommentHalJsonAnonTest.php
index 3edd9b1609..0ac02d9070 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonAnonTest.php
+++ b/core/modules/comment/tests/src/Functional/Hal/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/comment/tests/src/Functional/Hal/CommentHalJsonBasicAuthTest.php
similarity index 84%
rename from core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonBasicAuthTest.php
rename to core/modules/comment/tests/src/Functional/Hal/CommentHalJsonBasicAuthTest.php
index 7e2dc57cd1..7d766fdfca 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonBasicAuthTest.php
+++ b/core/modules/comment/tests/src/Functional/Hal/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/comment/tests/src/Functional/Hal/CommentHalJsonCookieTest.php
similarity index 80%
rename from core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonCookieTest.php
rename to core/modules/comment/tests/src/Functional/Hal/CommentHalJsonCookieTest.php
index 292dc94b64..806cf3fdcc 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonCookieTest.php
+++ b/core/modules/comment/tests/src/Functional/Hal/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/comment/tests/src/Functional/Hal/CommentHalJsonTestBase.php
similarity index 95%
rename from core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonTestBase.php
rename to core/modules/comment/tests/src/Functional/Hal/CommentHalJsonTestBase.php
index 1939e04364..1d3b7c9a00 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonTestBase.php
+++ b/core/modules/comment/tests/src/Functional/Hal/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/comment/tests/src/Functional/Hal/CommentTypeHalJsonAnonTest.php
similarity index 72%
rename from core/modules/hal/tests/src/Functional/EntityResource/CommentType/CommentTypeHalJsonAnonTest.php
rename to core/modules/comment/tests/src/Functional/Hal/CommentTypeHalJsonAnonTest.php
index 37cf717580..179ae18612 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/CommentType/CommentTypeHalJsonAnonTest.php
+++ b/core/modules/comment/tests/src/Functional/Hal/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/comment/tests/src/Functional/Hal/CommentTypeHalJsonBasicAuthTest.php
similarity index 77%
rename from core/modules/hal/tests/src/Functional/EntityResource/CommentType/CommentTypeHalJsonBasicAuthTest.php
rename to core/modules/comment/tests/src/Functional/Hal/CommentTypeHalJsonBasicAuthTest.php
index 62b48afd30..3a014bd1d1 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/CommentType/CommentTypeHalJsonBasicAuthTest.php
+++ b/core/modules/comment/tests/src/Functional/Hal/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/comment/tests/src/Functional/Hal/CommentTypeHalJsonCookieTest.php
similarity index 76%
rename from core/modules/hal/tests/src/Functional/EntityResource/CommentType/CommentTypeHalJsonCookieTest.php
rename to core/modules/comment/tests/src/Functional/Hal/CommentTypeHalJsonCookieTest.php
index 4a2913be3c..9d6440ead4 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/CommentType/CommentTypeHalJsonCookieTest.php
+++ b/core/modules/comment/tests/src/Functional/Hal/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/rest/tests/src/Functional/EntityResource/Comment/CommentJsonAnonTest.php b/core/modules/comment/tests/src/Functional/Rest/CommentJsonAnonTest.php
similarity index 92%
rename from core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonAnonTest.php
rename to core/modules/comment/tests/src/Functional/Rest/CommentJsonAnonTest.php
index 5aef7cf24b..a3a6cfeb34 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonAnonTest.php
+++ b/core/modules/comment/tests/src/Functional/Rest/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/comment/tests/src/Functional/Rest/CommentJsonBasicAuthTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonBasicAuthTest.php
rename to core/modules/comment/tests/src/Functional/Rest/CommentJsonBasicAuthTest.php
index e05d733f67..a4f72551a4 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonBasicAuthTest.php
+++ b/core/modules/comment/tests/src/Functional/Rest/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/comment/tests/src/Functional/Rest/CommentJsonCookieTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonCookieTest.php
rename to core/modules/comment/tests/src/Functional/Rest/CommentJsonCookieTest.php
index 945b34a0de..f2c78a25a2 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonCookieTest.php
+++ b/core/modules/comment/tests/src/Functional/Rest/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/comment/tests/src/Functional/Rest/CommentResourceTestBase.php
similarity index 99%
rename from core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentResourceTestBase.php
rename to core/modules/comment/tests/src/Functional/Rest/CommentResourceTestBase.php
index d3098545cd..f25567dd28 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentResourceTestBase.php
+++ b/core/modules/comment/tests/src/Functional/Rest/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/CommentType/CommentTypeJsonAnonTest.php b/core/modules/comment/tests/src/Functional/Rest/CommentTypeJsonAnonTest.php
similarity index 83%
rename from core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeJsonAnonTest.php
rename to core/modules/comment/tests/src/Functional/Rest/CommentTypeJsonAnonTest.php
index ac27de004b..496e20aa60 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeJsonAnonTest.php
+++ b/core/modules/comment/tests/src/Functional/Rest/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/comment/tests/src/Functional/Rest/CommentTypeJsonBasicAuthTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeJsonBasicAuthTest.php
rename to core/modules/comment/tests/src/Functional/Rest/CommentTypeJsonBasicAuthTest.php
index b91bad8baf..c947dbc92c 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeJsonBasicAuthTest.php
+++ b/core/modules/comment/tests/src/Functional/Rest/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/comment/tests/src/Functional/Rest/CommentTypeJsonCookieTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeJsonCookieTest.php
rename to core/modules/comment/tests/src/Functional/Rest/CommentTypeJsonCookieTest.php
index 5915e29d59..ddbdf27ccb 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeJsonCookieTest.php
+++ b/core/modules/comment/tests/src/Functional/Rest/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/comment/tests/src/Functional/Rest/CommentTypeResourceTestBase.php
similarity index 96%
rename from core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeResourceTestBase.php
rename to core/modules/comment/tests/src/Functional/Rest/CommentTypeResourceTestBase.php
index 9d882117f9..5d9b413362 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeResourceTestBase.php
+++ b/core/modules/comment/tests/src/Functional/Rest/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/comment/tests/src/Functional/Rest/CommentTypeXmlAnonTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeXmlAnonTest.php
rename to core/modules/comment/tests/src/Functional/Rest/CommentTypeXmlAnonTest.php
index bfda97a8a6..96d6c41a0e 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeXmlAnonTest.php
+++ b/core/modules/comment/tests/src/Functional/Rest/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/comment/tests/src/Functional/Rest/CommentTypeXmlBasicAuthTest.php
similarity index 90%
rename from core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeXmlBasicAuthTest.php
rename to core/modules/comment/tests/src/Functional/Rest/CommentTypeXmlBasicAuthTest.php
index 04b114ad0a..e92f2bcc65 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeXmlBasicAuthTest.php
+++ b/core/modules/comment/tests/src/Functional/Rest/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/comment/tests/src/Functional/Rest/CommentTypeXmlCookieTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeXmlCookieTest.php
rename to core/modules/comment/tests/src/Functional/Rest/CommentTypeXmlCookieTest.php
index 545b8c190e..01f42db448 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeXmlCookieTest.php
+++ b/core/modules/comment/tests/src/Functional/Rest/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/Comment/CommentXmlAnonTest.php b/core/modules/comment/tests/src/Functional/Rest/CommentXmlAnonTest.php
similarity index 95%
rename from core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentXmlAnonTest.php
rename to core/modules/comment/tests/src/Functional/Rest/CommentXmlAnonTest.php
index aa45f5c6d3..c2e529e3dd 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentXmlAnonTest.php
+++ b/core/modules/comment/tests/src/Functional/Rest/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/comment/tests/src/Functional/Rest/CommentXmlBasicAuthTest.php
similarity index 93%
rename from core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentXmlBasicAuthTest.php
rename to core/modules/comment/tests/src/Functional/Rest/CommentXmlBasicAuthTest.php
index c167ea7576..d1f38e44a4 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentXmlBasicAuthTest.php
+++ b/core/modules/comment/tests/src/Functional/Rest/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/comment/tests/src/Functional/Rest/CommentXmlCookieTest.php
similarity index 93%
rename from core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentXmlCookieTest.php
rename to core/modules/comment/tests/src/Functional/Rest/CommentXmlCookieTest.php
index 1ece71b791..e06cf26521 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentXmlCookieTest.php
+++ b/core/modules/comment/tests/src/Functional/Rest/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/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonAnonTest.php b/core/modules/config/tests/config_test/tests/src/Functional/Hal/ConfigTestHalJsonAnonTest.php
similarity index 73%
rename from core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonAnonTest.php
rename to core/modules/config/tests/config_test/tests/src/Functional/Hal/ConfigTestHalJsonAnonTest.php
index dbe2a3d8c5..d874f45f26 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonAnonTest.php
+++ b/core/modules/config/tests/config_test/tests/src/Functional/Hal/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/config/tests/config_test/tests/src/Functional/Hal/ConfigTestHalJsonBasicAuthTest.php
similarity index 77%
rename from core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonBasicAuthTest.php
rename to core/modules/config/tests/config_test/tests/src/Functional/Hal/ConfigTestHalJsonBasicAuthTest.php
index 99345ede79..01a69c329d 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonBasicAuthTest.php
+++ b/core/modules/config/tests/config_test/tests/src/Functional/Hal/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/config/tests/config_test/tests/src/Functional/Hal/ConfigTestHalJsonCookieTest.php
similarity index 67%
rename from core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonCookieTest.php
rename to core/modules/config/tests/config_test/tests/src/Functional/Hal/ConfigTestHalJsonCookieTest.php
index d892abf5e6..4f02a866a4 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonCookieTest.php
+++ b/core/modules/config/tests/config_test/tests/src/Functional/Hal/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/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonAnonTest.php b/core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestJsonAnonTest.php
similarity index 83%
rename from core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonAnonTest.php
rename to core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestJsonAnonTest.php
index 32997dc156..0121b1f3a4 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonAnonTest.php
+++ b/core/modules/config/tests/config_test/tests/src/Functional/Rest/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/config/tests/config_test/tests/src/Functional/Rest/ConfigTestJsonBasicAuthTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonBasicAuthTest.php
rename to core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestJsonBasicAuthTest.php
index 1144e76a16..87c415840a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonBasicAuthTest.php
+++ b/core/modules/config/tests/config_test/tests/src/Functional/Rest/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/config/tests/config_test/tests/src/Functional/Rest/ConfigTestJsonCookieTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonCookieTest.php
rename to core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestJsonCookieTest.php
index fe257863d3..173d761332 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonCookieTest.php
+++ b/core/modules/config/tests/config_test/tests/src/Functional/Rest/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/config/tests/config_test/tests/src/Functional/Rest/ConfigTestResourceTestBase.php
similarity index 95%
rename from core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestResourceTestBase.php
rename to core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestResourceTestBase.php
index 9fe073b097..9ab65d76ae 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestResourceTestBase.php
+++ b/core/modules/config/tests/config_test/tests/src/Functional/Rest/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/config/tests/config_test/tests/src/Functional/Rest/ConfigTestXmlAnonTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestXmlAnonTest.php
rename to core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestXmlAnonTest.php
index 2df1af77e3..451e86df22 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestXmlAnonTest.php
+++ b/core/modules/config/tests/config_test/tests/src/Functional/Rest/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/config/tests/config_test/tests/src/Functional/Rest/ConfigTestXmlBasicAuthTest.php
similarity index 90%
rename from core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestXmlBasicAuthTest.php
rename to core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestXmlBasicAuthTest.php
index b1e6f762c5..c65028f212 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestXmlBasicAuthTest.php
+++ b/core/modules/config/tests/config_test/tests/src/Functional/Rest/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/config/tests/config_test/tests/src/Functional/Rest/ConfigTestXmlCookieTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestXmlCookieTest.php
rename to core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestXmlCookieTest.php
index 6e8bf50d0e..540b14e8d3 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestXmlCookieTest.php
+++ b/core/modules/config/tests/config_test/tests/src/Functional/Rest/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/hal/tests/src/Functional/EntityResource/ContactForm/ContactFormHalJsonAnonTest.php b/core/modules/contact/tests/src/Functional/Hal/ContactFormHalJsonAnonTest.php
similarity index 72%
rename from core/modules/hal/tests/src/Functional/EntityResource/ContactForm/ContactFormHalJsonAnonTest.php
rename to core/modules/contact/tests/src/Functional/Hal/ContactFormHalJsonAnonTest.php
index 57d6177922..e863c978dd 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ContactForm/ContactFormHalJsonAnonTest.php
+++ b/core/modules/contact/tests/src/Functional/Hal/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/contact/tests/src/Functional/Hal/ContactFormHalJsonBasicAuthTest.php
similarity index 77%
rename from core/modules/hal/tests/src/Functional/EntityResource/ContactForm/ContactFormHalJsonBasicAuthTest.php
rename to core/modules/contact/tests/src/Functional/Hal/ContactFormHalJsonBasicAuthTest.php
index 9aec186e15..7280cfdc7e 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ContactForm/ContactFormHalJsonBasicAuthTest.php
+++ b/core/modules/contact/tests/src/Functional/Hal/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/contact/tests/src/Functional/Hal/ContactFormHalJsonCookieTest.php
similarity index 76%
rename from core/modules/hal/tests/src/Functional/EntityResource/ContactForm/ContactFormHalJsonCookieTest.php
rename to core/modules/contact/tests/src/Functional/Hal/ContactFormHalJsonCookieTest.php
index 0d78991f95..2592ae7614 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ContactForm/ContactFormHalJsonCookieTest.php
+++ b/core/modules/contact/tests/src/Functional/Hal/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/Message/MessageHalJsonAnonTest.php b/core/modules/contact/tests/src/Functional/Hal/MessageHalJsonAnonTest.php
similarity index 84%
rename from core/modules/hal/tests/src/Functional/EntityResource/Message/MessageHalJsonAnonTest.php
rename to core/modules/contact/tests/src/Functional/Hal/MessageHalJsonAnonTest.php
index a9b3ae175b..088a872798 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Message/MessageHalJsonAnonTest.php
+++ b/core/modules/contact/tests/src/Functional/Hal/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/contact/tests/src/Functional/Hal/MessageHalJsonBasicAuthTest.php
similarity index 84%
rename from core/modules/hal/tests/src/Functional/EntityResource/Message/MessageHalJsonBasicAuthTest.php
rename to core/modules/contact/tests/src/Functional/Hal/MessageHalJsonBasicAuthTest.php
index a24fd6e1b9..363dbd7c87 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Message/MessageHalJsonBasicAuthTest.php
+++ b/core/modules/contact/tests/src/Functional/Hal/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/contact/tests/src/Functional/Hal/MessageHalJsonCookieTest.php
similarity index 80%
rename from core/modules/hal/tests/src/Functional/EntityResource/Message/MessageHalJsonCookieTest.php
rename to core/modules/contact/tests/src/Functional/Hal/MessageHalJsonCookieTest.php
index c6ea4ac8f5..0353cd2ea3 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Message/MessageHalJsonCookieTest.php
+++ b/core/modules/contact/tests/src/Functional/Hal/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/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormJsonAnonTest.php b/core/modules/contact/tests/src/Functional/Rest/ContactFormJsonAnonTest.php
similarity index 83%
rename from core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormJsonAnonTest.php
rename to core/modules/contact/tests/src/Functional/Rest/ContactFormJsonAnonTest.php
index a5f360214f..fecbf68870 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormJsonAnonTest.php
+++ b/core/modules/contact/tests/src/Functional/Rest/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/contact/tests/src/Functional/Rest/ContactFormJsonBasicAuthTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormJsonBasicAuthTest.php
rename to core/modules/contact/tests/src/Functional/Rest/ContactFormJsonBasicAuthTest.php
index c41b9a4ef4..8e92a91009 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormJsonBasicAuthTest.php
+++ b/core/modules/contact/tests/src/Functional/Rest/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/contact/tests/src/Functional/Rest/ContactFormJsonCookieTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormJsonCookieTest.php
rename to core/modules/contact/tests/src/Functional/Rest/ContactFormJsonCookieTest.php
index 2b8d9137cc..6ba666043a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormJsonCookieTest.php
+++ b/core/modules/contact/tests/src/Functional/Rest/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/contact/tests/src/Functional/Rest/ContactFormResourceTestBase.php
similarity index 97%
rename from core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormResourceTestBase.php
rename to core/modules/contact/tests/src/Functional/Rest/ContactFormResourceTestBase.php
index 51e297a7b8..98edc5ae91 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormResourceTestBase.php
+++ b/core/modules/contact/tests/src/Functional/Rest/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/contact/tests/src/Functional/Rest/ContactFormXmlAnonTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormXmlAnonTest.php
rename to core/modules/contact/tests/src/Functional/Rest/ContactFormXmlAnonTest.php
index 0c4b6cbdce..2931edda8d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormXmlAnonTest.php
+++ b/core/modules/contact/tests/src/Functional/Rest/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/contact/tests/src/Functional/Rest/ContactFormXmlBasicAuthTest.php
similarity index 90%
rename from core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormXmlBasicAuthTest.php
rename to core/modules/contact/tests/src/Functional/Rest/ContactFormXmlBasicAuthTest.php
index 215501dc85..dfc4b6498a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormXmlBasicAuthTest.php
+++ b/core/modules/contact/tests/src/Functional/Rest/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/contact/tests/src/Functional/Rest/ContactFormXmlCookieTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormXmlCookieTest.php
rename to core/modules/contact/tests/src/Functional/Rest/ContactFormXmlCookieTest.php
index 6134733f3e..cdcd2daa3e 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormXmlCookieTest.php
+++ b/core/modules/contact/tests/src/Functional/Rest/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/Message/MessageJsonAnonTest.php b/core/modules/contact/tests/src/Functional/Rest/MessageJsonAnonTest.php
similarity index 84%
rename from core/modules/rest/tests/src/Functional/EntityResource/Message/MessageJsonAnonTest.php
rename to core/modules/contact/tests/src/Functional/Rest/MessageJsonAnonTest.php
index 9f5b8580b2..a5b2954249 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageJsonAnonTest.php
+++ b/core/modules/contact/tests/src/Functional/Rest/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/contact/tests/src/Functional/Rest/MessageJsonBasicAuthTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/Message/MessageJsonBasicAuthTest.php
rename to core/modules/contact/tests/src/Functional/Rest/MessageJsonBasicAuthTest.php
index 1232fb7ba5..f7f759ab90 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageJsonBasicAuthTest.php
+++ b/core/modules/contact/tests/src/Functional/Rest/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/contact/tests/src/Functional/Rest/MessageJsonCookieTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/Message/MessageJsonCookieTest.php
rename to core/modules/contact/tests/src/Functional/Rest/MessageJsonCookieTest.php
index ebe7281629..0444a5a06a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageJsonCookieTest.php
+++ b/core/modules/contact/tests/src/Functional/Rest/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/contact/tests/src/Functional/Rest/MessageResourceTestBase.php
similarity index 98%
rename from core/modules/rest/tests/src/Functional/EntityResource/Message/MessageResourceTestBase.php
rename to core/modules/contact/tests/src/Functional/Rest/MessageResourceTestBase.php
index 3f1cab9b91..f0ff8f85f9 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageResourceTestBase.php
+++ b/core/modules/contact/tests/src/Functional/Rest/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/contact/tests/src/Functional/Rest/MessageXmlAnonTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/Message/MessageXmlAnonTest.php
rename to core/modules/contact/tests/src/Functional/Rest/MessageXmlAnonTest.php
index 815712768c..6b9b10de8a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageXmlAnonTest.php
+++ b/core/modules/contact/tests/src/Functional/Rest/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/contact/tests/src/Functional/Rest/MessageXmlBasicAuthTest.php
similarity index 90%
rename from core/modules/rest/tests/src/Functional/EntityResource/Message/MessageXmlBasicAuthTest.php
rename to core/modules/contact/tests/src/Functional/Rest/MessageXmlBasicAuthTest.php
index 496abc860f..152a94a86f 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageXmlBasicAuthTest.php
+++ b/core/modules/contact/tests/src/Functional/Rest/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/contact/tests/src/Functional/Rest/MessageXmlCookieTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/Message/MessageXmlCookieTest.php
rename to core/modules/contact/tests/src/Functional/Rest/MessageXmlCookieTest.php
index 14e27d993c..ecdf0dba55 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageXmlCookieTest.php
+++ b/core/modules/contact/tests/src/Functional/Rest/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/datetime/tests/src/Functional/EntityResource/EntityTest/EntityTestDateonlyTest.php b/core/modules/datetime/tests/src/Functional/EntityResource/EntityTest/EntityTestDateonlyTest.php
index 1051ce45ff..0fb404d2b9 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 ffce48c340..cdd4d605d0 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/Editor/EditorHalJsonAnonTest.php b/core/modules/editor/tests/src/Functional/Hal/EditorHalJsonAnonTest.php
similarity index 74%
rename from core/modules/hal/tests/src/Functional/EntityResource/Editor/EditorHalJsonAnonTest.php
rename to core/modules/editor/tests/src/Functional/Hal/EditorHalJsonAnonTest.php
index 9b68c54f34..97d917d6dc 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Editor/EditorHalJsonAnonTest.php
+++ b/core/modules/editor/tests/src/Functional/Hal/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/editor/tests/src/Functional/Hal/EditorHalJsonBasicAuthTest.php
similarity index 78%
rename from core/modules/hal/tests/src/Functional/EntityResource/Editor/EditorHalJsonBasicAuthTest.php
rename to core/modules/editor/tests/src/Functional/Hal/EditorHalJsonBasicAuthTest.php
index 9a317a52fd..05f496bb6f 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Editor/EditorHalJsonBasicAuthTest.php
+++ b/core/modules/editor/tests/src/Functional/Hal/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/editor/tests/src/Functional/Hal/EditorHalJsonCookieTest.php
similarity index 77%
rename from core/modules/hal/tests/src/Functional/EntityResource/Editor/EditorHalJsonCookieTest.php
rename to core/modules/editor/tests/src/Functional/Hal/EditorHalJsonCookieTest.php
index a59392fe9d..4fe7ec9885 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Editor/EditorHalJsonCookieTest.php
+++ b/core/modules/editor/tests/src/Functional/Hal/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/rest/tests/src/Functional/EntityResource/Editor/EditorJsonAnonTest.php b/core/modules/editor/tests/src/Functional/Rest/EditorJsonAnonTest.php
similarity index 84%
rename from core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorJsonAnonTest.php
rename to core/modules/editor/tests/src/Functional/Rest/EditorJsonAnonTest.php
index b01ac2ac46..3809f0aedd 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorJsonAnonTest.php
+++ b/core/modules/editor/tests/src/Functional/Rest/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/editor/tests/src/Functional/Rest/EditorJsonBasicAuthTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorJsonBasicAuthTest.php
rename to core/modules/editor/tests/src/Functional/Rest/EditorJsonBasicAuthTest.php
index 265bd48ee0..f0c301030a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorJsonBasicAuthTest.php
+++ b/core/modules/editor/tests/src/Functional/Rest/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/editor/tests/src/Functional/Rest/EditorJsonCookieTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorJsonCookieTest.php
rename to core/modules/editor/tests/src/Functional/Rest/EditorJsonCookieTest.php
index b4f509a2ee..95f1024c67 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorJsonCookieTest.php
+++ b/core/modules/editor/tests/src/Functional/Rest/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/editor/tests/src/Functional/Rest/EditorResourceTestBase.php
similarity index 98%
rename from core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorResourceTestBase.php
rename to core/modules/editor/tests/src/Functional/Rest/EditorResourceTestBase.php
index 4eb4a6e1b0..2dc43dc6a3 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorResourceTestBase.php
+++ b/core/modules/editor/tests/src/Functional/Rest/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/editor/tests/src/Functional/Rest/EditorXmlAnonTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorXmlAnonTest.php
rename to core/modules/editor/tests/src/Functional/Rest/EditorXmlAnonTest.php
index 763f9f908e..d5be1f6deb 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorXmlAnonTest.php
+++ b/core/modules/editor/tests/src/Functional/Rest/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/editor/tests/src/Functional/Rest/EditorXmlBasicAuthTest.php
similarity index 90%
rename from core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorXmlBasicAuthTest.php
rename to core/modules/editor/tests/src/Functional/Rest/EditorXmlBasicAuthTest.php
index aa1c042794..acab40b9a4 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorXmlBasicAuthTest.php
+++ b/core/modules/editor/tests/src/Functional/Rest/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/editor/tests/src/Functional/Rest/EditorXmlCookieTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorXmlCookieTest.php
rename to core/modules/editor/tests/src/Functional/Rest/EditorXmlCookieTest.php
index 61dbcfee3e..8940095162 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorXmlCookieTest.php
+++ b/core/modules/editor/tests/src/Functional/Rest/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/hal/tests/src/Functional/EntityResource/FieldConfig/FieldConfigHalJsonAnonTest.php b/core/modules/field/tests/src/Functional/Hal/FieldConfigHalJsonAnonTest.php
similarity index 72%
rename from core/modules/hal/tests/src/Functional/EntityResource/FieldConfig/FieldConfigHalJsonAnonTest.php
rename to core/modules/field/tests/src/Functional/Hal/FieldConfigHalJsonAnonTest.php
index 54a418aed4..2137336c18 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/FieldConfig/FieldConfigHalJsonAnonTest.php
+++ b/core/modules/field/tests/src/Functional/Hal/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/field/tests/src/Functional/Hal/FieldConfigHalJsonBasicAuthTest.php
similarity index 77%
rename from core/modules/hal/tests/src/Functional/EntityResource/FieldConfig/FieldConfigHalJsonBasicAuthTest.php
rename to core/modules/field/tests/src/Functional/Hal/FieldConfigHalJsonBasicAuthTest.php
index 74b60aa51b..8a299a4c49 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/FieldConfig/FieldConfigHalJsonBasicAuthTest.php
+++ b/core/modules/field/tests/src/Functional/Hal/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/field/tests/src/Functional/Hal/FieldConfigHalJsonCookieTest.php
similarity index 76%
rename from core/modules/hal/tests/src/Functional/EntityResource/FieldConfig/FieldConfigHalJsonCookieTest.php
rename to core/modules/field/tests/src/Functional/Hal/FieldConfigHalJsonCookieTest.php
index e6491f4382..c9f5ce0dd9 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/FieldConfig/FieldConfigHalJsonCookieTest.php
+++ b/core/modules/field/tests/src/Functional/Hal/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/field/tests/src/Functional/Hal/FieldStorageConfigHalJsonAnonTest.php
similarity index 71%
rename from core/modules/hal/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigHalJsonAnonTest.php
rename to core/modules/field/tests/src/Functional/Hal/FieldStorageConfigHalJsonAnonTest.php
index 1b9019342a..7e74390b38 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigHalJsonAnonTest.php
+++ b/core/modules/field/tests/src/Functional/Hal/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/field/tests/src/Functional/Hal/FieldStorageConfigHalJsonBasicAuthTest.php
similarity index 75%
rename from core/modules/hal/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigHalJsonBasicAuthTest.php
rename to core/modules/field/tests/src/Functional/Hal/FieldStorageConfigHalJsonBasicAuthTest.php
index 957e73be92..e3c2a3fb9c 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigHalJsonBasicAuthTest.php
+++ b/core/modules/field/tests/src/Functional/Hal/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/field/tests/src/Functional/Hal/FieldStorageConfigHalJsonCookieTest.php
similarity index 74%
rename from core/modules/hal/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigHalJsonCookieTest.php
rename to core/modules/field/tests/src/Functional/Hal/FieldStorageConfigHalJsonCookieTest.php
index 20d47a750a..51df45617d 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigHalJsonCookieTest.php
+++ b/core/modules/field/tests/src/Functional/Hal/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/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigJsonAnonTest.php b/core/modules/field/tests/src/Functional/Rest/FieldConfigJsonAnonTest.php
similarity index 83%
rename from core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigJsonAnonTest.php
rename to core/modules/field/tests/src/Functional/Rest/FieldConfigJsonAnonTest.php
index 0e6883a54a..d11e46caf6 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigJsonAnonTest.php
+++ b/core/modules/field/tests/src/Functional/Rest/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/field/tests/src/Functional/Rest/FieldConfigJsonBasicAuthTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigJsonBasicAuthTest.php
rename to core/modules/field/tests/src/Functional/Rest/FieldConfigJsonBasicAuthTest.php
index 2ab43d31c0..d27354eac2 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigJsonBasicAuthTest.php
+++ b/core/modules/field/tests/src/Functional/Rest/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/field/tests/src/Functional/Rest/FieldConfigJsonCookieTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigJsonCookieTest.php
rename to core/modules/field/tests/src/Functional/Rest/FieldConfigJsonCookieTest.php
index 22c2225c12..089bd8f299 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigJsonCookieTest.php
+++ b/core/modules/field/tests/src/Functional/Rest/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/field/tests/src/Functional/Rest/FieldConfigResourceTestBase.php
similarity index 97%
rename from core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigResourceTestBase.php
rename to core/modules/field/tests/src/Functional/Rest/FieldConfigResourceTestBase.php
index 05c05f478a..40ce43f578 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigResourceTestBase.php
+++ b/core/modules/field/tests/src/Functional/Rest/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/field/tests/src/Functional/Rest/FieldConfigXmlAnonTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigXmlAnonTest.php
rename to core/modules/field/tests/src/Functional/Rest/FieldConfigXmlAnonTest.php
index d77518991d..8809e60e93 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigXmlAnonTest.php
+++ b/core/modules/field/tests/src/Functional/Rest/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/field/tests/src/Functional/Rest/FieldConfigXmlBasicAuthTest.php
similarity index 90%
rename from core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigXmlBasicAuthTest.php
rename to core/modules/field/tests/src/Functional/Rest/FieldConfigXmlBasicAuthTest.php
index ed82264712..109f2dc94a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigXmlBasicAuthTest.php
+++ b/core/modules/field/tests/src/Functional/Rest/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/field/tests/src/Functional/Rest/FieldConfigXmlCookieTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigXmlCookieTest.php
rename to core/modules/field/tests/src/Functional/Rest/FieldConfigXmlCookieTest.php
index 4e715d011f..d8aebdd1c8 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigXmlCookieTest.php
+++ b/core/modules/field/tests/src/Functional/Rest/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/field/tests/src/Functional/Rest/FieldStorageConfigJsonAnonTest.php
similarity index 82%
rename from core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigJsonAnonTest.php
rename to core/modules/field/tests/src/Functional/Rest/FieldStorageConfigJsonAnonTest.php
index 582a0b0e55..5e58c2a933 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigJsonAnonTest.php
+++ b/core/modules/field/tests/src/Functional/Rest/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/field/tests/src/Functional/Rest/FieldStorageConfigJsonBasicAuthTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigJsonBasicAuthTest.php
rename to core/modules/field/tests/src/Functional/Rest/FieldStorageConfigJsonBasicAuthTest.php
index 4219cad288..9aa875ab89 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigJsonBasicAuthTest.php
+++ b/core/modules/field/tests/src/Functional/Rest/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/field/tests/src/Functional/Rest/FieldStorageConfigJsonCookieTest.php
similarity index 85%
rename from core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigJsonCookieTest.php
rename to core/modules/field/tests/src/Functional/Rest/FieldStorageConfigJsonCookieTest.php
index c40aa7d872..fbcf42b1b9 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigJsonCookieTest.php
+++ b/core/modules/field/tests/src/Functional/Rest/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/field/tests/src/Functional/Rest/FieldStorageConfigResourceTestBase.php
similarity index 96%
rename from core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigResourceTestBase.php
rename to core/modules/field/tests/src/Functional/Rest/FieldStorageConfigResourceTestBase.php
index aafc2531e7..0d0fb6dd34 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigResourceTestBase.php
+++ b/core/modules/field/tests/src/Functional/Rest/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/field/tests/src/Functional/Rest/FieldStorageConfigXmlAnonTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigXmlAnonTest.php
rename to core/modules/field/tests/src/Functional/Rest/FieldStorageConfigXmlAnonTest.php
index c5f3a914d3..4af918b03f 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigXmlAnonTest.php
+++ b/core/modules/field/tests/src/Functional/Rest/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/field/tests/src/Functional/Rest/FieldStorageConfigXmlBasicAuthTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigXmlBasicAuthTest.php
rename to core/modules/field/tests/src/Functional/Rest/FieldStorageConfigXmlBasicAuthTest.php
index 6f557227a0..d6fe68f8e7 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigXmlBasicAuthTest.php
+++ b/core/modules/field/tests/src/Functional/Rest/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/field/tests/src/Functional/Rest/FieldStorageConfigXmlCookieTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigXmlCookieTest.php
rename to core/modules/field/tests/src/Functional/Rest/FieldStorageConfigXmlCookieTest.php
index e629df22c9..6672a0df02 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigXmlCookieTest.php
+++ b/core/modules/field/tests/src/Functional/Rest/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/hal/tests/src/Functional/EntityResource/File/FileHalJsonAnonTest.php b/core/modules/file/tests/src/Functional/Hal/FileHalJsonAnonTest.php
similarity index 96%
rename from core/modules/hal/tests/src/Functional/EntityResource/File/FileHalJsonAnonTest.php
rename to core/modules/file/tests/src/Functional/Hal/FileHalJsonAnonTest.php
index f3036a9de8..5d187ce9e9 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/File/FileHalJsonAnonTest.php
+++ b/core/modules/file/tests/src/Functional/Hal/FileHalJsonAnonTest.php
@@ -1,11 +1,10 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\File;
+namespace Drupal\Tests\file\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\File\FileResourceTestBase;
 
 /**
  * @group hal
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/File/FileHalJsonBasicAuthTest.php b/core/modules/file/tests/src/Functional/Hal/FileHalJsonBasicAuthTest.php
similarity index 85%
rename from core/modules/hal/tests/src/Functional/EntityResource/File/FileHalJsonBasicAuthTest.php
rename to core/modules/file/tests/src/Functional/Hal/FileHalJsonBasicAuthTest.php
index 3b1e3fe614..9101071728 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/File/FileHalJsonBasicAuthTest.php
+++ b/core/modules/file/tests/src/Functional/Hal/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/file/tests/src/Functional/Hal/FileHalJsonCookieTest.php
similarity index 80%
rename from core/modules/hal/tests/src/Functional/EntityResource/File/FileHalJsonCookieTest.php
rename to core/modules/file/tests/src/Functional/Hal/FileHalJsonCookieTest.php
index 8d62372cd2..7069e9b964 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/File/FileHalJsonCookieTest.php
+++ b/core/modules/file/tests/src/Functional/Hal/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/rest/tests/src/Functional/EntityResource/File/FileJsonAnonTest.php b/core/modules/file/tests/src/Functional/Rest/FileJsonAnonTest.php
similarity index 84%
rename from core/modules/rest/tests/src/Functional/EntityResource/File/FileJsonAnonTest.php
rename to core/modules/file/tests/src/Functional/Rest/FileJsonAnonTest.php
index b3adf6e433..5d76ea2473 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/File/FileJsonAnonTest.php
+++ b/core/modules/file/tests/src/Functional/Rest/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/file/tests/src/Functional/Rest/FileJsonBasicAuthTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/File/FileJsonBasicAuthTest.php
rename to core/modules/file/tests/src/Functional/Rest/FileJsonBasicAuthTest.php
index 971555c770..87a65ac359 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/File/FileJsonBasicAuthTest.php
+++ b/core/modules/file/tests/src/Functional/Rest/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/file/tests/src/Functional/Rest/FileJsonCookieTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/File/FileJsonCookieTest.php
rename to core/modules/file/tests/src/Functional/Rest/FileJsonCookieTest.php
index cffd869c32..9c797207dc 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/File/FileJsonCookieTest.php
+++ b/core/modules/file/tests/src/Functional/Rest/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/file/tests/src/Functional/Rest/FileResourceTestBase.php
similarity index 98%
rename from core/modules/rest/tests/src/Functional/EntityResource/File/FileResourceTestBase.php
rename to core/modules/file/tests/src/Functional/Rest/FileResourceTestBase.php
index 1fa5a3856b..a274a5f61e 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/File/FileResourceTestBase.php
+++ b/core/modules/file/tests/src/Functional/Rest/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/file/tests/src/Functional/Rest/FileXmlAnonTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/File/FileXmlAnonTest.php
rename to core/modules/file/tests/src/Functional/Rest/FileXmlAnonTest.php
index 2fad0870b0..8360096fb9 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/File/FileXmlAnonTest.php
+++ b/core/modules/file/tests/src/Functional/Rest/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/file/tests/src/Functional/Rest/FileXmlBasicAuthTest.php
similarity index 91%
rename from core/modules/rest/tests/src/Functional/EntityResource/File/FileXmlBasicAuthTest.php
rename to core/modules/file/tests/src/Functional/Rest/FileXmlBasicAuthTest.php
index 55a69c478c..66e9986dbc 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/File/FileXmlBasicAuthTest.php
+++ b/core/modules/file/tests/src/Functional/Rest/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/file/tests/src/Functional/Rest/FileXmlCookieTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/File/FileXmlCookieTest.php
rename to core/modules/file/tests/src/Functional/Rest/FileXmlCookieTest.php
index cd90097fb0..4b7db031e5 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/File/FileXmlCookieTest.php
+++ b/core/modules/file/tests/src/Functional/Rest/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/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonAnonTest.php b/core/modules/filter/tests/src/Functional/Hal/FilterFormatHalJsonAnonTest.php
similarity index 72%
rename from core/modules/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonAnonTest.php
rename to core/modules/filter/tests/src/Functional/Hal/FilterFormatHalJsonAnonTest.php
index b0d1a6103d..3a7c6335f5 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonAnonTest.php
+++ b/core/modules/filter/tests/src/Functional/Hal/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/filter/tests/src/Functional/Hal/FilterFormatHalJsonBasicAuthTest.php
similarity index 76%
rename from core/modules/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonBasicAuthTest.php
rename to core/modules/filter/tests/src/Functional/Hal/FilterFormatHalJsonBasicAuthTest.php
index fa409700eb..c76293d9cc 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonBasicAuthTest.php
+++ b/core/modules/filter/tests/src/Functional/Hal/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/filter/tests/src/Functional/Hal/FilterFormatHalJsonCookieTest.php
similarity index 75%
rename from core/modules/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonCookieTest.php
rename to core/modules/filter/tests/src/Functional/Hal/FilterFormatHalJsonCookieTest.php
index 1957793e4b..d2a8654c59 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonCookieTest.php
+++ b/core/modules/filter/tests/src/Functional/Hal/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/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatJsonAnonTest.php b/core/modules/filter/tests/src/Functional/Rest/FilterFormatJsonAnonTest.php
similarity index 83%
rename from core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatJsonAnonTest.php
rename to core/modules/filter/tests/src/Functional/Rest/FilterFormatJsonAnonTest.php
index 60a24fb9ce..772ccab6ac 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatJsonAnonTest.php
+++ b/core/modules/filter/tests/src/Functional/Rest/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/filter/tests/src/Functional/Rest/FilterFormatJsonBasicAuthTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatJsonBasicAuthTest.php
rename to core/modules/filter/tests/src/Functional/Rest/FilterFormatJsonBasicAuthTest.php
index 4e143c33e1..53ba6ce895 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatJsonBasicAuthTest.php
+++ b/core/modules/filter/tests/src/Functional/Rest/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/filter/tests/src/Functional/Rest/FilterFormatJsonCookieTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatJsonCookieTest.php
rename to core/modules/filter/tests/src/Functional/Rest/FilterFormatJsonCookieTest.php
index 73c0c22aba..432142a770 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatJsonCookieTest.php
+++ b/core/modules/filter/tests/src/Functional/Rest/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/filter/tests/src/Functional/Rest/FilterFormatResourceTestBase.php
similarity index 96%
rename from core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatResourceTestBase.php
rename to core/modules/filter/tests/src/Functional/Rest/FilterFormatResourceTestBase.php
index 4d65e00f58..5a0174a65a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatResourceTestBase.php
+++ b/core/modules/filter/tests/src/Functional/Rest/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/filter/tests/src/Functional/Rest/FilterFormatXmlAnonTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatXmlAnonTest.php
rename to core/modules/filter/tests/src/Functional/Rest/FilterFormatXmlAnonTest.php
index 8eddfa1f95..25b84cf621 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatXmlAnonTest.php
+++ b/core/modules/filter/tests/src/Functional/Rest/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/filter/tests/src/Functional/Rest/FilterFormatXmlBasicAuthTest.php
similarity index 90%
rename from core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatXmlBasicAuthTest.php
rename to core/modules/filter/tests/src/Functional/Rest/FilterFormatXmlBasicAuthTest.php
index d1aa25d50f..6c0c62d52b 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatXmlBasicAuthTest.php
+++ b/core/modules/filter/tests/src/Functional/Rest/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/filter/tests/src/Functional/Rest/FilterFormatXmlCookieTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatXmlCookieTest.php
rename to core/modules/filter/tests/src/Functional/Rest/FilterFormatXmlCookieTest.php
index 9437b73b94..1c3be314dd 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatXmlCookieTest.php
+++ b/core/modules/filter/tests/src/Functional/Rest/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/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonAnonTest.php b/core/modules/image/tests/src/Functional/Hal/ImageStyleHalJsonAnonTest.php
similarity index 73%
rename from core/modules/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonAnonTest.php
rename to core/modules/image/tests/src/Functional/Hal/ImageStyleHalJsonAnonTest.php
index 34cfd4be57..61da51f7d0 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonAnonTest.php
+++ b/core/modules/image/tests/src/Functional/Hal/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/image/tests/src/Functional/Hal/ImageStyleHalJsonBasicAuthTest.php
similarity index 77%
rename from core/modules/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonBasicAuthTest.php
rename to core/modules/image/tests/src/Functional/Hal/ImageStyleHalJsonBasicAuthTest.php
index 61cc149e3b..a6ff4941a3 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonBasicAuthTest.php
+++ b/core/modules/image/tests/src/Functional/Hal/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/image/tests/src/Functional/Hal/ImageStyleHalJsonCookieTest.php
similarity index 76%
rename from core/modules/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonCookieTest.php
rename to core/modules/image/tests/src/Functional/Hal/ImageStyleHalJsonCookieTest.php
index aa496535cd..731e356c92 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonCookieTest.php
+++ b/core/modules/image/tests/src/Functional/Hal/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/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleJsonAnonTest.php b/core/modules/image/tests/src/Functional/Rest/ImageStyleJsonAnonTest.php
similarity index 83%
rename from core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleJsonAnonTest.php
rename to core/modules/image/tests/src/Functional/Rest/ImageStyleJsonAnonTest.php
index 0089f8edaf..e367fb6e67 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleJsonAnonTest.php
+++ b/core/modules/image/tests/src/Functional/Rest/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/image/tests/src/Functional/Rest/ImageStyleJsonBasicAuthTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleJsonBasicAuthTest.php
rename to core/modules/image/tests/src/Functional/Rest/ImageStyleJsonBasicAuthTest.php
index 10117505ad..ab6ae57d53 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleJsonBasicAuthTest.php
+++ b/core/modules/image/tests/src/Functional/Rest/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/image/tests/src/Functional/Rest/ImageStyleJsonCookieTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleJsonCookieTest.php
rename to core/modules/image/tests/src/Functional/Rest/ImageStyleJsonCookieTest.php
index 321baae7b5..5021233662 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleJsonCookieTest.php
+++ b/core/modules/image/tests/src/Functional/Rest/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/image/tests/src/Functional/Rest/ImageStyleResourceTestBase.php
similarity index 97%
rename from core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleResourceTestBase.php
rename to core/modules/image/tests/src/Functional/Rest/ImageStyleResourceTestBase.php
index ccd68d95bd..190d2b93aa 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleResourceTestBase.php
+++ b/core/modules/image/tests/src/Functional/Rest/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/image/tests/src/Functional/Rest/ImageStyleXmlAnonTest.php
similarity index 90%
rename from core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleXmlAnonTest.php
rename to core/modules/image/tests/src/Functional/Rest/ImageStyleXmlAnonTest.php
index 1714c2739e..427641aa4b 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleXmlAnonTest.php
+++ b/core/modules/image/tests/src/Functional/Rest/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/image/tests/src/Functional/Rest/ImageStyleXmlBasicAuthTest.php
similarity index 92%
rename from core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleXmlBasicAuthTest.php
rename to core/modules/image/tests/src/Functional/Rest/ImageStyleXmlBasicAuthTest.php
index 54febc6cfb..cd376a3140 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleXmlBasicAuthTest.php
+++ b/core/modules/image/tests/src/Functional/Rest/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/image/tests/src/Functional/Rest/ImageStyleXmlCookieTest.php
similarity index 91%
rename from core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleXmlCookieTest.php
rename to core/modules/image/tests/src/Functional/Rest/ImageStyleXmlCookieTest.php
index 5cbb29a043..7ca459a0ae 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleXmlCookieTest.php
+++ b/core/modules/image/tests/src/Functional/Rest/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/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonAnonTest.php b/core/modules/language/tests/src/Functional/Hal/ConfigurableLanguageHalJsonAnonTest.php
similarity index 70%
rename from core/modules/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonAnonTest.php
rename to core/modules/language/tests/src/Functional/Hal/ConfigurableLanguageHalJsonAnonTest.php
index 4152a5f2ad..c548c17241 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonAnonTest.php
+++ b/core/modules/language/tests/src/Functional/Hal/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/language/tests/src/Functional/Hal/ConfigurableLanguageHalJsonBasicAuthTest.php
similarity index 76%
rename from core/modules/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonBasicAuthTest.php
rename to core/modules/language/tests/src/Functional/Hal/ConfigurableLanguageHalJsonBasicAuthTest.php
index dea13fcfe6..3239b7e22c 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonBasicAuthTest.php
+++ b/core/modules/language/tests/src/Functional/Hal/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/language/tests/src/Functional/Hal/ConfigurableLanguageHalJsonCookieTest.php
similarity index 73%
rename from core/modules/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonCookieTest.php
rename to core/modules/language/tests/src/Functional/Hal/ConfigurableLanguageHalJsonCookieTest.php
index 357adc0267..9ad7561067 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonCookieTest.php
+++ b/core/modules/language/tests/src/Functional/Hal/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/ContentLanguageSettings/ContentLanguageSettingsHalJsonAnonTest.php b/core/modules/language/tests/src/Functional/Hal/ContentLanguageSettingsHalJsonAnonTest.php
similarity index 69%
rename from core/modules/hal/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsHalJsonAnonTest.php
rename to core/modules/language/tests/src/Functional/Hal/ContentLanguageSettingsHalJsonAnonTest.php
index e90485d30c..d5b7947ed4 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsHalJsonAnonTest.php
+++ b/core/modules/language/tests/src/Functional/Hal/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/language/tests/src/Functional/Hal/ContentLanguageSettingsHalJsonBasicAuthTest.php
similarity index 75%
rename from core/modules/hal/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsHalJsonBasicAuthTest.php
rename to core/modules/language/tests/src/Functional/Hal/ContentLanguageSettingsHalJsonBasicAuthTest.php
index 71f4fabcb6..61306eaf5e 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsHalJsonBasicAuthTest.php
+++ b/core/modules/language/tests/src/Functional/Hal/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/language/tests/src/Functional/Hal/ContentLanguageSettingsHalJsonCookieTest.php
similarity index 73%
rename from core/modules/hal/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsHalJsonCookieTest.php
rename to core/modules/language/tests/src/Functional/Hal/ContentLanguageSettingsHalJsonCookieTest.php
index 4cc572f11e..63584f6489 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsHalJsonCookieTest.php
+++ b/core/modules/language/tests/src/Functional/Hal/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/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonAnonTest.php b/core/modules/language/tests/src/Functional/Rest/ConfigurableLanguageJsonAnonTest.php
similarity index 82%
rename from core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonAnonTest.php
rename to core/modules/language/tests/src/Functional/Rest/ConfigurableLanguageJsonAnonTest.php
index debfa4cd87..7533e31c0e 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonAnonTest.php
+++ b/core/modules/language/tests/src/Functional/Rest/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/language/tests/src/Functional/Rest/ConfigurableLanguageJsonBasicAuthTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonBasicAuthTest.php
rename to core/modules/language/tests/src/Functional/Rest/ConfigurableLanguageJsonBasicAuthTest.php
index 8b768f32ab..847e781640 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonBasicAuthTest.php
+++ b/core/modules/language/tests/src/Functional/Rest/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/language/tests/src/Functional/Rest/ConfigurableLanguageJsonCookieTest.php
similarity index 85%
rename from core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonCookieTest.php
rename to core/modules/language/tests/src/Functional/Rest/ConfigurableLanguageJsonCookieTest.php
index 9972ed0a5b..cd3d9ce73c 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonCookieTest.php
+++ b/core/modules/language/tests/src/Functional/Rest/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/language/tests/src/Functional/Rest/ConfigurableLanguageResourceTestBase.php
similarity index 96%
rename from core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageResourceTestBase.php
rename to core/modules/language/tests/src/Functional/Rest/ConfigurableLanguageResourceTestBase.php
index cf5be74737..a0dd460541 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageResourceTestBase.php
+++ b/core/modules/language/tests/src/Functional/Rest/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/language/tests/src/Functional/Rest/ConfigurableLanguageXmlAnonTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageXmlAnonTest.php
rename to core/modules/language/tests/src/Functional/Rest/ConfigurableLanguageXmlAnonTest.php
index a698aadcbb..882b7bf458 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageXmlAnonTest.php
+++ b/core/modules/language/tests/src/Functional/Rest/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/language/tests/src/Functional/Rest/ConfigurableLanguageXmlBasicAuthTest.php
similarity index 90%
rename from core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageXmlBasicAuthTest.php
rename to core/modules/language/tests/src/Functional/Rest/ConfigurableLanguageXmlBasicAuthTest.php
index 66bdf4d6da..7a79c4d433 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageXmlBasicAuthTest.php
+++ b/core/modules/language/tests/src/Functional/Rest/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/language/tests/src/Functional/Rest/ConfigurableLanguageXmlCookieTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageXmlCookieTest.php
rename to core/modules/language/tests/src/Functional/Rest/ConfigurableLanguageXmlCookieTest.php
index 9420fdfa18..7755d76e91 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageXmlCookieTest.php
+++ b/core/modules/language/tests/src/Functional/Rest/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/ContentLanguageSettings/ContentLanguageSettingsJsonAnonTest.php b/core/modules/language/tests/src/Functional/Rest/ContentLanguageSettingsJsonAnonTest.php
similarity index 82%
rename from core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsJsonAnonTest.php
rename to core/modules/language/tests/src/Functional/Rest/ContentLanguageSettingsJsonAnonTest.php
index 344c7335e5..1bece31007 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsJsonAnonTest.php
+++ b/core/modules/language/tests/src/Functional/Rest/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/language/tests/src/Functional/Rest/ContentLanguageSettingsJsonBasicAuthTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsJsonBasicAuthTest.php
rename to core/modules/language/tests/src/Functional/Rest/ContentLanguageSettingsJsonBasicAuthTest.php
index 46448153b9..14437a9092 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsJsonBasicAuthTest.php
+++ b/core/modules/language/tests/src/Functional/Rest/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/language/tests/src/Functional/Rest/ContentLanguageSettingsJsonCookieTest.php
similarity index 84%
rename from core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsJsonCookieTest.php
rename to core/modules/language/tests/src/Functional/Rest/ContentLanguageSettingsJsonCookieTest.php
index b0af52987b..84da80849c 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsJsonCookieTest.php
+++ b/core/modules/language/tests/src/Functional/Rest/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/language/tests/src/Functional/Rest/ContentLanguageSettingsResourceTestBase.php
similarity index 96%
rename from core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsResourceTestBase.php
rename to core/modules/language/tests/src/Functional/Rest/ContentLanguageSettingsResourceTestBase.php
index a8b3f8ca35..6283484368 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsResourceTestBase.php
+++ b/core/modules/language/tests/src/Functional/Rest/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/language/tests/src/Functional/Rest/ContentLanguageSettingsXmlAnonTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsXmlAnonTest.php
rename to core/modules/language/tests/src/Functional/Rest/ContentLanguageSettingsXmlAnonTest.php
index eb1bdcec81..fd6519387e 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsXmlAnonTest.php
+++ b/core/modules/language/tests/src/Functional/Rest/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/language/tests/src/Functional/Rest/ContentLanguageSettingsXmlBasicAuthTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsXmlBasicAuthTest.php
rename to core/modules/language/tests/src/Functional/Rest/ContentLanguageSettingsXmlBasicAuthTest.php
index eb4e9c287c..741e75bcd3 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsXmlBasicAuthTest.php
+++ b/core/modules/language/tests/src/Functional/Rest/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/language/tests/src/Functional/Rest/ContentLanguageSettingsXmlCookieTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsXmlCookieTest.php
rename to core/modules/language/tests/src/Functional/Rest/ContentLanguageSettingsXmlCookieTest.php
index 2ccb6f96ea..a5b49684f7 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsXmlCookieTest.php
+++ b/core/modules/language/tests/src/Functional/Rest/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/hal/tests/src/Functional/EntityResource/Media/MediaHalJsonAnonTest.php b/core/modules/media/tests/src/Functional/Hal/MediaHalJsonAnonTest.php
similarity index 97%
rename from core/modules/hal/tests/src/Functional/EntityResource/Media/MediaHalJsonAnonTest.php
rename to core/modules/media/tests/src/Functional/Hal/MediaHalJsonAnonTest.php
index c9ee7733cf..43b507b205 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Media/MediaHalJsonAnonTest.php
+++ b/core/modules/media/tests/src/Functional/Hal/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/media/tests/src/Functional/Hal/MediaHalJsonBasicAuthTest.php
similarity index 85%
rename from core/modules/hal/tests/src/Functional/EntityResource/Media/MediaHalJsonBasicAuthTest.php
rename to core/modules/media/tests/src/Functional/Hal/MediaHalJsonBasicAuthTest.php
index a645cbfba6..73d37b377e 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Media/MediaHalJsonBasicAuthTest.php
+++ b/core/modules/media/tests/src/Functional/Hal/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/media/tests/src/Functional/Hal/MediaHalJsonCookieTest.php
similarity index 80%
rename from core/modules/hal/tests/src/Functional/EntityResource/Media/MediaHalJsonCookieTest.php
rename to core/modules/media/tests/src/Functional/Hal/MediaHalJsonCookieTest.php
index a197eab860..798cf39a21 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Media/MediaHalJsonCookieTest.php
+++ b/core/modules/media/tests/src/Functional/Hal/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/media/tests/src/Functional/Hal/MediaTypeHalJsonAnonTest.php
similarity index 73%
rename from core/modules/hal/tests/src/Functional/EntityResource/MediaType/MediaTypeHalJsonAnonTest.php
rename to core/modules/media/tests/src/Functional/Hal/MediaTypeHalJsonAnonTest.php
index 1b83df1e9b..6a5611f9c7 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/MediaType/MediaTypeHalJsonAnonTest.php
+++ b/core/modules/media/tests/src/Functional/Hal/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/media/tests/src/Functional/Hal/MediaTypeHalJsonBasicAuthTest.php
similarity index 77%
rename from core/modules/hal/tests/src/Functional/EntityResource/MediaType/MediaTypeHalJsonBasicAuthTest.php
rename to core/modules/media/tests/src/Functional/Hal/MediaTypeHalJsonBasicAuthTest.php
index 20c29f2f18..0ef13e9952 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/MediaType/MediaTypeHalJsonBasicAuthTest.php
+++ b/core/modules/media/tests/src/Functional/Hal/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/media/tests/src/Functional/Hal/MediaTypeHalJsonCookieTest.php
similarity index 76%
rename from core/modules/hal/tests/src/Functional/EntityResource/MediaType/MediaTypeHalJsonCookieTest.php
rename to core/modules/media/tests/src/Functional/Hal/MediaTypeHalJsonCookieTest.php
index 8c6048556b..c66b499ef5 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/MediaType/MediaTypeHalJsonCookieTest.php
+++ b/core/modules/media/tests/src/Functional/Hal/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/rest/tests/src/Functional/EntityResource/Media/MediaJsonAnonTest.php b/core/modules/media/tests/src/Functional/Rest/MediaJsonAnonTest.php
similarity index 84%
rename from core/modules/rest/tests/src/Functional/EntityResource/Media/MediaJsonAnonTest.php
rename to core/modules/media/tests/src/Functional/Rest/MediaJsonAnonTest.php
index d9a3550d91..0aae16a00d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaJsonAnonTest.php
+++ b/core/modules/media/tests/src/Functional/Rest/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/media/tests/src/Functional/Rest/MediaJsonBasicAuthTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/Media/MediaJsonBasicAuthTest.php
rename to core/modules/media/tests/src/Functional/Rest/MediaJsonBasicAuthTest.php
index f499b79bd5..b124487d42 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaJsonBasicAuthTest.php
+++ b/core/modules/media/tests/src/Functional/Rest/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/media/tests/src/Functional/Rest/MediaJsonCookieTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/Media/MediaJsonCookieTest.php
rename to core/modules/media/tests/src/Functional/Rest/MediaJsonCookieTest.php
index 0cb86260a6..9c6786f134 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaJsonCookieTest.php
+++ b/core/modules/media/tests/src/Functional/Rest/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/media/tests/src/Functional/Rest/MediaResourceTestBase.php
similarity index 99%
rename from core/modules/rest/tests/src/Functional/EntityResource/Media/MediaResourceTestBase.php
rename to core/modules/media/tests/src/Functional/Rest/MediaResourceTestBase.php
index 414b3ebb85..9415250574 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaResourceTestBase.php
+++ b/core/modules/media/tests/src/Functional/Rest/MediaResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Media;
+namespace Drupal\Tests\media\Functional\Rest;
 
 use Drupal\file\Entity\File;
 use Drupal\media\Entity\Media;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeJsonAnonTest.php b/core/modules/media/tests/src/Functional/Rest/MediaTypeJsonAnonTest.php
similarity index 83%
rename from core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeJsonAnonTest.php
rename to core/modules/media/tests/src/Functional/Rest/MediaTypeJsonAnonTest.php
index 2e4b63098d..6ee494de52 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeJsonAnonTest.php
+++ b/core/modules/media/tests/src/Functional/Rest/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/media/tests/src/Functional/Rest/MediaTypeJsonBasicAuthTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeJsonBasicAuthTest.php
rename to core/modules/media/tests/src/Functional/Rest/MediaTypeJsonBasicAuthTest.php
index 052b19d54d..84b1a01c87 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeJsonBasicAuthTest.php
+++ b/core/modules/media/tests/src/Functional/Rest/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/media/tests/src/Functional/Rest/MediaTypeJsonCookieTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeJsonCookieTest.php
rename to core/modules/media/tests/src/Functional/Rest/MediaTypeJsonCookieTest.php
index b956c9889d..90c27b2d51 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeJsonCookieTest.php
+++ b/core/modules/media/tests/src/Functional/Rest/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/media/tests/src/Functional/Rest/MediaTypeResourceTestBase.php
similarity index 96%
rename from core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeResourceTestBase.php
rename to core/modules/media/tests/src/Functional/Rest/MediaTypeResourceTestBase.php
index ac72737538..a11f8ef54d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeResourceTestBase.php
+++ b/core/modules/media/tests/src/Functional/Rest/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/media/tests/src/Functional/Rest/MediaTypeXmlAnonTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeXmlAnonTest.php
rename to core/modules/media/tests/src/Functional/Rest/MediaTypeXmlAnonTest.php
index d39fd73285..083d80a1c1 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeXmlAnonTest.php
+++ b/core/modules/media/tests/src/Functional/Rest/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/media/tests/src/Functional/Rest/MediaTypeXmlBasicAuthTest.php
similarity index 90%
rename from core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeXmlBasicAuthTest.php
rename to core/modules/media/tests/src/Functional/Rest/MediaTypeXmlBasicAuthTest.php
index 834a83a481..95de21197d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeXmlBasicAuthTest.php
+++ b/core/modules/media/tests/src/Functional/Rest/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/media/tests/src/Functional/Rest/MediaTypeXmlCookieTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeXmlCookieTest.php
rename to core/modules/media/tests/src/Functional/Rest/MediaTypeXmlCookieTest.php
index 088d74625f..3b6a53d96f 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeXmlCookieTest.php
+++ b/core/modules/media/tests/src/Functional/Rest/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/Media/MediaXmlAnonTest.php b/core/modules/media/tests/src/Functional/Rest/MediaXmlAnonTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/Media/MediaXmlAnonTest.php
rename to core/modules/media/tests/src/Functional/Rest/MediaXmlAnonTest.php
index 4b0245460f..787794996a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaXmlAnonTest.php
+++ b/core/modules/media/tests/src/Functional/Rest/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/media/tests/src/Functional/Rest/MediaXmlBasicAuthTest.php
similarity index 91%
rename from core/modules/rest/tests/src/Functional/EntityResource/Media/MediaXmlBasicAuthTest.php
rename to core/modules/media/tests/src/Functional/Rest/MediaXmlBasicAuthTest.php
index bf6cf33214..971e75f42c 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaXmlBasicAuthTest.php
+++ b/core/modules/media/tests/src/Functional/Rest/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/media/tests/src/Functional/Rest/MediaXmlCookieTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/Media/MediaXmlCookieTest.php
rename to core/modules/media/tests/src/Functional/Rest/MediaXmlCookieTest.php
index b6e03c34bd..f67f7b4f8c 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaXmlCookieTest.php
+++ b/core/modules/media/tests/src/Functional/Rest/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/hal/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentHalJsonAnonTest.php b/core/modules/menu_link_content/tests/src/Functional/Hal/MenuLinkContentHalJsonAnonTest.php
similarity index 90%
rename from core/modules/hal/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentHalJsonAnonTest.php
rename to core/modules/menu_link_content/tests/src/Functional/Hal/MenuLinkContentHalJsonAnonTest.php
index c4c8d943f2..d374d2b5a1 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentHalJsonAnonTest.php
+++ b/core/modules/menu_link_content/tests/src/Functional/Hal/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/menu_link_content/tests/src/Functional/Hal/MenuLinkContentHalJsonBasicAuthTest.php
similarity index 83%
rename from core/modules/hal/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentHalJsonBasicAuthTest.php
rename to core/modules/menu_link_content/tests/src/Functional/Hal/MenuLinkContentHalJsonBasicAuthTest.php
index 3af8362e6b..40e93a0c7b 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentHalJsonBasicAuthTest.php
+++ b/core/modules/menu_link_content/tests/src/Functional/Hal/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/menu_link_content/tests/src/Functional/Hal/MenuLinkContentHalJsonCookieTest.php
similarity index 79%
rename from core/modules/hal/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentHalJsonCookieTest.php
rename to core/modules/menu_link_content/tests/src/Functional/Hal/MenuLinkContentHalJsonCookieTest.php
index 1bcc1f83f8..32cba4ac8c 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentHalJsonCookieTest.php
+++ b/core/modules/menu_link_content/tests/src/Functional/Hal/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/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentJsonAnonTest.php b/core/modules/menu_link_content/tests/src/Functional/Rest/MenuLinkContentJsonAnonTest.php
similarity index 83%
rename from core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentJsonAnonTest.php
rename to core/modules/menu_link_content/tests/src/Functional/Rest/MenuLinkContentJsonAnonTest.php
index 219cc53c87..fefd6b1d51 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentJsonAnonTest.php
+++ b/core/modules/menu_link_content/tests/src/Functional/Rest/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/menu_link_content/tests/src/Functional/Rest/MenuLinkContentJsonBasicAuthTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentJsonBasicAuthTest.php
rename to core/modules/menu_link_content/tests/src/Functional/Rest/MenuLinkContentJsonBasicAuthTest.php
index 952088b912..269e94991e 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentJsonBasicAuthTest.php
+++ b/core/modules/menu_link_content/tests/src/Functional/Rest/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/menu_link_content/tests/src/Functional/Rest/MenuLinkContentJsonCookieTest.php
similarity index 85%
rename from core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentJsonCookieTest.php
rename to core/modules/menu_link_content/tests/src/Functional/Rest/MenuLinkContentJsonCookieTest.php
index 73b45672ee..05679525e7 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentJsonCookieTest.php
+++ b/core/modules/menu_link_content/tests/src/Functional/Rest/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/menu_link_content/tests/src/Functional/Rest/MenuLinkContentResourceTestBase.php
similarity index 98%
rename from core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentResourceTestBase.php
rename to core/modules/menu_link_content/tests/src/Functional/Rest/MenuLinkContentResourceTestBase.php
index 0b1f967387..abfb356308 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentResourceTestBase.php
+++ b/core/modules/menu_link_content/tests/src/Functional/Rest/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/menu_link_content/tests/src/Functional/Rest/MenuLinkContentXmlAnonTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentXmlAnonTest.php
rename to core/modules/menu_link_content/tests/src/Functional/Rest/MenuLinkContentXmlAnonTest.php
index 5141cb7d68..7c39dae81d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentXmlAnonTest.php
+++ b/core/modules/menu_link_content/tests/src/Functional/Rest/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/menu_link_content/tests/src/Functional/Rest/MenuLinkContentXmlBasicAuthTest.php
similarity index 90%
rename from core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentXmlBasicAuthTest.php
rename to core/modules/menu_link_content/tests/src/Functional/Rest/MenuLinkContentXmlBasicAuthTest.php
index 6a62f36466..7bbf966170 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentXmlBasicAuthTest.php
+++ b/core/modules/menu_link_content/tests/src/Functional/Rest/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/menu_link_content/tests/src/Functional/Rest/MenuLinkContentXmlCookieTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentXmlCookieTest.php
rename to core/modules/menu_link_content/tests/src/Functional/Rest/MenuLinkContentXmlCookieTest.php
index f73d493a34..8b56dde815 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentXmlCookieTest.php
+++ b/core/modules/menu_link_content/tests/src/Functional/Rest/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/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonAnonTest.php b/core/modules/node/tests/src/Functional/Hal/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/Hal/NodeHalJsonAnonTest.php
index e218a73a42..2ab87a98be 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonAnonTest.php
+++ b/core/modules/node/tests/src/Functional/Hal/NodeHalJsonAnonTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\Tests\hal\Functional\EntityResource\Node;
+namespace Drupal\Tests\node\Functional\Hal;
 
 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/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonBasicAuthTest.php b/core/modules/node/tests/src/Functional/Hal/NodeHalJsonBasicAuthTest.php
similarity index 85%
rename from core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonBasicAuthTest.php
rename to core/modules/node/tests/src/Functional/Hal/NodeHalJsonBasicAuthTest.php
index 6ae12852c4..0c973a168e 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonBasicAuthTest.php
+++ b/core/modules/node/tests/src/Functional/Hal/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/node/tests/src/Functional/Hal/NodeHalJsonCookieTest.php
similarity index 80%
rename from core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonCookieTest.php
rename to core/modules/node/tests/src/Functional/Hal/NodeHalJsonCookieTest.php
index 19ed3637c4..e29a58786f 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonCookieTest.php
+++ b/core/modules/node/tests/src/Functional/Hal/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/node/tests/src/Functional/Hal/NodeTypeHalJsonAnonTest.php
similarity index 73%
rename from core/modules/hal/tests/src/Functional/EntityResource/NodeType/NodeTypeHalJsonAnonTest.php
rename to core/modules/node/tests/src/Functional/Hal/NodeTypeHalJsonAnonTest.php
index 5a46564de4..68f531c89e 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/NodeType/NodeTypeHalJsonAnonTest.php
+++ b/core/modules/node/tests/src/Functional/Hal/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/node/tests/src/Functional/Hal/NodeTypeHalJsonBasicAuthTest.php
similarity index 77%
rename from core/modules/hal/tests/src/Functional/EntityResource/NodeType/NodeTypeHalJsonBasicAuthTest.php
rename to core/modules/node/tests/src/Functional/Hal/NodeTypeHalJsonBasicAuthTest.php
index f1b4bca4d5..fb7098bdc4 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/NodeType/NodeTypeHalJsonBasicAuthTest.php
+++ b/core/modules/node/tests/src/Functional/Hal/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/node/tests/src/Functional/Hal/NodeTypeHalJsonCookieTest.php
similarity index 76%
rename from core/modules/hal/tests/src/Functional/EntityResource/NodeType/NodeTypeHalJsonCookieTest.php
rename to core/modules/node/tests/src/Functional/Hal/NodeTypeHalJsonCookieTest.php
index 0b2f9b268b..9d7f5a9a32 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/NodeType/NodeTypeHalJsonCookieTest.php
+++ b/core/modules/node/tests/src/Functional/Hal/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/rest/tests/src/Functional/EntityResource/Node/NodeJsonAnonTest.php b/core/modules/node/tests/src/Functional/Rest/NodeJsonAnonTest.php
similarity index 84%
rename from core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonAnonTest.php
rename to core/modules/node/tests/src/Functional/Rest/NodeJsonAnonTest.php
index 47239dba37..fa44d1386f 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonAnonTest.php
+++ b/core/modules/node/tests/src/Functional/Rest/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/node/tests/src/Functional/Rest/NodeJsonBasicAuthTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonBasicAuthTest.php
rename to core/modules/node/tests/src/Functional/Rest/NodeJsonBasicAuthTest.php
index ff7746d76e..d4ce479c21 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonBasicAuthTest.php
+++ b/core/modules/node/tests/src/Functional/Rest/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/node/tests/src/Functional/Rest/NodeJsonCookieTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonCookieTest.php
rename to core/modules/node/tests/src/Functional/Rest/NodeJsonCookieTest.php
index 490155e75f..0e070bc4d1 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonCookieTest.php
+++ b/core/modules/node/tests/src/Functional/Rest/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/NodeResourceTestBase.php b/core/modules/node/tests/src/Functional/Rest/NodeResourceTestBase.php
similarity index 99%
rename from core/modules/rest/tests/src/Functional/EntityResource/Node/NodeResourceTestBase.php
rename to core/modules/node/tests/src/Functional/Rest/NodeResourceTestBase.php
index fc827ace16..3d0c615ae2 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeResourceTestBase.php
+++ b/core/modules/node/tests/src/Functional/Rest/NodeResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Node;
+namespace Drupal\Tests\node\Functional\Rest;
 
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeJsonAnonTest.php b/core/modules/node/tests/src/Functional/Rest/NodeTypeJsonAnonTest.php
similarity index 83%
rename from core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeJsonAnonTest.php
rename to core/modules/node/tests/src/Functional/Rest/NodeTypeJsonAnonTest.php
index 7050ff1ebf..ab30b17fe5 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeJsonAnonTest.php
+++ b/core/modules/node/tests/src/Functional/Rest/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/node/tests/src/Functional/Rest/NodeTypeJsonBasicAuthTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeJsonBasicAuthTest.php
rename to core/modules/node/tests/src/Functional/Rest/NodeTypeJsonBasicAuthTest.php
index cee2364298..e1874e4cc6 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeJsonBasicAuthTest.php
+++ b/core/modules/node/tests/src/Functional/Rest/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/node/tests/src/Functional/Rest/NodeTypeJsonCookieTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeJsonCookieTest.php
rename to core/modules/node/tests/src/Functional/Rest/NodeTypeJsonCookieTest.php
index a0bc036df2..26608fc704 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeJsonCookieTest.php
+++ b/core/modules/node/tests/src/Functional/Rest/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/node/tests/src/Functional/Rest/NodeTypeResourceTestBase.php
similarity index 96%
rename from core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeResourceTestBase.php
rename to core/modules/node/tests/src/Functional/Rest/NodeTypeResourceTestBase.php
index c374bfb7c0..d74824dd13 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeResourceTestBase.php
+++ b/core/modules/node/tests/src/Functional/Rest/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/node/tests/src/Functional/Rest/NodeTypeXmlAnonTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeXmlAnonTest.php
rename to core/modules/node/tests/src/Functional/Rest/NodeTypeXmlAnonTest.php
index b3aa416f3a..c21a9d458b 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeXmlAnonTest.php
+++ b/core/modules/node/tests/src/Functional/Rest/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/node/tests/src/Functional/Rest/NodeTypeXmlBasicAuthTest.php
similarity index 90%
rename from core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeXmlBasicAuthTest.php
rename to core/modules/node/tests/src/Functional/Rest/NodeTypeXmlBasicAuthTest.php
index f26e98018c..29413dc9c2 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeXmlBasicAuthTest.php
+++ b/core/modules/node/tests/src/Functional/Rest/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/node/tests/src/Functional/Rest/NodeTypeXmlCookieTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeXmlCookieTest.php
rename to core/modules/node/tests/src/Functional/Rest/NodeTypeXmlCookieTest.php
index ab0c998b97..1326f291ff 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeXmlCookieTest.php
+++ b/core/modules/node/tests/src/Functional/Rest/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/Node/NodeXmlAnonTest.php b/core/modules/node/tests/src/Functional/Rest/NodeXmlAnonTest.php
similarity index 91%
rename from core/modules/rest/tests/src/Functional/EntityResource/Node/NodeXmlAnonTest.php
rename to core/modules/node/tests/src/Functional/Rest/NodeXmlAnonTest.php
index 7818bd35c3..83e98a1712 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeXmlAnonTest.php
+++ b/core/modules/node/tests/src/Functional/Rest/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/node/tests/src/Functional/Rest/NodeXmlBasicAuthTest.php
similarity index 92%
rename from core/modules/rest/tests/src/Functional/EntityResource/Node/NodeXmlBasicAuthTest.php
rename to core/modules/node/tests/src/Functional/Rest/NodeXmlBasicAuthTest.php
index 0ea96018e1..ce809747aa 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeXmlBasicAuthTest.php
+++ b/core/modules/node/tests/src/Functional/Rest/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/node/tests/src/Functional/Rest/NodeXmlCookieTest.php
similarity index 92%
rename from core/modules/rest/tests/src/Functional/EntityResource/Node/NodeXmlCookieTest.php
rename to core/modules/node/tests/src/Functional/Rest/NodeXmlCookieTest.php
index 0a31d21c2e..288d5a143c 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeXmlCookieTest.php
+++ b/core/modules/node/tests/src/Functional/Rest/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/hal/tests/src/Functional/EntityResource/RdfMapping/RdfMappingHalJsonAnonTest.php b/core/modules/rdf/tests/src/Functional/Hal/RdfMappingHalJsonAnonTest.php
similarity index 73%
rename from core/modules/hal/tests/src/Functional/EntityResource/RdfMapping/RdfMappingHalJsonAnonTest.php
rename to core/modules/rdf/tests/src/Functional/Hal/RdfMappingHalJsonAnonTest.php
index c8931d740e..2d241e9967 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/RdfMapping/RdfMappingHalJsonAnonTest.php
+++ b/core/modules/rdf/tests/src/Functional/Hal/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/rdf/tests/src/Functional/Hal/RdfMappingHalJsonBasicAuthTest.php
similarity index 77%
rename from core/modules/hal/tests/src/Functional/EntityResource/RdfMapping/RdfMappingHalJsonBasicAuthTest.php
rename to core/modules/rdf/tests/src/Functional/Hal/RdfMappingHalJsonBasicAuthTest.php
index 00bc05d0e9..346ad229e0 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/RdfMapping/RdfMappingHalJsonBasicAuthTest.php
+++ b/core/modules/rdf/tests/src/Functional/Hal/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/rdf/tests/src/Functional/Hal/RdfMappingHalJsonCookieTest.php
similarity index 76%
rename from core/modules/hal/tests/src/Functional/EntityResource/RdfMapping/RdfMappingHalJsonCookieTest.php
rename to core/modules/rdf/tests/src/Functional/Hal/RdfMappingHalJsonCookieTest.php
index 458ec7b21b..ff90d902a1 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/RdfMapping/RdfMappingHalJsonCookieTest.php
+++ b/core/modules/rdf/tests/src/Functional/Hal/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/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingJsonAnonTest.php b/core/modules/rdf/tests/src/Functional/Rest/RdfMappingJsonAnonTest.php
similarity index 83%
rename from core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingJsonAnonTest.php
rename to core/modules/rdf/tests/src/Functional/Rest/RdfMappingJsonAnonTest.php
index d1d89ae6a3..bb53cc7622 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingJsonAnonTest.php
+++ b/core/modules/rdf/tests/src/Functional/Rest/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/rdf/tests/src/Functional/Rest/RdfMappingJsonBasicAuthTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingJsonBasicAuthTest.php
rename to core/modules/rdf/tests/src/Functional/Rest/RdfMappingJsonBasicAuthTest.php
index 857d8c79e1..9537336780 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingJsonBasicAuthTest.php
+++ b/core/modules/rdf/tests/src/Functional/Rest/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/rdf/tests/src/Functional/Rest/RdfMappingJsonCookieTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingJsonCookieTest.php
rename to core/modules/rdf/tests/src/Functional/Rest/RdfMappingJsonCookieTest.php
index c154059e3e..392d45e9b1 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingJsonCookieTest.php
+++ b/core/modules/rdf/tests/src/Functional/Rest/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/rdf/tests/src/Functional/Rest/RdfMappingResourceTestBase.php
similarity index 97%
rename from core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingResourceTestBase.php
rename to core/modules/rdf/tests/src/Functional/Rest/RdfMappingResourceTestBase.php
index c826be0f85..ffe5bd4fda 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingResourceTestBase.php
+++ b/core/modules/rdf/tests/src/Functional/Rest/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/rdf/tests/src/Functional/Rest/RdfMappingXmlAnonTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingXmlAnonTest.php
rename to core/modules/rdf/tests/src/Functional/Rest/RdfMappingXmlAnonTest.php
index 448ac4777e..ab6922b8e7 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingXmlAnonTest.php
+++ b/core/modules/rdf/tests/src/Functional/Rest/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/rdf/tests/src/Functional/Rest/RdfMappingXmlBasicAuthTest.php
similarity index 90%
rename from core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingXmlBasicAuthTest.php
rename to core/modules/rdf/tests/src/Functional/Rest/RdfMappingXmlBasicAuthTest.php
index 8f3bae3e38..9cf6b97d51 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingXmlBasicAuthTest.php
+++ b/core/modules/rdf/tests/src/Functional/Rest/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/rdf/tests/src/Functional/Rest/RdfMappingXmlCookieTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingXmlCookieTest.php
rename to core/modules/rdf/tests/src/Functional/Rest/RdfMappingXmlCookieTest.php
index a45e5b2da5..1519e5ac72 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingXmlCookieTest.php
+++ b/core/modules/rdf/tests/src/Functional/Rest/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/hal/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleHalJsonAnonTest.php b/core/modules/responsive_image/tests/src/Functional/Hal/ResponsiveImageStyleHalJsonAnonTest.php
similarity index 70%
rename from core/modules/hal/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleHalJsonAnonTest.php
rename to core/modules/responsive_image/tests/src/Functional/Hal/ResponsiveImageStyleHalJsonAnonTest.php
index bb8b50e57f..50dc1970df 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleHalJsonAnonTest.php
+++ b/core/modules/responsive_image/tests/src/Functional/Hal/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/responsive_image/tests/src/Functional/Hal/ResponsiveImageStyleHalJsonBasicAuthTest.php
similarity index 74%
rename from core/modules/hal/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleHalJsonBasicAuthTest.php
rename to core/modules/responsive_image/tests/src/Functional/Hal/ResponsiveImageStyleHalJsonBasicAuthTest.php
index 3ce0c72682..1f45a2d743 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleHalJsonBasicAuthTest.php
+++ b/core/modules/responsive_image/tests/src/Functional/Hal/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/responsive_image/tests/src/Functional/Hal/ResponsiveImageStyleHalJsonCookieTest.php
similarity index 73%
rename from core/modules/hal/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleHalJsonCookieTest.php
rename to core/modules/responsive_image/tests/src/Functional/Hal/ResponsiveImageStyleHalJsonCookieTest.php
index 926de66541..85d95431f5 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleHalJsonCookieTest.php
+++ b/core/modules/responsive_image/tests/src/Functional/Hal/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/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleJsonAnonTest.php b/core/modules/responsive_image/tests/src/Functional/Rest/ResponsiveImageStyleJsonAnonTest.php
similarity index 82%
rename from core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleJsonAnonTest.php
rename to core/modules/responsive_image/tests/src/Functional/Rest/ResponsiveImageStyleJsonAnonTest.php
index 7aafd1f18e..42b3098dd5 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleJsonAnonTest.php
+++ b/core/modules/responsive_image/tests/src/Functional/Rest/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/responsive_image/tests/src/Functional/Rest/ResponsiveImageStyleJsonBasicAuthTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleJsonBasicAuthTest.php
rename to core/modules/responsive_image/tests/src/Functional/Rest/ResponsiveImageStyleJsonBasicAuthTest.php
index dbd6e7c947..b3c9127da4 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleJsonBasicAuthTest.php
+++ b/core/modules/responsive_image/tests/src/Functional/Rest/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/responsive_image/tests/src/Functional/Rest/ResponsiveImageStyleJsonCookieTest.php
similarity index 85%
rename from core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleJsonCookieTest.php
rename to core/modules/responsive_image/tests/src/Functional/Rest/ResponsiveImageStyleJsonCookieTest.php
index 41574fdf8e..e89122eab6 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleJsonCookieTest.php
+++ b/core/modules/responsive_image/tests/src/Functional/Rest/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/responsive_image/tests/src/Functional/Rest/ResponsiveImageStyleResourceTestBase.php
similarity index 97%
rename from core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleResourceTestBase.php
rename to core/modules/responsive_image/tests/src/Functional/Rest/ResponsiveImageStyleResourceTestBase.php
index 4221314571..dbef272db2 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleResourceTestBase.php
+++ b/core/modules/responsive_image/tests/src/Functional/Rest/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/responsive_image/tests/src/Functional/Rest/ResponsiveImageStyleXmlAnonTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleXmlAnonTest.php
rename to core/modules/responsive_image/tests/src/Functional/Rest/ResponsiveImageStyleXmlAnonTest.php
index db55fb7376..8493eddabe 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleXmlAnonTest.php
+++ b/core/modules/responsive_image/tests/src/Functional/Rest/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/responsive_image/tests/src/Functional/Rest/ResponsiveImageStyleXmlBasicAuthTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleXmlBasicAuthTest.php
rename to core/modules/responsive_image/tests/src/Functional/Rest/ResponsiveImageStyleXmlBasicAuthTest.php
index fbdeb0cd6b..e850e99d57 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleXmlBasicAuthTest.php
+++ b/core/modules/responsive_image/tests/src/Functional/Rest/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/responsive_image/tests/src/Functional/Rest/ResponsiveImageStyleXmlCookieTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleXmlCookieTest.php
rename to core/modules/responsive_image/tests/src/Functional/Rest/ResponsiveImageStyleXmlCookieTest.php
index 66c13d2646..f63f91cd54 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleXmlCookieTest.php
+++ b/core/modules/responsive_image/tests/src/Functional/Rest/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/EntityResourceRestTestCoverageTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceRestTestCoverageTest.php
index 6421472067..a3f87e490f 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/hal/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigHalJsonAnonTest.php b/core/modules/rest/tests/src/Functional/Hal/RestResourceConfigHalJsonAnonTest.php
similarity index 71%
rename from core/modules/hal/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigHalJsonAnonTest.php
rename to core/modules/rest/tests/src/Functional/Hal/RestResourceConfigHalJsonAnonTest.php
index 021812ba8a..72ccd45e93 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigHalJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/Hal/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/rest/tests/src/Functional/Hal/RestResourceConfigHalJsonBasicAuthTest.php
similarity index 75%
rename from core/modules/hal/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigHalJsonBasicAuthTest.php
rename to core/modules/rest/tests/src/Functional/Hal/RestResourceConfigHalJsonBasicAuthTest.php
index 495cc04233..e5e9a7efbb 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigHalJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/Hal/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/rest/tests/src/Functional/Hal/RestResourceConfigHalJsonCookieTest.php
similarity index 74%
rename from core/modules/hal/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigHalJsonCookieTest.php
rename to core/modules/rest/tests/src/Functional/Hal/RestResourceConfigHalJsonCookieTest.php
index 7747b1eb09..606d3fd641 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigHalJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/Hal/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/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigJsonAnonTest.php b/core/modules/rest/tests/src/Functional/Rest/RestResourceConfigJsonAnonTest.php
similarity index 82%
rename from core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigJsonAnonTest.php
rename to core/modules/rest/tests/src/Functional/Rest/RestResourceConfigJsonAnonTest.php
index df071409dd..ce355909d1 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigJsonAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/Rest/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/Rest/RestResourceConfigJsonBasicAuthTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigJsonBasicAuthTest.php
rename to core/modules/rest/tests/src/Functional/Rest/RestResourceConfigJsonBasicAuthTest.php
index 136474befd..8ac84636ec 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/Rest/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/Rest/RestResourceConfigJsonCookieTest.php
similarity index 85%
rename from core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigJsonCookieTest.php
rename to core/modules/rest/tests/src/Functional/Rest/RestResourceConfigJsonCookieTest.php
index 5ed09d098b..4971f59a44 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigJsonCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/Rest/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/Rest/RestResourceConfigResourceTestBase.php
similarity index 96%
rename from core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigResourceTestBase.php
rename to core/modules/rest/tests/src/Functional/Rest/RestResourceConfigResourceTestBase.php
index a19e2ef93f..a0b0b2e428 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/Rest/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/Rest/RestResourceConfigXmlAnonTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigXmlAnonTest.php
rename to core/modules/rest/tests/src/Functional/Rest/RestResourceConfigXmlAnonTest.php
index 21971ccda1..a508b55409 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigXmlAnonTest.php
+++ b/core/modules/rest/tests/src/Functional/Rest/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/Rest/RestResourceConfigXmlBasicAuthTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigXmlBasicAuthTest.php
rename to core/modules/rest/tests/src/Functional/Rest/RestResourceConfigXmlBasicAuthTest.php
index edbb1503cf..c5034b4ee5 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigXmlBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/Rest/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/Rest/RestResourceConfigXmlCookieTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigXmlCookieTest.php
rename to core/modules/rest/tests/src/Functional/Rest/RestResourceConfigXmlCookieTest.php
index 79018948fc..377a4497e9 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigXmlCookieTest.php
+++ b/core/modules/rest/tests/src/Functional/Rest/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/hal/tests/src/Functional/EntityResource/SearchPage/SearchPageHalJsonAnonTest.php b/core/modules/search/tests/src/Functional/Hal/SearchPageHalJsonAnonTest.php
similarity index 73%
rename from core/modules/hal/tests/src/Functional/EntityResource/SearchPage/SearchPageHalJsonAnonTest.php
rename to core/modules/search/tests/src/Functional/Hal/SearchPageHalJsonAnonTest.php
index 28777a413e..cd0079803c 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/SearchPage/SearchPageHalJsonAnonTest.php
+++ b/core/modules/search/tests/src/Functional/Hal/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/search/tests/src/Functional/Hal/SearchPageHalJsonBasicAuthTest.php
similarity index 77%
rename from core/modules/hal/tests/src/Functional/EntityResource/SearchPage/SearchPageHalJsonBasicAuthTest.php
rename to core/modules/search/tests/src/Functional/Hal/SearchPageHalJsonBasicAuthTest.php
index bb48bbe604..d1ff293ba3 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/SearchPage/SearchPageHalJsonBasicAuthTest.php
+++ b/core/modules/search/tests/src/Functional/Hal/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/search/tests/src/Functional/Hal/SearchPageHalJsonCookieTest.php
similarity index 76%
rename from core/modules/hal/tests/src/Functional/EntityResource/SearchPage/SearchPageHalJsonCookieTest.php
rename to core/modules/search/tests/src/Functional/Hal/SearchPageHalJsonCookieTest.php
index 772a4be057..a09fa5f9b1 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/SearchPage/SearchPageHalJsonCookieTest.php
+++ b/core/modules/search/tests/src/Functional/Hal/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/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageJsonAnonTest.php b/core/modules/search/tests/src/Functional/Rest/SearchPageJsonAnonTest.php
similarity index 83%
rename from core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageJsonAnonTest.php
rename to core/modules/search/tests/src/Functional/Rest/SearchPageJsonAnonTest.php
index a3aff54e6e..9708192642 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageJsonAnonTest.php
+++ b/core/modules/search/tests/src/Functional/Rest/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/search/tests/src/Functional/Rest/SearchPageJsonBasicAuthTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageJsonBasicAuthTest.php
rename to core/modules/search/tests/src/Functional/Rest/SearchPageJsonBasicAuthTest.php
index 0ee5556da2..f311ce9b4d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageJsonBasicAuthTest.php
+++ b/core/modules/search/tests/src/Functional/Rest/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/search/tests/src/Functional/Rest/SearchPageJsonCookieTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageJsonCookieTest.php
rename to core/modules/search/tests/src/Functional/Rest/SearchPageJsonCookieTest.php
index c74a35715a..8e7c8899d4 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageJsonCookieTest.php
+++ b/core/modules/search/tests/src/Functional/Rest/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/search/tests/src/Functional/Rest/SearchPageResourceTestBase.php
similarity index 97%
rename from core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageResourceTestBase.php
rename to core/modules/search/tests/src/Functional/Rest/SearchPageResourceTestBase.php
index eca9ca83f7..e711a34799 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageResourceTestBase.php
+++ b/core/modules/search/tests/src/Functional/Rest/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/search/tests/src/Functional/Rest/SearchPageXmlAnonTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageXmlAnonTest.php
rename to core/modules/search/tests/src/Functional/Rest/SearchPageXmlAnonTest.php
index dce277db38..5f4698ec1b 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageXmlAnonTest.php
+++ b/core/modules/search/tests/src/Functional/Rest/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/search/tests/src/Functional/Rest/SearchPageXmlBasicAuthTest.php
similarity index 90%
rename from core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageXmlBasicAuthTest.php
rename to core/modules/search/tests/src/Functional/Rest/SearchPageXmlBasicAuthTest.php
index 784a97867a..7a2c3c8804 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageXmlBasicAuthTest.php
+++ b/core/modules/search/tests/src/Functional/Rest/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/search/tests/src/Functional/Rest/SearchPageXmlCookieTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageXmlCookieTest.php
rename to core/modules/search/tests/src/Functional/Rest/SearchPageXmlCookieTest.php
index f54e7b1c85..3ad901d6ef 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageXmlCookieTest.php
+++ b/core/modules/search/tests/src/Functional/Rest/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/hal/tests/src/Functional/EntityResource/Shortcut/ShortcutHalJsonAnonTest.php b/core/modules/shortcut/tests/src/Functional/Hal/ShortcutHalJsonAnonTest.php
similarity index 91%
rename from core/modules/hal/tests/src/Functional/EntityResource/Shortcut/ShortcutHalJsonAnonTest.php
rename to core/modules/shortcut/tests/src/Functional/Hal/ShortcutHalJsonAnonTest.php
index c9e8dc00c5..ba6c8a798d 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Shortcut/ShortcutHalJsonAnonTest.php
+++ b/core/modules/shortcut/tests/src/Functional/Hal/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/shortcut/tests/src/Functional/Hal/ShortcutHalJsonBasicAuthTest.php
similarity index 84%
rename from core/modules/hal/tests/src/Functional/EntityResource/Shortcut/ShortcutHalJsonBasicAuthTest.php
rename to core/modules/shortcut/tests/src/Functional/Hal/ShortcutHalJsonBasicAuthTest.php
index a5be6dbc88..784c3ebc44 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Shortcut/ShortcutHalJsonBasicAuthTest.php
+++ b/core/modules/shortcut/tests/src/Functional/Hal/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/shortcut/tests/src/Functional/Hal/ShortcutHalJsonCookieTest.php
similarity index 80%
rename from core/modules/hal/tests/src/Functional/EntityResource/Shortcut/ShortcutHalJsonCookieTest.php
rename to core/modules/shortcut/tests/src/Functional/Hal/ShortcutHalJsonCookieTest.php
index a48a61f9e6..7b3b8348d9 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Shortcut/ShortcutHalJsonCookieTest.php
+++ b/core/modules/shortcut/tests/src/Functional/Hal/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/shortcut/tests/src/Functional/Hal/ShortcutSetHalJsonAnonTest.php
similarity index 72%
rename from core/modules/hal/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetHalJsonAnonTest.php
rename to core/modules/shortcut/tests/src/Functional/Hal/ShortcutSetHalJsonAnonTest.php
index a1cdf2773c..b3faae7fba 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetHalJsonAnonTest.php
+++ b/core/modules/shortcut/tests/src/Functional/Hal/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/shortcut/tests/src/Functional/Hal/ShortcutSetHalJsonBasicAuthTest.php
similarity index 84%
rename from core/modules/hal/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetHalJsonBasicAuthTest.php
rename to core/modules/shortcut/tests/src/Functional/Hal/ShortcutSetHalJsonBasicAuthTest.php
index d6cce1d89f..d3a7057411 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetHalJsonBasicAuthTest.php
+++ b/core/modules/shortcut/tests/src/Functional/Hal/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/shortcut/tests/src/Functional/Hal/ShortcutSetHalJsonCookieTest.php
similarity index 80%
rename from core/modules/hal/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetHalJsonCookieTest.php
rename to core/modules/shortcut/tests/src/Functional/Hal/ShortcutSetHalJsonCookieTest.php
index e7bbf40d2e..786936ef08 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetHalJsonCookieTest.php
+++ b/core/modules/shortcut/tests/src/Functional/Hal/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/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutJsonAnonTest.php b/core/modules/shortcut/tests/src/Functional/Rest/ShortcutJsonAnonTest.php
similarity index 83%
rename from core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutJsonAnonTest.php
rename to core/modules/shortcut/tests/src/Functional/Rest/ShortcutJsonAnonTest.php
index 8f317b3c05..04456fac29 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutJsonAnonTest.php
+++ b/core/modules/shortcut/tests/src/Functional/Rest/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/shortcut/tests/src/Functional/Rest/ShortcutJsonBasicAuthTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutJsonBasicAuthTest.php
rename to core/modules/shortcut/tests/src/Functional/Rest/ShortcutJsonBasicAuthTest.php
index 31f1117a92..e0859e3aa3 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutJsonBasicAuthTest.php
+++ b/core/modules/shortcut/tests/src/Functional/Rest/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/shortcut/tests/src/Functional/Rest/ShortcutJsonCookieTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutJsonCookieTest.php
rename to core/modules/shortcut/tests/src/Functional/Rest/ShortcutJsonCookieTest.php
index 3a043c879a..7bf210225b 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutJsonCookieTest.php
+++ b/core/modules/shortcut/tests/src/Functional/Rest/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/shortcut/tests/src/Functional/Rest/ShortcutResourceTestBase.php
similarity index 98%
rename from core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutResourceTestBase.php
rename to core/modules/shortcut/tests/src/Functional/Rest/ShortcutResourceTestBase.php
index 36be5b58f0..92b99b9bf1 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutResourceTestBase.php
+++ b/core/modules/shortcut/tests/src/Functional/Rest/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/ShortcutSet/ShortcutSetJsonAnonTest.php b/core/modules/shortcut/tests/src/Functional/Rest/ShortcutSetJsonAnonTest.php
similarity index 83%
rename from core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetJsonAnonTest.php
rename to core/modules/shortcut/tests/src/Functional/Rest/ShortcutSetJsonAnonTest.php
index 3720ac608c..96750b57b1 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetJsonAnonTest.php
+++ b/core/modules/shortcut/tests/src/Functional/Rest/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/shortcut/tests/src/Functional/Rest/ShortcutSetJsonBasicAuthTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetJsonBasicAuthTest.php
rename to core/modules/shortcut/tests/src/Functional/Rest/ShortcutSetJsonBasicAuthTest.php
index 388b9def6f..6ddaf54b0d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetJsonBasicAuthTest.php
+++ b/core/modules/shortcut/tests/src/Functional/Rest/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/shortcut/tests/src/Functional/Rest/ShortcutSetJsonCookieTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetJsonCookieTest.php
rename to core/modules/shortcut/tests/src/Functional/Rest/ShortcutSetJsonCookieTest.php
index 28df3ddfa4..60fe840606 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetJsonCookieTest.php
+++ b/core/modules/shortcut/tests/src/Functional/Rest/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/shortcut/tests/src/Functional/Rest/ShortcutSetResourceTestBase.php
similarity index 96%
rename from core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetResourceTestBase.php
rename to core/modules/shortcut/tests/src/Functional/Rest/ShortcutSetResourceTestBase.php
index 97ae1a66aa..b25f028d1c 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetResourceTestBase.php
+++ b/core/modules/shortcut/tests/src/Functional/Rest/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/shortcut/tests/src/Functional/Rest/ShortcutSetXmlAnonTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetXmlAnonTest.php
rename to core/modules/shortcut/tests/src/Functional/Rest/ShortcutSetXmlAnonTest.php
index eedd888cae..75ad14efd4 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetXmlAnonTest.php
+++ b/core/modules/shortcut/tests/src/Functional/Rest/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/shortcut/tests/src/Functional/Rest/ShortcutSetXmlBasicAuthTest.php
similarity index 90%
rename from core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetXmlBasicAuthTest.php
rename to core/modules/shortcut/tests/src/Functional/Rest/ShortcutSetXmlBasicAuthTest.php
index d18007caf0..50c6e71c23 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetXmlBasicAuthTest.php
+++ b/core/modules/shortcut/tests/src/Functional/Rest/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/shortcut/tests/src/Functional/Rest/ShortcutSetXmlCookieTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetXmlCookieTest.php
rename to core/modules/shortcut/tests/src/Functional/Rest/ShortcutSetXmlCookieTest.php
index c4387ee2e7..71dccd16c3 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetXmlCookieTest.php
+++ b/core/modules/shortcut/tests/src/Functional/Rest/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/Shortcut/ShortcutXmlAnonTest.php b/core/modules/shortcut/tests/src/Functional/Rest/ShortcutXmlAnonTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutXmlAnonTest.php
rename to core/modules/shortcut/tests/src/Functional/Rest/ShortcutXmlAnonTest.php
index 5929d3279d..56c5c681a3 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutXmlAnonTest.php
+++ b/core/modules/shortcut/tests/src/Functional/Rest/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/shortcut/tests/src/Functional/Rest/ShortcutXmlBasicAuthTest.php
similarity index 90%
rename from core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutXmlBasicAuthTest.php
rename to core/modules/shortcut/tests/src/Functional/Rest/ShortcutXmlBasicAuthTest.php
index 161ecf2374..9645aedaea 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutXmlBasicAuthTest.php
+++ b/core/modules/shortcut/tests/src/Functional/Rest/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/shortcut/tests/src/Functional/Rest/ShortcutXmlCookieTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutXmlCookieTest.php
rename to core/modules/shortcut/tests/src/Functional/Rest/ShortcutXmlCookieTest.php
index 7623e29d43..899b51d88a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutXmlCookieTest.php
+++ b/core/modules/shortcut/tests/src/Functional/Rest/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/hal/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleHalJsonAnonTest.php b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/EntityTestBundleHalJsonAnonTest.php
similarity index 76%
rename from core/modules/hal/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleHalJsonAnonTest.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/EntityTestBundleHalJsonAnonTest.php
index 9e6bcb3065..77988aa037 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleHalJsonAnonTest.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/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/system/tests/modules/entity_test/tests/src/Functional/Hal/EntityTestBundleHalJsonBasicAuthTest.php
similarity index 75%
rename from core/modules/hal/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleHalJsonBasicAuthTest.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/EntityTestBundleHalJsonBasicAuthTest.php
index 09e5970890..47e44d2d18 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleHalJsonBasicAuthTest.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/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/system/tests/modules/entity_test/tests/src/Functional/Hal/EntityTestBundleHalJsonCookieTest.php
similarity index 74%
rename from core/modules/hal/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleHalJsonCookieTest.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/EntityTestBundleHalJsonCookieTest.php
index 7f499fa016..3e8b442de7 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleHalJsonCookieTest.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/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/EntityTest/EntityTestHalJsonAnonTest.php b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/EntityTestHalJsonAnonTest.php
similarity index 94%
rename from core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonAnonTest.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/EntityTestHalJsonAnonTest.php
index eff0b97e8c..e13e2e43b1 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonAnonTest.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/EntityTestHalJsonAnonTest.php
@@ -1,7 +1,8 @@
 <?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;
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonBasicAuthTest.php b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/EntityTestHalJsonBasicAuthTest.php
similarity index 84%
rename from core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonBasicAuthTest.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/EntityTestHalJsonBasicAuthTest.php
index 65ad0db630..18fad4beed 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonBasicAuthTest.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/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/system/tests/modules/entity_test/tests/src/Functional/Hal/EntityTestHalJsonCookieTest.php
similarity index 80%
rename from core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonCookieTest.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/EntityTestHalJsonCookieTest.php
index efca3178e3..bee58edc39 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonCookieTest.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/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/system/tests/modules/entity_test/tests/src/Functional/Hal/EntityTestHalJsonInternalPropertyNormalizerTest.php
similarity index 97%
rename from core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonInternalPropertyNormalizerTest.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/EntityTestHalJsonInternalPropertyNormalizerTest.php
index 819a125f82..73d70d3ff6 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonInternalPropertyNormalizerTest.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/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/EntityTestLabel/EntityTestLabelHalJsonAnonTest.php b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/EntityTestLabelHalJsonAnonTest.php
similarity index 93%
rename from core/modules/hal/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelHalJsonAnonTest.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/EntityTestLabelHalJsonAnonTest.php
index f95ea5ce06..ca6e395351 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelHalJsonAnonTest.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/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/system/tests/modules/entity_test/tests/src/Functional/Hal/EntityTestLabelHalJsonBasicAuthTest.php
similarity index 83%
rename from core/modules/hal/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelHalJsonBasicAuthTest.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/EntityTestLabelHalJsonBasicAuthTest.php
index b3824aa57f..dfae2e4024 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelHalJsonBasicAuthTest.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/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/system/tests/modules/entity_test/tests/src/Functional/Hal/EntityTestLabelHalJsonCookieTest.php
similarity index 79%
rename from core/modules/hal/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelHalJsonCookieTest.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/EntityTestLabelHalJsonCookieTest.php
index fa74cb3991..3e373404e9 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelHalJsonCookieTest.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/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/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleJsonAnonTest.php b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestBundleJsonAnonTest.php
similarity index 82%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleJsonAnonTest.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestBundleJsonAnonTest.php
index 1df26f3869..08eb70047b 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleJsonAnonTest.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/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/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestBundleJsonBasicAuthTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleJsonBasicAuthTest.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestBundleJsonBasicAuthTest.php
index 0220801379..d1a7adbc9e 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleJsonBasicAuthTest.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/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/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestBundleJsonCookieTest.php
similarity index 85%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleJsonCookieTest.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestBundleJsonCookieTest.php
index 56fecfd6b0..313c9b9908 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleJsonCookieTest.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/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/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestBundleResourceTestBase.php
similarity index 96%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleResourceTestBase.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestBundleResourceTestBase.php
index f43d877097..cf167bc6eb 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleResourceTestBase.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/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/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestBundleXmlAnonTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleXmlAnonTest.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestBundleXmlAnonTest.php
index 2b99274856..e88314b425 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleXmlAnonTest.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/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/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestBundleXmlBasicAuthTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleXmlBasicAuthTest.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestBundleXmlBasicAuthTest.php
index 2c5a4e4a40..701c15ba9f 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleXmlBasicAuthTest.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/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/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestBundleXmlCookieTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleXmlCookieTest.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestBundleXmlCookieTest.php
index fdf6e0a6bd..2f3ee3310c 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleXmlCookieTest.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/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/EntityTest/EntityTestJsonAnonTest.php b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestJsonAnonTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonAnonTest.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestJsonAnonTest.php
index 1deeec00fb..58d15b3aa2 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonAnonTest.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/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/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestJsonBasicAuthTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonBasicAuthTest.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestJsonBasicAuthTest.php
index aff854edd8..cd647e8fe3 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonBasicAuthTest.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/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/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestJsonCookieTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonCookieTest.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestJsonCookieTest.php
index c0090d5d0e..b76de42b3b 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonCookieTest.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/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/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestJsonInternalPropertyNormalizerTest.php
similarity index 97%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonInternalPropertyNormalizerTest.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestJsonInternalPropertyNormalizerTest.php
index 1944718cf7..7ac9d89852 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonInternalPropertyNormalizerTest.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/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/EntityTestLabel/EntityTestLabelJsonAnonTest.php b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestLabelJsonAnonTest.php
similarity index 83%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelJsonAnonTest.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestLabelJsonAnonTest.php
index 10c4ec498b..31a476de39 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelJsonAnonTest.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/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/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestLabelJsonBasicAuthTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelJsonBasicAuthTest.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestLabelJsonBasicAuthTest.php
index 2a43e038ce..61cfea15b2 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelJsonBasicAuthTest.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/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/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestLabelJsonCookieTest.php
similarity index 85%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelJsonCookieTest.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestLabelJsonCookieTest.php
index 2fec09d6aa..20bb70184f 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelJsonCookieTest.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/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/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestLabelResourceTestBase.php
similarity index 98%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelResourceTestBase.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestLabelResourceTestBase.php
index 2257d6c275..08a6552f65 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelResourceTestBase.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/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/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestLabelXmlAnonTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelXmlAnonTest.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestLabelXmlAnonTest.php
index ef2005ab7b..ac1bd8685c 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelXmlAnonTest.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/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/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestLabelXmlBasicAuthTest.php
similarity index 90%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelXmlBasicAuthTest.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestLabelXmlBasicAuthTest.php
index 1754d5565f..e671098f2f 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelXmlBasicAuthTest.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/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/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestLabelXmlCookieTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelXmlCookieTest.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestLabelXmlCookieTest.php
index 406d36055c..f859c7ff8b 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelXmlCookieTest.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/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/EntityTest/EntityTestResourceTestBase.php b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestResourceTestBase.php
similarity index 98%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestResourceTestBase.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestResourceTestBase.php
index 0c82ea95a2..0a764111ee 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestResourceTestBase.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityTest;
+namespace Drupal\Tests\entity_test\Functional\Rest;
 
 use Drupal\entity_test\Entity\EntityTest;
 use Drupal\Tests\rest\Functional\BcTimestampNormalizerUnixTestTrait;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestXmlAnonTest.php b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestXmlAnonTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestXmlAnonTest.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestXmlAnonTest.php
index 52dcad4122..a5548f9a78 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestXmlAnonTest.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/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/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestXmlBasicAuthTest.php
similarity index 90%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestXmlBasicAuthTest.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestXmlBasicAuthTest.php
index 55c72465a8..d0501afb97 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestXmlBasicAuthTest.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/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/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestXmlCookieTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestXmlCookieTest.php
rename to core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestXmlCookieTest.php
index 247ebd8bac..7fe4930fcb 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestXmlCookieTest.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/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/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonAnonTest.php b/core/modules/system/tests/src/Functional/Hal/ActionHalJsonAnonTest.php
similarity index 74%
rename from core/modules/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonAnonTest.php
rename to core/modules/system/tests/src/Functional/Hal/ActionHalJsonAnonTest.php
index 0eae86630e..eb19bac6f1 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonAnonTest.php
+++ b/core/modules/system/tests/src/Functional/Hal/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/system/tests/src/Functional/Hal/ActionHalJsonBasicAuthTest.php
similarity index 78%
rename from core/modules/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonBasicAuthTest.php
rename to core/modules/system/tests/src/Functional/Hal/ActionHalJsonBasicAuthTest.php
index 5a43a5d9f4..7441f6ab4b 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonBasicAuthTest.php
+++ b/core/modules/system/tests/src/Functional/Hal/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/system/tests/src/Functional/Hal/ActionHalJsonCookieTest.php
similarity index 77%
rename from core/modules/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonCookieTest.php
rename to core/modules/system/tests/src/Functional/Hal/ActionHalJsonCookieTest.php
index 21f08c580f..f013032e85 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonCookieTest.php
+++ b/core/modules/system/tests/src/Functional/Hal/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/Menu/MenuHalJsonAnonTest.php b/core/modules/system/tests/src/Functional/Hal/MenuHalJsonAnonTest.php
similarity index 75%
rename from core/modules/hal/tests/src/Functional/EntityResource/Menu/MenuHalJsonAnonTest.php
rename to core/modules/system/tests/src/Functional/Hal/MenuHalJsonAnonTest.php
index ace7df7bb7..0200624b16 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Menu/MenuHalJsonAnonTest.php
+++ b/core/modules/system/tests/src/Functional/Hal/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/system/tests/src/Functional/Hal/MenuHalJsonBasicAuthTest.php
similarity index 79%
rename from core/modules/hal/tests/src/Functional/EntityResource/Menu/MenuHalJsonBasicAuthTest.php
rename to core/modules/system/tests/src/Functional/Hal/MenuHalJsonBasicAuthTest.php
index 82242e1e6b..cce118b118 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Menu/MenuHalJsonBasicAuthTest.php
+++ b/core/modules/system/tests/src/Functional/Hal/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/system/tests/src/Functional/Hal/MenuHalJsonCookieTest.php
similarity index 78%
rename from core/modules/hal/tests/src/Functional/EntityResource/Menu/MenuHalJsonCookieTest.php
rename to core/modules/system/tests/src/Functional/Hal/MenuHalJsonCookieTest.php
index 0c1ff4bbb7..9f7346f259 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Menu/MenuHalJsonCookieTest.php
+++ b/core/modules/system/tests/src/Functional/Hal/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/rest/tests/src/Functional/EntityResource/Action/ActionJsonAnonTest.php b/core/modules/system/tests/src/Functional/Rest/ActionJsonAnonTest.php
similarity index 84%
rename from core/modules/rest/tests/src/Functional/EntityResource/Action/ActionJsonAnonTest.php
rename to core/modules/system/tests/src/Functional/Rest/ActionJsonAnonTest.php
index 4d55c25b9a..07a7a5b3dd 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionJsonAnonTest.php
+++ b/core/modules/system/tests/src/Functional/Rest/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/system/tests/src/Functional/Rest/ActionJsonBasicAuthTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/Action/ActionJsonBasicAuthTest.php
rename to core/modules/system/tests/src/Functional/Rest/ActionJsonBasicAuthTest.php
index bc998ed16d..fdc516b9e4 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionJsonBasicAuthTest.php
+++ b/core/modules/system/tests/src/Functional/Rest/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/system/tests/src/Functional/Rest/ActionJsonCookieTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/Action/ActionJsonCookieTest.php
rename to core/modules/system/tests/src/Functional/Rest/ActionJsonCookieTest.php
index ab7c50657b..0766f03f08 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionJsonCookieTest.php
+++ b/core/modules/system/tests/src/Functional/Rest/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/system/tests/src/Functional/Rest/ActionResourceTestBase.php
similarity index 96%
rename from core/modules/rest/tests/src/Functional/EntityResource/Action/ActionResourceTestBase.php
rename to core/modules/system/tests/src/Functional/Rest/ActionResourceTestBase.php
index 76aff4bccd..5134e910a6 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionResourceTestBase.php
+++ b/core/modules/system/tests/src/Functional/Rest/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/system/tests/src/Functional/Rest/ActionXmlAnonTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/Action/ActionXmlAnonTest.php
rename to core/modules/system/tests/src/Functional/Rest/ActionXmlAnonTest.php
index 3bce75ebd1..e45af980ea 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionXmlAnonTest.php
+++ b/core/modules/system/tests/src/Functional/Rest/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/system/tests/src/Functional/Rest/ActionXmlBasicAuthTest.php
similarity index 90%
rename from core/modules/rest/tests/src/Functional/EntityResource/Action/ActionXmlBasicAuthTest.php
rename to core/modules/system/tests/src/Functional/Rest/ActionXmlBasicAuthTest.php
index a81051d9a8..f11459bc6d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionXmlBasicAuthTest.php
+++ b/core/modules/system/tests/src/Functional/Rest/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/system/tests/src/Functional/Rest/ActionXmlCookieTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/Action/ActionXmlCookieTest.php
rename to core/modules/system/tests/src/Functional/Rest/ActionXmlCookieTest.php
index 85b28ac5b4..dbee6fa1af 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionXmlCookieTest.php
+++ b/core/modules/system/tests/src/Functional/Rest/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/Menu/MenuJsonAnonTest.php b/core/modules/system/tests/src/Functional/Rest/MenuJsonAnonTest.php
similarity index 84%
rename from core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuJsonAnonTest.php
rename to core/modules/system/tests/src/Functional/Rest/MenuJsonAnonTest.php
index 9a83ce9f54..468deb5178 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuJsonAnonTest.php
+++ b/core/modules/system/tests/src/Functional/Rest/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/system/tests/src/Functional/Rest/MenuJsonBasicAuthTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuJsonBasicAuthTest.php
rename to core/modules/system/tests/src/Functional/Rest/MenuJsonBasicAuthTest.php
index b419eaf139..1d35d42161 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuJsonBasicAuthTest.php
+++ b/core/modules/system/tests/src/Functional/Rest/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/system/tests/src/Functional/Rest/MenuJsonCookieTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuJsonCookieTest.php
rename to core/modules/system/tests/src/Functional/Rest/MenuJsonCookieTest.php
index 9ecce923d8..d923875e15 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuJsonCookieTest.php
+++ b/core/modules/system/tests/src/Functional/Rest/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/system/tests/src/Functional/Rest/MenuResourceTestBase.php
similarity index 95%
rename from core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuResourceTestBase.php
rename to core/modules/system/tests/src/Functional/Rest/MenuResourceTestBase.php
index dd7f5520fe..91953eb441 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuResourceTestBase.php
+++ b/core/modules/system/tests/src/Functional/Rest/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/system/tests/src/Functional/Rest/MenuXmlAnonTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuXmlAnonTest.php
rename to core/modules/system/tests/src/Functional/Rest/MenuXmlAnonTest.php
index 22584501ca..e1c23b5f70 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuXmlAnonTest.php
+++ b/core/modules/system/tests/src/Functional/Rest/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/system/tests/src/Functional/Rest/MenuXmlBasicAuthTest.php
similarity index 91%
rename from core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuXmlBasicAuthTest.php
rename to core/modules/system/tests/src/Functional/Rest/MenuXmlBasicAuthTest.php
index 62e1d5941a..0910430042 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuXmlBasicAuthTest.php
+++ b/core/modules/system/tests/src/Functional/Rest/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/system/tests/src/Functional/Rest/MenuXmlCookieTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuXmlCookieTest.php
rename to core/modules/system/tests/src/Functional/Rest/MenuXmlCookieTest.php
index 5a5cdfa855..a229b6a3b2 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuXmlCookieTest.php
+++ b/core/modules/system/tests/src/Functional/Rest/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/hal/tests/src/Functional/EntityResource/Term/TermHalJsonAnonTest.php b/core/modules/taxonomy/tests/src/Functional/Hal/TermHalJsonAnonTest.php
similarity index 97%
rename from core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonAnonTest.php
rename to core/modules/taxonomy/tests/src/Functional/Hal/TermHalJsonAnonTest.php
index e19fb1baab..ee3effc572 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonAnonTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Hal/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/taxonomy/tests/src/Functional/Hal/TermHalJsonBasicAuthTest.php
similarity index 85%
rename from core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonBasicAuthTest.php
rename to core/modules/taxonomy/tests/src/Functional/Hal/TermHalJsonBasicAuthTest.php
index 58633389f8..5766156072 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonBasicAuthTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Hal/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/taxonomy/tests/src/Functional/Hal/TermHalJsonCookieTest.php
similarity index 80%
rename from core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonCookieTest.php
rename to core/modules/taxonomy/tests/src/Functional/Hal/TermHalJsonCookieTest.php
index 23ccd20526..f949e7a834 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonCookieTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Hal/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/Vocabulary/VocabularyHalJsonAnonTest.php b/core/modules/taxonomy/tests/src/Functional/Hal/VocabularyHalJsonAnonTest.php
similarity index 78%
rename from core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonAnonTest.php
rename to core/modules/taxonomy/tests/src/Functional/Hal/VocabularyHalJsonAnonTest.php
index d4f4bcf566..e2c1bc86bd 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonAnonTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Hal/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/taxonomy/tests/src/Functional/Hal/VocabularyHalJsonBasicAuthTest.php
similarity index 77%
rename from core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonBasicAuthTest.php
rename to core/modules/taxonomy/tests/src/Functional/Hal/VocabularyHalJsonBasicAuthTest.php
index d53b836ca8..d8c17e6d3a 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonBasicAuthTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Hal/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/taxonomy/tests/src/Functional/Hal/VocabularyHalJsonCookieTest.php
similarity index 76%
rename from core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonCookieTest.php
rename to core/modules/taxonomy/tests/src/Functional/Hal/VocabularyHalJsonCookieTest.php
index dd37532065..13a44dbb93 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonCookieTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Hal/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/rest/tests/src/Functional/EntityResource/Term/TermJsonAnonTest.php b/core/modules/taxonomy/tests/src/Functional/Rest/TermJsonAnonTest.php
similarity index 84%
rename from core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonAnonTest.php
rename to core/modules/taxonomy/tests/src/Functional/Rest/TermJsonAnonTest.php
index 90a85e7228..7d87337597 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonAnonTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Rest/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/taxonomy/tests/src/Functional/Rest/TermJsonBasicAuthTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonBasicAuthTest.php
rename to core/modules/taxonomy/tests/src/Functional/Rest/TermJsonBasicAuthTest.php
index 97df5c8413..959e2bb187 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonBasicAuthTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Rest/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/taxonomy/tests/src/Functional/Rest/TermJsonCookieTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonCookieTest.php
rename to core/modules/taxonomy/tests/src/Functional/Rest/TermJsonCookieTest.php
index ccf066b78d..88dd70c606 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonCookieTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Rest/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/taxonomy/tests/src/Functional/Rest/TermResourceTestBase.php
similarity index 99%
rename from core/modules/rest/tests/src/Functional/EntityResource/Term/TermResourceTestBase.php
rename to core/modules/taxonomy/tests/src/Functional/Rest/TermResourceTestBase.php
index ce6090419e..a33eaa92d1 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermResourceTestBase.php
+++ b/core/modules/taxonomy/tests/src/Functional/Rest/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/taxonomy/tests/src/Functional/Rest/TermXmlAnonTest.php
similarity index 91%
rename from core/modules/rest/tests/src/Functional/EntityResource/Term/TermXmlAnonTest.php
rename to core/modules/taxonomy/tests/src/Functional/Rest/TermXmlAnonTest.php
index 8f47ae6728..69abeaf210 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermXmlAnonTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Rest/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/taxonomy/tests/src/Functional/Rest/TermXmlBasicAuthTest.php
similarity index 92%
rename from core/modules/rest/tests/src/Functional/EntityResource/Term/TermXmlBasicAuthTest.php
rename to core/modules/taxonomy/tests/src/Functional/Rest/TermXmlBasicAuthTest.php
index 9cbfbeaf70..8eacb85c1c 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermXmlBasicAuthTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Rest/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/taxonomy/tests/src/Functional/Rest/TermXmlCookieTest.php
similarity index 92%
rename from core/modules/rest/tests/src/Functional/EntityResource/Term/TermXmlCookieTest.php
rename to core/modules/taxonomy/tests/src/Functional/Rest/TermXmlCookieTest.php
index ace67e0fde..3de95fdaba 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermXmlCookieTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Rest/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/Vocabulary/VocabularyJsonAnonTest.php b/core/modules/taxonomy/tests/src/Functional/Rest/VocabularyJsonAnonTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonAnonTest.php
rename to core/modules/taxonomy/tests/src/Functional/Rest/VocabularyJsonAnonTest.php
index 40f26ab7d1..a85da93827 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonAnonTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Rest/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/taxonomy/tests/src/Functional/Rest/VocabularyJsonBasicAuthTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonBasicAuthTest.php
rename to core/modules/taxonomy/tests/src/Functional/Rest/VocabularyJsonBasicAuthTest.php
index 492a8addde..ec0d67e2b2 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonBasicAuthTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Rest/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/taxonomy/tests/src/Functional/Rest/VocabularyJsonCookieTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonCookieTest.php
rename to core/modules/taxonomy/tests/src/Functional/Rest/VocabularyJsonCookieTest.php
index db8b657167..51c79a6a8c 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonCookieTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Rest/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/taxonomy/tests/src/Functional/Rest/VocabularyResourceTestBase.php
similarity index 96%
rename from core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyResourceTestBase.php
rename to core/modules/taxonomy/tests/src/Functional/Rest/VocabularyResourceTestBase.php
index 5d03512921..b1e87d986e 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyResourceTestBase.php
+++ b/core/modules/taxonomy/tests/src/Functional/Rest/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/taxonomy/tests/src/Functional/Rest/VocabularyXmlAnonTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyXmlAnonTest.php
rename to core/modules/taxonomy/tests/src/Functional/Rest/VocabularyXmlAnonTest.php
index 3e2a300f54..ac8da3d741 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyXmlAnonTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Rest/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/taxonomy/tests/src/Functional/Rest/VocabularyXmlBasicAuthTest.php
similarity index 90%
rename from core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyXmlBasicAuthTest.php
rename to core/modules/taxonomy/tests/src/Functional/Rest/VocabularyXmlBasicAuthTest.php
index a62c5be24b..52b3741a9a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyXmlBasicAuthTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Rest/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/taxonomy/tests/src/Functional/Rest/VocabularyXmlCookieTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyXmlCookieTest.php
rename to core/modules/taxonomy/tests/src/Functional/Rest/VocabularyXmlCookieTest.php
index e1cd9312ff..51e7e20e49 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyXmlCookieTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Rest/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;
diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Tour/TourHalJsonAnonTest.php b/core/modules/tour/tests/src/Functional/Hal/TourHalJsonAnonTest.php
similarity index 75%
rename from core/modules/hal/tests/src/Functional/EntityResource/Tour/TourHalJsonAnonTest.php
rename to core/modules/tour/tests/src/Functional/Hal/TourHalJsonAnonTest.php
index 536d634708..1461fc1a88 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Tour/TourHalJsonAnonTest.php
+++ b/core/modules/tour/tests/src/Functional/Hal/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/tour/tests/src/Functional/Hal/TourHalJsonBasicAuthTest.php
similarity index 79%
rename from core/modules/hal/tests/src/Functional/EntityResource/Tour/TourHalJsonBasicAuthTest.php
rename to core/modules/tour/tests/src/Functional/Hal/TourHalJsonBasicAuthTest.php
index 07462f15c2..c79f55e48e 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Tour/TourHalJsonBasicAuthTest.php
+++ b/core/modules/tour/tests/src/Functional/Hal/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/tour/tests/src/Functional/Hal/TourHalJsonCookieTest.php
similarity index 78%
rename from core/modules/hal/tests/src/Functional/EntityResource/Tour/TourHalJsonCookieTest.php
rename to core/modules/tour/tests/src/Functional/Hal/TourHalJsonCookieTest.php
index cf1b447cc8..6a7737db08 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Tour/TourHalJsonCookieTest.php
+++ b/core/modules/tour/tests/src/Functional/Hal/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/rest/tests/src/Functional/EntityResource/Tour/TourJsonAnonTest.php b/core/modules/tour/tests/src/Functional/Rest/TourJsonAnonTest.php
similarity index 84%
rename from core/modules/rest/tests/src/Functional/EntityResource/Tour/TourJsonAnonTest.php
rename to core/modules/tour/tests/src/Functional/Rest/TourJsonAnonTest.php
index 0551a0b6ed..530fbe70b8 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourJsonAnonTest.php
+++ b/core/modules/tour/tests/src/Functional/Rest/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/tour/tests/src/Functional/Rest/TourJsonBasicAuthTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/Tour/TourJsonBasicAuthTest.php
rename to core/modules/tour/tests/src/Functional/Rest/TourJsonBasicAuthTest.php
index 67d7fd3ff9..fb1ff6995c 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourJsonBasicAuthTest.php
+++ b/core/modules/tour/tests/src/Functional/Rest/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/tour/tests/src/Functional/Rest/TourJsonCookieTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/Tour/TourJsonCookieTest.php
rename to core/modules/tour/tests/src/Functional/Rest/TourJsonCookieTest.php
index 9cb4db4c6f..c173395b3a 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourJsonCookieTest.php
+++ b/core/modules/tour/tests/src/Functional/Rest/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/tour/tests/src/Functional/Rest/TourResourceTestBase.php
similarity index 97%
rename from core/modules/rest/tests/src/Functional/EntityResource/Tour/TourResourceTestBase.php
rename to core/modules/tour/tests/src/Functional/Rest/TourResourceTestBase.php
index 294e3eeac8..a0f35f5316 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourResourceTestBase.php
+++ b/core/modules/tour/tests/src/Functional/Rest/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/tour/tests/src/Functional/Rest/TourXmlAnonTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/Tour/TourXmlAnonTest.php
rename to core/modules/tour/tests/src/Functional/Rest/TourXmlAnonTest.php
index 4c96e37c45..8f44c87bbd 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourXmlAnonTest.php
+++ b/core/modules/tour/tests/src/Functional/Rest/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/tour/tests/src/Functional/Rest/TourXmlBasicAuthTest.php
similarity index 91%
rename from core/modules/rest/tests/src/Functional/EntityResource/Tour/TourXmlBasicAuthTest.php
rename to core/modules/tour/tests/src/Functional/Rest/TourXmlBasicAuthTest.php
index 1f1860b07d..618b41defd 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourXmlBasicAuthTest.php
+++ b/core/modules/tour/tests/src/Functional/Rest/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/tour/tests/src/Functional/Rest/TourXmlCookieTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/Tour/TourXmlCookieTest.php
rename to core/modules/tour/tests/src/Functional/Rest/TourXmlCookieTest.php
index 10845c121d..4d65bfff3d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourXmlCookieTest.php
+++ b/core/modules/tour/tests/src/Functional/Rest/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/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonAnonTest.php b/core/modules/user/tests/src/Functional/Hal/RoleHalJsonAnonTest.php
similarity index 75%
rename from core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonAnonTest.php
rename to core/modules/user/tests/src/Functional/Hal/RoleHalJsonAnonTest.php
index ca39204dbc..a08a1d094a 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonAnonTest.php
+++ b/core/modules/user/tests/src/Functional/Hal/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/user/tests/src/Functional/Hal/RoleHalJsonBasicAuthTest.php
similarity index 79%
rename from core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonBasicAuthTest.php
rename to core/modules/user/tests/src/Functional/Hal/RoleHalJsonBasicAuthTest.php
index 090f1535f0..1e613e5d73 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonBasicAuthTest.php
+++ b/core/modules/user/tests/src/Functional/Hal/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/user/tests/src/Functional/Hal/RoleHalJsonCookieTest.php
similarity index 78%
rename from core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonCookieTest.php
rename to core/modules/user/tests/src/Functional/Hal/RoleHalJsonCookieTest.php
index a98046a42b..0074e0516c 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonCookieTest.php
+++ b/core/modules/user/tests/src/Functional/Hal/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/User/UserHalJsonAnonTest.php b/core/modules/user/tests/src/Functional/Hal/UserHalJsonAnonTest.php
similarity index 90%
rename from core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonAnonTest.php
rename to core/modules/user/tests/src/Functional/Hal/UserHalJsonAnonTest.php
index 7398f28489..b33c6868bc 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonAnonTest.php
+++ b/core/modules/user/tests/src/Functional/Hal/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/user/tests/src/Functional/Hal/UserHalJsonBasicAuthTest.php
similarity index 85%
rename from core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonBasicAuthTest.php
rename to core/modules/user/tests/src/Functional/Hal/UserHalJsonBasicAuthTest.php
index 985b24c170..7da859e060 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonBasicAuthTest.php
+++ b/core/modules/user/tests/src/Functional/Hal/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/user/tests/src/Functional/Hal/UserHalJsonCookieTest.php
similarity index 80%
rename from core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonCookieTest.php
rename to core/modules/user/tests/src/Functional/Hal/UserHalJsonCookieTest.php
index b4a121b53f..e5e785cc80 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonCookieTest.php
+++ b/core/modules/user/tests/src/Functional/Hal/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/rest/tests/src/Functional/EntityResource/Role/RoleJsonAnonTest.php b/core/modules/user/tests/src/Functional/Rest/RoleJsonAnonTest.php
similarity index 84%
rename from core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonAnonTest.php
rename to core/modules/user/tests/src/Functional/Rest/RoleJsonAnonTest.php
index eb0b05fbac..16e3e03eea 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonAnonTest.php
+++ b/core/modules/user/tests/src/Functional/Rest/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/user/tests/src/Functional/Rest/RoleJsonBasicAuthTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonBasicAuthTest.php
rename to core/modules/user/tests/src/Functional/Rest/RoleJsonBasicAuthTest.php
index 267a3b89d1..79d16cb90b 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonBasicAuthTest.php
+++ b/core/modules/user/tests/src/Functional/Rest/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/user/tests/src/Functional/Rest/RoleJsonCookieTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonCookieTest.php
rename to core/modules/user/tests/src/Functional/Rest/RoleJsonCookieTest.php
index 8740316853..6c31ab0041 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonCookieTest.php
+++ b/core/modules/user/tests/src/Functional/Rest/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/user/tests/src/Functional/Rest/RoleResourceTestBase.php
similarity index 95%
rename from core/modules/rest/tests/src/Functional/EntityResource/Role/RoleResourceTestBase.php
rename to core/modules/user/tests/src/Functional/Rest/RoleResourceTestBase.php
index ee719c4b56..18ff4842a9 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleResourceTestBase.php
+++ b/core/modules/user/tests/src/Functional/Rest/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/user/tests/src/Functional/Rest/RoleXmlAnonTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/Role/RoleXmlAnonTest.php
rename to core/modules/user/tests/src/Functional/Rest/RoleXmlAnonTest.php
index e780bee78e..14910a6202 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleXmlAnonTest.php
+++ b/core/modules/user/tests/src/Functional/Rest/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/user/tests/src/Functional/Rest/RoleXmlBasicAuthTest.php
similarity index 91%
rename from core/modules/rest/tests/src/Functional/EntityResource/Role/RoleXmlBasicAuthTest.php
rename to core/modules/user/tests/src/Functional/Rest/RoleXmlBasicAuthTest.php
index 9fef07df21..fa98edd47c 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleXmlBasicAuthTest.php
+++ b/core/modules/user/tests/src/Functional/Rest/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/user/tests/src/Functional/Rest/RoleXmlCookieTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/Role/RoleXmlCookieTest.php
rename to core/modules/user/tests/src/Functional/Rest/RoleXmlCookieTest.php
index 8e0b0e28fb..5e04d7c350 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleXmlCookieTest.php
+++ b/core/modules/user/tests/src/Functional/Rest/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/User/UserJsonAnonTest.php b/core/modules/user/tests/src/Functional/Rest/UserJsonAnonTest.php
similarity index 84%
rename from core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonAnonTest.php
rename to core/modules/user/tests/src/Functional/Rest/UserJsonAnonTest.php
index 176f3be1ab..5b7e09e2e3 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonAnonTest.php
+++ b/core/modules/user/tests/src/Functional/Rest/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/user/tests/src/Functional/Rest/UserJsonBasicAuthTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonBasicAuthTest.php
rename to core/modules/user/tests/src/Functional/Rest/UserJsonBasicAuthTest.php
index ea6ddea2dd..7a1ea2674e 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonBasicAuthTest.php
+++ b/core/modules/user/tests/src/Functional/Rest/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/user/tests/src/Functional/Rest/UserJsonCookieTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonCookieTest.php
rename to core/modules/user/tests/src/Functional/Rest/UserJsonCookieTest.php
index 9fae07d89b..6e325d8b2b 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonCookieTest.php
+++ b/core/modules/user/tests/src/Functional/Rest/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/user/tests/src/Functional/Rest/UserResourceTestBase.php
similarity index 99%
rename from core/modules/rest/tests/src/Functional/EntityResource/User/UserResourceTestBase.php
rename to core/modules/user/tests/src/Functional/Rest/UserResourceTestBase.php
index 7974cba730..65a0caaaa7 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/User/UserResourceTestBase.php
+++ b/core/modules/user/tests/src/Functional/Rest/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/user/tests/src/Functional/Rest/UserXmlAnonTest.php
similarity index 91%
rename from core/modules/rest/tests/src/Functional/EntityResource/User/UserXmlAnonTest.php
rename to core/modules/user/tests/src/Functional/Rest/UserXmlAnonTest.php
index 8f1d4839a9..4629192ce0 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/User/UserXmlAnonTest.php
+++ b/core/modules/user/tests/src/Functional/Rest/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/user/tests/src/Functional/Rest/UserXmlBasicAuthTest.php
similarity index 94%
rename from core/modules/rest/tests/src/Functional/EntityResource/User/UserXmlBasicAuthTest.php
rename to core/modules/user/tests/src/Functional/Rest/UserXmlBasicAuthTest.php
index 2281d33535..fc985980c3 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/User/UserXmlBasicAuthTest.php
+++ b/core/modules/user/tests/src/Functional/Rest/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/user/tests/src/Functional/Rest/UserXmlCookieTest.php
similarity index 93%
rename from core/modules/rest/tests/src/Functional/EntityResource/User/UserXmlCookieTest.php
rename to core/modules/user/tests/src/Functional/Rest/UserXmlCookieTest.php
index 3e01ce096f..9a0c724f4d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/User/UserXmlCookieTest.php
+++ b/core/modules/user/tests/src/Functional/Rest/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/hal/tests/src/Functional/EntityResource/View/ViewHalJsonAnonTest.php b/core/modules/views/tests/src/Functional/Hal/ViewHalJsonAnonTest.php
similarity index 75%
rename from core/modules/hal/tests/src/Functional/EntityResource/View/ViewHalJsonAnonTest.php
rename to core/modules/views/tests/src/Functional/Hal/ViewHalJsonAnonTest.php
index 432bd3f8c2..134b00f223 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/View/ViewHalJsonAnonTest.php
+++ b/core/modules/views/tests/src/Functional/Hal/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/views/tests/src/Functional/Hal/ViewHalJsonBasicAuthTest.php
similarity index 79%
rename from core/modules/hal/tests/src/Functional/EntityResource/View/ViewHalJsonBasicAuthTest.php
rename to core/modules/views/tests/src/Functional/Hal/ViewHalJsonBasicAuthTest.php
index 1c5ffc257c..87c39852cf 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/View/ViewHalJsonBasicAuthTest.php
+++ b/core/modules/views/tests/src/Functional/Hal/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/views/tests/src/Functional/Hal/ViewHalJsonCookieTest.php
similarity index 78%
rename from core/modules/hal/tests/src/Functional/EntityResource/View/ViewHalJsonCookieTest.php
rename to core/modules/views/tests/src/Functional/Hal/ViewHalJsonCookieTest.php
index e6b3cbe6e2..aa5aa4f6b7 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/View/ViewHalJsonCookieTest.php
+++ b/core/modules/views/tests/src/Functional/Hal/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/rest/tests/src/Functional/EntityResource/View/ViewJsonAnonTest.php b/core/modules/views/tests/src/Functional/Rest/ViewJsonAnonTest.php
similarity index 84%
rename from core/modules/rest/tests/src/Functional/EntityResource/View/ViewJsonAnonTest.php
rename to core/modules/views/tests/src/Functional/Rest/ViewJsonAnonTest.php
index 3cfd4b1424..694aee165b 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/View/ViewJsonAnonTest.php
+++ b/core/modules/views/tests/src/Functional/Rest/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/views/tests/src/Functional/Rest/ViewJsonBasicAuthTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/View/ViewJsonBasicAuthTest.php
rename to core/modules/views/tests/src/Functional/Rest/ViewJsonBasicAuthTest.php
index 98854f2a22..4ebe08c336 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/View/ViewJsonBasicAuthTest.php
+++ b/core/modules/views/tests/src/Functional/Rest/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/views/tests/src/Functional/Rest/ViewJsonCookieTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/View/ViewJsonCookieTest.php
rename to core/modules/views/tests/src/Functional/Rest/ViewJsonCookieTest.php
index f5fa797a06..feeeab2602 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/View/ViewJsonCookieTest.php
+++ b/core/modules/views/tests/src/Functional/Rest/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/views/tests/src/Functional/Rest/ViewResourceTestBase.php
similarity index 97%
rename from core/modules/rest/tests/src/Functional/EntityResource/View/ViewResourceTestBase.php
rename to core/modules/views/tests/src/Functional/Rest/ViewResourceTestBase.php
index 26ec7bb5c4..b57256365e 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/View/ViewResourceTestBase.php
+++ b/core/modules/views/tests/src/Functional/Rest/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/views/tests/src/Functional/Rest/ViewXmlAnonTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/View/ViewXmlAnonTest.php
rename to core/modules/views/tests/src/Functional/Rest/ViewXmlAnonTest.php
index 2bef32845a..7582a54f05 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/View/ViewXmlAnonTest.php
+++ b/core/modules/views/tests/src/Functional/Rest/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/views/tests/src/Functional/Rest/ViewXmlBasicAuthTest.php
similarity index 91%
rename from core/modules/rest/tests/src/Functional/EntityResource/View/ViewXmlBasicAuthTest.php
rename to core/modules/views/tests/src/Functional/Rest/ViewXmlBasicAuthTest.php
index 3059b5cf3e..ba9e58b3e6 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/View/ViewXmlBasicAuthTest.php
+++ b/core/modules/views/tests/src/Functional/Rest/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/views/tests/src/Functional/Rest/ViewXmlCookieTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/View/ViewXmlCookieTest.php
rename to core/modules/views/tests/src/Functional/Rest/ViewXmlCookieTest.php
index 24786a36b4..8f362a06c1 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/View/ViewXmlCookieTest.php
+++ b/core/modules/views/tests/src/Functional/Rest/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/hal/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideHalJsonAnonTest.php b/core/tests/Drupal/Tests/Core/Functional/Hal/BaseFieldOverrideHalJsonAnonTest.php
similarity index 71%
rename from core/modules/hal/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideHalJsonAnonTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Hal/BaseFieldOverrideHalJsonAnonTest.php
index 552437a401..d96d8e2a1d 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideHalJsonAnonTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Hal/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/tests/Drupal/Tests/Core/Functional/Hal/BaseFieldOverrideHalJsonBasicAuthTest.php
similarity index 75%
rename from core/modules/hal/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideHalJsonBasicAuthTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Hal/BaseFieldOverrideHalJsonBasicAuthTest.php
index ba2249e52c..3e9c66d462 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideHalJsonBasicAuthTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Hal/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/tests/Drupal/Tests/Core/Functional/Hal/BaseFieldOverrideHalJsonCookieTest.php
similarity index 74%
rename from core/modules/hal/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideHalJsonCookieTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Hal/BaseFieldOverrideHalJsonCookieTest.php
index b05f15332b..a40e4e346e 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideHalJsonCookieTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Hal/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/DateFormat/DateFormatHalJsonAnonTest.php b/core/tests/Drupal/Tests/Core/Functional/Hal/DateFormatHalJsonAnonTest.php
similarity index 73%
rename from core/modules/hal/tests/src/Functional/EntityResource/DateFormat/DateFormatHalJsonAnonTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Hal/DateFormatHalJsonAnonTest.php
index 1bd6eb803c..4d763cf135 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/DateFormat/DateFormatHalJsonAnonTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Hal/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/tests/Drupal/Tests/Core/Functional/Hal/DateFormatHalJsonBasicAuthTest.php
similarity index 77%
rename from core/modules/hal/tests/src/Functional/EntityResource/DateFormat/DateFormatHalJsonBasicAuthTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Hal/DateFormatHalJsonBasicAuthTest.php
index 2627c99dbb..4d6266fbc8 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/DateFormat/DateFormatHalJsonBasicAuthTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Hal/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/tests/Drupal/Tests/Core/Functional/Hal/DateFormatHalJsonCookieTest.php
similarity index 76%
rename from core/modules/hal/tests/src/Functional/EntityResource/DateFormat/DateFormatHalJsonCookieTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Hal/DateFormatHalJsonCookieTest.php
index 2367d6c0fa..53b668e486 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/DateFormat/DateFormatHalJsonCookieTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Hal/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/EntityFormDisplay/EntityFormDisplayHalJsonAnonTest.php b/core/tests/Drupal/Tests/Core/Functional/Hal/EntityFormDisplayHalJsonAnonTest.php
similarity index 71%
rename from core/modules/hal/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayHalJsonAnonTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Hal/EntityFormDisplayHalJsonAnonTest.php
index 199d0c2889..7eda44db52 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayHalJsonAnonTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Hal/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/tests/Drupal/Tests/Core/Functional/Hal/EntityFormDisplayHalJsonBasicAuthTest.php
similarity index 75%
rename from core/modules/hal/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayHalJsonBasicAuthTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Hal/EntityFormDisplayHalJsonBasicAuthTest.php
index 7e1bc51ada..5f58751225 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayHalJsonBasicAuthTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Hal/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/tests/Drupal/Tests/Core/Functional/Hal/EntityFormDisplayHalJsonCookieTest.php
similarity index 74%
rename from core/modules/hal/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayHalJsonCookieTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Hal/EntityFormDisplayHalJsonCookieTest.php
index 5c62956d88..e6f2379c63 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayHalJsonCookieTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Hal/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/tests/Drupal/Tests/Core/Functional/Hal/EntityFormModeHalJsonAnonTest.php
similarity index 72%
rename from core/modules/hal/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeHalJsonAnonTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Hal/EntityFormModeHalJsonAnonTest.php
index 3e99823749..7fd26f4f4b 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeHalJsonAnonTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Hal/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/tests/Drupal/Tests/Core/Functional/Hal/EntityFormModeHalJsonBasicAuthTest.php
similarity index 76%
rename from core/modules/hal/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeHalJsonBasicAuthTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Hal/EntityFormModeHalJsonBasicAuthTest.php
index 56d452553a..0ea3cb90e6 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeHalJsonBasicAuthTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Hal/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/tests/Drupal/Tests/Core/Functional/Hal/EntityFormModeHalJsonCookieTest.php
similarity index 75%
rename from core/modules/hal/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeHalJsonCookieTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Hal/EntityFormModeHalJsonCookieTest.php
index a84bf6d16c..8cea180722 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeHalJsonCookieTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Hal/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/EntityViewDisplay/EntityViewDisplayHalJsonAnonTest.php b/core/tests/Drupal/Tests/Core/Functional/Hal/EntityViewDisplayHalJsonAnonTest.php
similarity index 71%
rename from core/modules/hal/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayHalJsonAnonTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Hal/EntityViewDisplayHalJsonAnonTest.php
index 6fbebad254..a89d4393d9 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayHalJsonAnonTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Hal/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/tests/Drupal/Tests/Core/Functional/Hal/EntityViewDisplayHalJsonBasicAuthTest.php
similarity index 83%
rename from core/modules/hal/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayHalJsonBasicAuthTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Hal/EntityViewDisplayHalJsonBasicAuthTest.php
index 2c894f7f16..bf9f265b25 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayHalJsonBasicAuthTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Hal/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/tests/Drupal/Tests/Core/Functional/Hal/EntityViewDisplayHalJsonCookieTest.php
similarity index 79%
rename from core/modules/hal/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayHalJsonCookieTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Hal/EntityViewDisplayHalJsonCookieTest.php
index b8c71319e3..d9cc4eb454 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayHalJsonCookieTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Hal/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/tests/Drupal/Tests/Core/Functional/Hal/EntityViewModeHalJsonAnonTest.php
similarity index 72%
rename from core/modules/hal/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeHalJsonAnonTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Hal/EntityViewModeHalJsonAnonTest.php
index d1d4a7460a..c8731961de 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeHalJsonAnonTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Hal/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/tests/Drupal/Tests/Core/Functional/Hal/EntityViewModeHalJsonBasicAuthTest.php
similarity index 76%
rename from core/modules/hal/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeHalJsonBasicAuthTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Hal/EntityViewModeHalJsonBasicAuthTest.php
index a79c3fd056..673da0bb3e 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeHalJsonBasicAuthTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Hal/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/tests/Drupal/Tests/Core/Functional/Hal/EntityViewModeHalJsonCookieTest.php
similarity index 75%
rename from core/modules/hal/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeHalJsonCookieTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Hal/EntityViewModeHalJsonCookieTest.php
index 493de9a996..7528297132 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeHalJsonCookieTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Hal/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/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideJsonAnonTest.php b/core/tests/Drupal/Tests/Core/Functional/Rest/BaseFieldOverrideJsonAnonTest.php
similarity index 82%
rename from core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideJsonAnonTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/BaseFieldOverrideJsonAnonTest.php
index e16284d00c..c70f7ed938 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideJsonAnonTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/BaseFieldOverrideJsonBasicAuthTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideJsonBasicAuthTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/BaseFieldOverrideJsonBasicAuthTest.php
index 010fa8db11..2a2326395f 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideJsonBasicAuthTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/BaseFieldOverrideJsonCookieTest.php
similarity index 85%
rename from core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideJsonCookieTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/BaseFieldOverrideJsonCookieTest.php
index dd4f8ec7b3..d1337c3d6f 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideJsonCookieTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/BaseFieldOverrideResourceTestBase.php
similarity index 97%
rename from core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideResourceTestBase.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/BaseFieldOverrideResourceTestBase.php
index 1f4b03a2cf..fc5efcbad8 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideResourceTestBase.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/BaseFieldOverrideXmlAnonTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideXmlAnonTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/BaseFieldOverrideXmlAnonTest.php
index 17e8bbf6d5..7f06bf5c97 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideXmlAnonTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/BaseFieldOverrideXmlBasicAuthTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideXmlBasicAuthTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/BaseFieldOverrideXmlBasicAuthTest.php
index 7793c90417..30cec05da5 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideXmlBasicAuthTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/BaseFieldOverrideXmlCookieTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideXmlCookieTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/BaseFieldOverrideXmlCookieTest.php
index d8b86e1bf9..6f638daff4 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideXmlCookieTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/DateFormat/DateFormatJsonAnonTest.php b/core/tests/Drupal/Tests/Core/Functional/Rest/DateFormatJsonAnonTest.php
similarity index 83%
rename from core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatJsonAnonTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/DateFormatJsonAnonTest.php
index 9fe8ea221c..903bd36f03 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatJsonAnonTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/DateFormatJsonBasicAuthTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatJsonBasicAuthTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/DateFormatJsonBasicAuthTest.php
index 71f1f7fd65..0ee48b2c91 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatJsonBasicAuthTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/DateFormatJsonCookieTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatJsonCookieTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/DateFormatJsonCookieTest.php
index 07c305f7aa..f099245646 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatJsonCookieTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/DateFormatResourceTestBase.php
similarity index 95%
rename from core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatResourceTestBase.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/DateFormatResourceTestBase.php
index 8fce0fed15..ab9ce43e00 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatResourceTestBase.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/DateFormatXmlAnonTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatXmlAnonTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/DateFormatXmlAnonTest.php
index 6a5873aafd..db346b4a92 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatXmlAnonTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/DateFormatXmlBasicAuthTest.php
similarity index 90%
rename from core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatXmlBasicAuthTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/DateFormatXmlBasicAuthTest.php
index 488a93efc8..60e40acbf6 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatXmlBasicAuthTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/DateFormatXmlCookieTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatXmlCookieTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/DateFormatXmlCookieTest.php
index 4818395d97..d73d226296 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatXmlCookieTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/EntityFormDisplay/EntityFormDisplayJsonAnonTest.php b/core/tests/Drupal/Tests/Core/Functional/Rest/EntityFormDisplayJsonAnonTest.php
similarity index 82%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayJsonAnonTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/EntityFormDisplayJsonAnonTest.php
index 68a616729b..672645cee6 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayJsonAnonTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/EntityFormDisplayJsonBasicAuthTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayJsonBasicAuthTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/EntityFormDisplayJsonBasicAuthTest.php
index 940e73b51a..15ccc6bb7e 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayJsonBasicAuthTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/EntityFormDisplayJsonCookieTest.php
similarity index 85%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayJsonCookieTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/EntityFormDisplayJsonCookieTest.php
index eba9c46ccf..2cb9e82684 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayJsonCookieTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/EntityFormDisplayResourceTestBase.php
similarity index 98%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayResourceTestBase.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/EntityFormDisplayResourceTestBase.php
index cc4cf588a7..9a7542ea56 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayResourceTestBase.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/EntityFormDisplayXmlAnonTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayXmlAnonTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/EntityFormDisplayXmlAnonTest.php
index 9d0a290e30..b736846ee9 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayXmlAnonTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/EntityFormDisplayXmlBasicAuthTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayXmlBasicAuthTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/EntityFormDisplayXmlBasicAuthTest.php
index 03a5f4d644..5803df6097 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayXmlBasicAuthTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/EntityFormDisplayXmlCookieTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayXmlCookieTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/EntityFormDisplayXmlCookieTest.php
index 6fc9d5049d..9f7f0dfe2d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayXmlCookieTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/EntityFormModeJsonAnonTest.php
similarity index 83%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeJsonAnonTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/EntityFormModeJsonAnonTest.php
index bdb4dfac9b..1383ecfc96 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeJsonAnonTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/EntityFormModeJsonBasicAuthTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeJsonBasicAuthTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/EntityFormModeJsonBasicAuthTest.php
index 989cd5b919..782c091ee7 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeJsonBasicAuthTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/EntityFormModeJsonCookieTest.php
similarity index 85%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeJsonCookieTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/EntityFormModeJsonCookieTest.php
index 655e0cc6e1..ec293f3bba 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeJsonCookieTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/EntityFormModeResourceTestBase.php
similarity index 95%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeResourceTestBase.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/EntityFormModeResourceTestBase.php
index a9035e0ad1..73f3552a1e 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeResourceTestBase.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/EntityFormModeXmlAnonTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeXmlAnonTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/EntityFormModeXmlAnonTest.php
index 4e8ecefa55..d2bb26b5aa 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeXmlAnonTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/EntityFormModeXmlBasicAuthTest.php
similarity index 90%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeXmlBasicAuthTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/EntityFormModeXmlBasicAuthTest.php
index 53b8f35a1d..44ae231af3 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeXmlBasicAuthTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/EntityFormModeXmlCookieTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeXmlCookieTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/EntityFormModeXmlCookieTest.php
index 76d9c95103..c5d997aef8 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeXmlCookieTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/EntityViewDisplay/EntityViewDisplayJsonAnonTest.php b/core/tests/Drupal/Tests/Core/Functional/Rest/EntityViewDisplayJsonAnonTest.php
similarity index 82%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayJsonAnonTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/EntityViewDisplayJsonAnonTest.php
index cf7d671ab3..4977158da7 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayJsonAnonTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/EntityViewDisplayJsonBasicAuthTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayJsonBasicAuthTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/EntityViewDisplayJsonBasicAuthTest.php
index 457c42f5eb..392e6ca925 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayJsonBasicAuthTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/EntityViewDisplayJsonCookieTest.php
similarity index 85%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayJsonCookieTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/EntityViewDisplayJsonCookieTest.php
index cc186df635..fbb56d15a5 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayJsonCookieTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/EntityViewDisplayResourceTestBase.php
similarity index 97%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayResourceTestBase.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/EntityViewDisplayResourceTestBase.php
index ccc3aad3c0..a4df649495 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayResourceTestBase.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/EntityViewDisplayXmlAnonTest.php
similarity index 86%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayXmlAnonTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/EntityViewDisplayXmlAnonTest.php
index e4bc039481..917f1af899 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayXmlAnonTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/EntityViewDisplayXmlBasicAuthTest.php
similarity index 89%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayXmlBasicAuthTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/EntityViewDisplayXmlBasicAuthTest.php
index 547592d030..8d192491b1 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayXmlBasicAuthTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/EntityViewDisplayXmlCookieTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayXmlCookieTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/EntityViewDisplayXmlCookieTest.php
index 0ecf3a2b40..1ce8b522d6 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayXmlCookieTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/EntityViewModeJsonAnonTest.php
similarity index 83%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeJsonAnonTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/EntityViewModeJsonAnonTest.php
index b74b825844..42fd7e1f7c 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeJsonAnonTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/EntityViewModeJsonBasicAuthTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeJsonBasicAuthTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/EntityViewModeJsonBasicAuthTest.php
index 986b31da74..205d6c542c 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeJsonBasicAuthTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/EntityViewModeJsonCookieTest.php
similarity index 85%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeJsonCookieTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/EntityViewModeJsonCookieTest.php
index 78822f5af4..756749d1cf 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeJsonCookieTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/EntityViewModeResourceTestBase.php
similarity index 95%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeResourceTestBase.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/EntityViewModeResourceTestBase.php
index 28cb9b0303..d5c8d18138 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeResourceTestBase.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/EntityViewModeXmlAnonTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeXmlAnonTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/EntityViewModeXmlAnonTest.php
index 534de74918..76fa1f05f0 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeXmlAnonTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/EntityViewModeXmlBasicAuthTest.php
similarity index 90%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeXmlBasicAuthTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/EntityViewModeXmlBasicAuthTest.php
index 57a1f86171..d09b2eb619 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeXmlBasicAuthTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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/tests/Drupal/Tests/Core/Functional/Rest/EntityViewModeXmlCookieTest.php
similarity index 88%
rename from core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeXmlCookieTest.php
rename to core/tests/Drupal/Tests/Core/Functional/Rest/EntityViewModeXmlCookieTest.php
index 72b0323ddf..b39e3ea21d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeXmlCookieTest.php
+++ b/core/tests/Drupal/Tests/Core/Functional/Rest/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;