diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6NodeSettings.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6NodeSettings.php
index 051dc0f..67211d5 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6NodeSettings.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6NodeSettings.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\migrate_drupal\Tests\Dump\Drupal6NodeSettings.
+ */
+
 namespace Drupal\migrate_drupal\Tests\Dump;
 
 use Drupal\Core\Database\Connection;
@@ -10,7 +15,10 @@
 class Drupal6NodeSettings {
 
   /**
+   * Sample database schema and values.
+   *
    * @param \Drupal\Core\Database\Connection $database
+   *   The database connection.
    */
   public static function load(Connection $database) {
     $database->schema()->createTable('variable', array(
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateActionConfigsTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateActionConfigsTest.php
index 3e15d47..6268f0a 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateActionConfigsTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateActionConfigsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Upgrade\MigrateActionConfigsTest.
+ * Contains \Drupal\migrate_drupal\Tests\MigrateActionConfigsTest.
  */
 
 namespace Drupal\migrate_drupal\Tests;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateAggregatorConfigsTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateAggregatorConfigsTest.php
index 0da3d52..d26e72a 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateAggregatorConfigsTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateAggregatorConfigsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Upgrade\MigrateAggregatorConfigsTest.
+ * Contains \Drupal\migrate_drupal\Tests\MigrateAggregatorConfigsTest.
  */
 
 namespace Drupal\migrate_drupal\Tests;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateBookConfigsTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateBookConfigsTest.php
index 98ec7a5..1d0e4de 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateBookConfigsTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateBookConfigsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Upgrade\MigrateBookConfigsTest.
+ * Contains \Drupal\migrate_drupal\Tests\MigrateBookConfigsTest.
  */
 
 namespace Drupal\migrate_drupal\Tests;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateContactConfigsTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateContactConfigsTest.php
index 29f82b5..c1b3f10 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateContactConfigsTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateContactConfigsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Upgrade\MigrateContactConfigsTest.
+ * Contains \Drupal\migrate_drupal\Tests\MigrateContactConfigsTest.
  */
 
 namespace Drupal\migrate_drupal\Tests;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateDblogConfigsTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateDblogConfigsTest.php
index 015de29..c1ee2fb 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateDblogConfigsTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateDblogConfigsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Upgrade\MigrateDblogConfigsTest.
+ * Contains \Drupal\migrate_drupal\Tests\MigrateDblogConfigsTest.
  */
 
 namespace Drupal\migrate_drupal\Tests;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateFieldConfigsTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateFieldConfigsTest.php
index 9a287c0..643c053 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateFieldConfigsTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateFieldConfigsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Upgrade\MigrateFieldConfigsTest.
+ * Contains \Drupal\migrate_drupal\Tests\MigrateFieldConfigsTest.
  */
 
 namespace Drupal\migrate_drupal\Tests;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateFileConfigsTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateFileConfigsTest.php
index 83b9fc2..aa46f01 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateFileConfigsTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateFileConfigsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Upgrade\MigrateFileConfigsTest.
+ * Contains \Drupal\migrate_drupal\Tests\MigrateFileConfigsTest.
  */
 
 namespace Drupal\migrate_drupal\Tests;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateForumConfigsTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateForumConfigsTest.php
index fdc03c3..6d18411 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateForumConfigsTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateForumConfigsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Upgrade\MigrateForumConfigsTest.
+ * Contains \Drupal\migrate_drupal\Tests\MigrateForumConfigsTest.
  */
 
 namespace Drupal\migrate_drupal\Tests;
@@ -41,8 +41,10 @@ public function testForumSettings() {
     $this->assertIdentical($config->get('topics.hot_threshold'), '15');
     $this->assertIdentical($config->get('topics.page_limit'), '25');
     $this->assertIdentical($config->get('topics.order'), '1');
-    // The vocabulary vid depends on existing vids when the Forum module was enabled. This would have to be user-selectable based on a query to the D6 vocabulary table.
-    //$this->assertIdentical($config->get('forum_nav_vocabulary'), '1');
+    // The vocabulary vid depends on existing vids when the Forum module was
+    // enabled. This would have to be user-selectable based on a query to the D6
+    // vocabulary table.
+    $this->assertIdentical($config->get('forum_nav_vocabulary'), '1');
     // This is 'forum_block_num_0' in D6, but block:active:limit' in D8.
     $this->assertIdentical($config->get('block.active.limit'), '5');
     // This is 'forum_block_num_1' in D6, but 'block:new:limit' in D8.
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateLocaleConfigsTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateLocaleConfigsTest.php
index 1c33681..fe13ab9 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateLocaleConfigsTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateLocaleConfigsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Upgrade\MigrateLocaleConfigsTest.
+ * Contains Drupal\migrate_drupal\Tests\MigrateLocaleConfigsTest.
  */
 
 namespace Drupal\migrate_drupal\Tests;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateNodeConfigsTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateNodeConfigsTest.php
index b41b158..a55b4e1 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateNodeConfigsTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateNodeConfigsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Upgrade\MigrateSystemSiteTest.
+ * Contains \Drupal\migrate_drupal\Tests\MigrateSystemSiteTest.
  */
 
 namespace Drupal\migrate_drupal\Tests;
@@ -23,13 +23,16 @@ public static function getInfo() {
     );
   }
 
-  function testNodeSettings() {
+  /**
+   * Tests migration of forum variables to node.settings.yml.
+   */
+  public function testNodeSettings() {
     $migration = entity_load('migration', 'd6_node_settings');
     $dumps = array(
       drupal_get_path('module', 'migrate_drupal') . '/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6NodeSettings.php',
     );
     $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, new MigrateMessage);
+    $executable = new MigrateExecutable($migration, new MigrateMessage());
     $executable->import();
     $config = \Drupal::config('node.settings');
     $this->assertIdentical($config->get('use_admin_theme'), 0);
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateSimpletestConfigsTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateSimpletestConfigsTest.php
index 416da6d..6779fc3 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateSimpletestConfigsTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateSimpletestConfigsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Upgrade\MigrateSimpletestConfigsTest.
+ * Contains \Drupal\migrate_drupal\Tests\MigrateSimpletestConfigsTest.
  */
 
 namespace Drupal\migrate_drupal\Tests;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateStatisticsConfigsTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateStatisticsConfigsTest.php
index 021b958..c9fb7cf 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateStatisticsConfigsTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateStatisticsConfigsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Upgrade\MigrateStatisticsConfigsTest.
+ * Contains \Drupal\migrate_drupal\Tests\MigrateStatisticsConfigsTest.
  */
 
 namespace Drupal\migrate_drupal\Tests;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateSyslogConfigsTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateSyslogConfigsTest.php
index 8f5649c..02a2f16 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateSyslogConfigsTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateSyslogConfigsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Upgrade\MigrateSyslogConfigsTest.
+ * Contains Drupal\migrate_drupal\Tests\MigrateSyslogConfigsTest.
  */
 
 namespace Drupal\migrate_drupal\Tests;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateSystemConfigsTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateSystemConfigsTest.php
index 4d0578e..c9438dd 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateSystemConfigsTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateSystemConfigsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Upgrade\MigrateSystemSiteTest.
+ * Contains \Drupal\migrate_drupal\Tests\MigrateSystemSiteTest.
  */
 
 namespace Drupal\migrate_drupal\Tests;
@@ -136,7 +136,21 @@ public function testSystemFilter() {
     $executable = new MigrateExecutable($migration, new MigrateMessage());
     $executable->import();
     $config = \Drupal::config('system.filter');
-    $this->assertIdentical($config->get('protocols'), array('http', 'https', 'ftp', 'news', 'nntp', 'tel', 'telnet', 'mailto', 'irc', 'ssh', 'sftp', 'webcal', 'rtsp'));
+    $this->assertIdentical($config->get('protocols'), array(
+      'http',
+      'https',
+      'ftp',
+      'news',
+      'nntp',
+      'tel',
+      'telnet',
+      'mailto',
+      'irc',
+      'ssh',
+      'sftp',
+      'webcal',
+      'rtsp',
+    ));
   }
 
   /**
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateTaxonomyConfigsTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateTaxonomyConfigsTest.php
index 06a94e8..c967cec 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateTaxonomyConfigsTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateTaxonomyConfigsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Upgrade\MigrateTaxonomyConfigsTest.
+ * Contains \Drupal\migrate_drupal\Tests\MigrateTaxonomyConfigsTest.
  */
 
 namespace Drupal\migrate_drupal\Tests;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateTextConfigsTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateTextConfigsTest.php
index 83b2755..a5fd400 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateTextConfigsTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateTextConfigsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Upgrade\MigrateTextConfigsTest.
+ * Contains Drupal\migrate_drupal\Tests\MigrateTextConfigsTest.
  */
 
 namespace Drupal\migrate_drupal\Tests;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateUpdateConfigsTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateUpdateConfigsTest.php
index 1a25da7..d38eada 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateUpdateConfigsTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateUpdateConfigsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Upgrade\MigrateUpdateConfigsTest.
+ * Contains \Drupal\migrate_drupal\Tests\MigrateUpdateConfigsTest.
  */
 
 namespace Drupal\migrate_drupal\Tests;
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateUserConfigsTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateUserConfigsTest.php
index 1bceee7..1834e32 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateUserConfigsTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateUserConfigsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Upgrade\MigrateUserConfigsTest.
+ * Contains \Drupal\migrate_drupal\Tests\MigrateUserConfigsTest.
  */
 
 namespace Drupal\migrate_drupal\Tests;