diff --git a/core/lib/Drupal/Core/Cache/Context/AccountPermissionsCacheContext.php b/core/lib/Drupal/Core/Cache/Context/AccountPermissionsCacheContext.php
index 7afce73..5993424 100644
--- a/core/lib/Drupal/Core/Cache/Context/AccountPermissionsCacheContext.php
+++ b/core/lib/Drupal/Core/Cache/Context/AccountPermissionsCacheContext.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Cache\Context\UserRolesCacheContext.
+ * Contains \Drupal\Core\Cache\Context\AccountPermissionsCacheContext.
  */
 
 namespace Drupal\Core\Cache\Context;
diff --git a/core/lib/Drupal/Core/Cache/Context/CalculatedCacheContextInterface.php b/core/lib/Drupal/Core/Cache/Context/CalculatedCacheContextInterface.php
index 4242109..bb2f291 100644
--- a/core/lib/Drupal/Core/Cache/Context/CalculatedCacheContextInterface.php
+++ b/core/lib/Drupal/Core/Cache/Context/CalculatedCacheContextInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Cache\Context\CacheContextInterface.
+ * Contains \Drupal\Core\Cache\Context\CalculatedCacheContextInterface.
  */
 
 namespace Drupal\Core\Cache\Context;
diff --git a/core/lib/Drupal/Core/Cache/Context/ThemeCacheContext.php b/core/lib/Drupal/Core/Cache/Context/ThemeCacheContext.php
index 5f478ec..85ba1a7 100644
--- a/core/lib/Drupal/Core/Cache/Context/ThemeCacheContext.php
+++ b/core/lib/Drupal/Core/Cache/Context/ThemeCacheContext.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Cache\Context\LanguageCacheContext.
+ * Contains \Drupal\Core\Cache\Context\ThemeCacheContext.
  */
 
 namespace Drupal\Core\Cache\Context;
diff --git a/core/modules/dblog/src/Tests/ConnectionFailureTest.php b/core/modules/dblog/src/Tests/ConnectionFailureTest.php
index 9d7cec9..3f0c3e8 100644
--- a/core/modules/dblog/src/Tests/ConnectionFailureTest.php
+++ b/core/modules/dblog/src/Tests/ConnectionFailureTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of \Drupal\dblog\Tests\ConnectionFailureTest.
+ * Contains \Drupal\dblog\Tests\ConnectionFailureTest.
  */
 
 namespace Drupal\dblog\Tests;
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/CommentSourceWithHighWaterTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/CommentSourceWithHighWaterTest.php
new file mode 100644
index 0000000..26a7e51
--- /dev/null
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/CommentSourceWithHighWaterTest.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\CommentSourceWithHighWaterTest.
+ */
+
+namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+
+/**
+ * Tests the Drupal 6 comment source w/ high water handling.
+ *
+ * @group migrate_drupal
+ */
+class CommentSourceWithHighWaterTest extends CommentTestBase {
+
+  const ORIGINAL_HIGH_WATER = 1382255613;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    $this->migrationConfiguration['highWaterProperty']['field'] = 'timestamp';
+    array_shift($this->expectedResults);
+    parent::setUp();
+  }
+
+}
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/UserTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/UserTest.php
index 17d1e96..36d4b67 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/UserTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/UserTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\CommentTest.
+ * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\UserTest.
  */
 
 namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
diff --git a/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php b/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php
index b4f5a2d..99a32b3 100644
--- a/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\Core\Cache\CacheContextsTest.
+ * Contains \Drupal\Tests\Core\Cache\Context\CacheContextsManagerTest.
  */
 
 namespace Drupal\Tests\Core\Cache\Context;