diff --git a/core/modules/content_moderation/src/Tests/ModerationFormTest.php b/core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php
similarity index 95%
rename from core/modules/content_moderation/src/Tests/ModerationFormTest.php
rename to core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php
index 16da4e4..3e41991 100644
--- a/core/modules/content_moderation/src/Tests/ModerationFormTest.php
+++ b/core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\content_moderation\Tests;
+namespace Drupal\Tests\content_moderation\Functional;
 
 /**
  * Tests the moderation form, specifically on nodes.
@@ -27,7 +27,7 @@ protected function setUp() {
    * the default revision is not a published moderation state.
    *
    * @see \Drupal\content_moderation\EntityOperations
-   * @see \Drupal\content_moderation\Tests\ModerationStateBlockTest::testCustomBlockModeration
+   * @see \Drupal\Tests\content_moderation\Functional\ModerationStateBlockTest::testCustomBlockModeration
    */
   public function testModerationForm() {
     // Create new moderated content in draft.
diff --git a/core/modules/content_moderation/src/Tests/ModerationStateBlockTest.php b/core/modules/content_moderation/tests/src/Functional/ModerationStateBlockTest.php
similarity index 98%
rename from core/modules/content_moderation/src/Tests/ModerationStateBlockTest.php
rename to core/modules/content_moderation/tests/src/Functional/ModerationStateBlockTest.php
index 593a9f9..d45fb7b 100644
--- a/core/modules/content_moderation/src/Tests/ModerationStateBlockTest.php
+++ b/core/modules/content_moderation/tests/src/Functional/ModerationStateBlockTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\content_moderation\Tests;
+namespace Drupal\Tests\content_moderation\Functional;
 
 use Drupal\block_content\Entity\BlockContent;
 use Drupal\block_content\Entity\BlockContentType;
diff --git a/core/modules/content_moderation/src/Tests/ModerationStateNodeTest.php b/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTest.php
similarity index 98%
rename from core/modules/content_moderation/src/Tests/ModerationStateNodeTest.php
rename to core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTest.php
index 49eee6d..7579afa 100644
--- a/core/modules/content_moderation/src/Tests/ModerationStateNodeTest.php
+++ b/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\content_moderation\Tests;
+namespace Drupal\Tests\content_moderation\Functional;
 
 use Drupal\Core\Url;
 use Drupal\node\Entity\Node;
@@ -132,7 +132,7 @@ public function testPagers() {
     $this->drupalLogin($this->adminUser);
     $this->drupalGet('admin/content');
     $element = $this->cssSelect('nav.pager li.is-active a');
-    $url = (string) $element[0]['href'];
+    $url = $element[0]->getAttribute('href');
     $query = [];
     parse_str(parse_url($url, PHP_URL_QUERY), $query);
     $this->assertEqual(0, $query['page']);
diff --git a/core/modules/content_moderation/src/Tests/ModerationStateNodeTypeTest.php b/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTypeTest.php
similarity index 98%
rename from core/modules/content_moderation/src/Tests/ModerationStateNodeTypeTest.php
rename to core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTypeTest.php
index 099b4dc..b308ddc 100644
--- a/core/modules/content_moderation/src/Tests/ModerationStateNodeTypeTest.php
+++ b/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTypeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\content_moderation\Tests;
+namespace Drupal\Tests\content_moderation\Functional;
 
 
 /**