diff --git a/mongodb_block_ui/src/Tests/BlockAdminThemeTest.php b/mongodb_block_ui/src/Tests/BlockAdminThemeTest.php
index 37f6c29..c1a9455 100644
--- a/mongodb_block_ui/src/Tests/BlockAdminThemeTest.php
+++ b/mongodb_block_ui/src/Tests/BlockAdminThemeTest.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Tests for the MongoDB block UI module
+ * Contains Drupal\mongodb_block_ui\Tests\BlockAdminThemeTest.
  */
 
 namespace Drupal\mongodb_block_ui\Tests;
 
 
 /**
- * Test the block system with admin themes.
+ * Test the MongoDB block UI with admin themes.
  */
 class BlockAdminThemeTest extends \DrupalWebTestCase {
   /**
diff --git a/mongodb_block_ui/src/Tests/BlockCacheTest.php b/mongodb_block_ui/src/Tests/BlockCacheTest.php
index 97b1420..4a34787 100644
--- a/mongodb_block_ui/src/Tests/BlockCacheTest.php
+++ b/mongodb_block_ui/src/Tests/BlockCacheTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Tests for the block module
+ * Contains \Drupal\mongodb_block_ui\Tests\BlockCacheTest.
  */
 
 namespace Drupal\mongodb_block_ui\Tests;
diff --git a/mongodb_block_ui/src/Tests/BlockTest.php b/mongodb_block_ui/src/Tests/BlockTest.php
index c3cbfcf..736864a 100644
--- a/mongodb_block_ui/src/Tests/BlockTest.php
+++ b/mongodb_block_ui/src/Tests/BlockTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Tests for the block module
+ * Contains \Drupal\mongodb_block_ui\Tests\BlockTest.
  */
 
 namespace Drupal\mongodb_block_ui\Tests;
diff --git a/mongodb_block_ui/src/Tests/NewDefaultThemeBlocksTest.php b/mongodb_block_ui/src/Tests/NewDefaultThemeBlocksTest.php
index 75c93e2..d16d8bb 100644
--- a/mongodb_block_ui/src/Tests/NewDefaultThemeBlocksTest.php
+++ b/mongodb_block_ui/src/Tests/NewDefaultThemeBlocksTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Tests for the block module
+ * Contains \Drupal\mongodb_block_ui\Tests\NewDefaultThemeBlocksTest.
  */
 
 namespace Drupal\mongodb_block_ui\Tests;
diff --git a/mongodb_block_ui/src/Tests/NonDefaultBlockAdminTest.php b/mongodb_block_ui/src/Tests/NonDefaultBlockAdminTest.php
index 6654acc..f6d1691 100644
--- a/mongodb_block_ui/src/Tests/NonDefaultBlockAdminTest.php
+++ b/mongodb_block_ui/src/Tests/NonDefaultBlockAdminTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Tests for the block module
+ * Contains \Drupal\mongodb_block_ui\Tests\NonDefaultBlockAdminTest.
  */
 
 namespace Drupal\mongodb_block_ui\Tests;
diff --git a/mongodb_cache/mongodb_cache_plugin.php b/mongodb_cache/mongodb_cache_plugin.php
index a9dc04d..4992ee1 100644
--- a/mongodb_cache/mongodb_cache_plugin.php
+++ b/mongodb_cache/mongodb_cache_plugin.php
@@ -2,9 +2,10 @@
 
 /**
  * @file
- * MongoDB cache backend.
+ * Contains \Drupal\mongodb_cache\Cache.
  *
- * Replaces the core cache backend file. See README.txt for details.
+ * This is the actual MongoDB cache backend. It replaces the core cache backend
+ * file. See README.md for details.
  */
 
 namespace Drupal\mongodb_cache;
diff --git a/mongodb_cache/src/Tests/CacheClearTest.php b/mongodb_cache/src/Tests/CacheClearTest.php
index 4259e89..c43c2d0 100644
--- a/mongodb_cache/src/Tests/CacheClearTest.php
+++ b/mongodb_cache/src/Tests/CacheClearTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Class CacheClearTest.
+ * Contains \Drupal\mongodb_cache\Tests\CacheClearTest.
  *
  * This test just wraps the core \CacheClearCase with a setUp()/tearDown()
  * sequence making it compatible with the MongoDB cache plugin.
diff --git a/mongodb_cache/src/Tests/CacheGetMultipleTest.php b/mongodb_cache/src/Tests/CacheGetMultipleTest.php
index a76296d..0a2a2d4 100644
--- a/mongodb_cache/src/Tests/CacheGetMultipleTest.php
+++ b/mongodb_cache/src/Tests/CacheGetMultipleTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Class CacheGetMultipleUnitTest.
+ * Contains \Drupal\mongodb_cache\Tests\CacheGetMultipleTest.
  */
 
 namespace Drupal\mongodb_cache\Tests;
diff --git a/mongodb_cache/src/Tests/CacheIsEmptyTest.php b/mongodb_cache/src/Tests/CacheIsEmptyTest.php
index c346a2d..2cca483 100644
--- a/mongodb_cache/src/Tests/CacheIsEmptyTest.php
+++ b/mongodb_cache/src/Tests/CacheIsEmptyTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Class CacheIsEmptyTest.
+ * Contains \Drupal\mongodb_cache\Tests\CacheIsEmptyTest.
  */
 
 namespace Drupal\mongodb_cache\Tests;
diff --git a/mongodb_cache/src/Tests/CacheSavingTest.php b/mongodb_cache/src/Tests/CacheSavingTest.php
index 7e57e50..5d88747 100644
--- a/mongodb_cache/src/Tests/CacheSavingTest.php
+++ b/mongodb_cache/src/Tests/CacheSavingTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Class CacheSavingTest.
+ * Contains \Drupal\mongodb_cache\Tests\CacheSavingTest.
  */
 
 namespace Drupal\mongodb_cache\Tests;
diff --git a/mongodb_cache/src/Tests/CacheTestTrait.php b/mongodb_cache/src/Tests/CacheTestTrait.php
index 2149ac7..8d19fc6 100644
--- a/mongodb_cache/src/Tests/CacheTestTrait.php
+++ b/mongodb_cache/src/Tests/CacheTestTrait.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains CacheTestTrait.
+ * Contains \Drupal\mongodb_cache\Tests\CacheTestTrait.
  */
 
 namespace Drupal\mongodb_cache\Tests;
diff --git a/mongodb_field_storage/mongodb_field_storage.test b/mongodb_field_storage/mongodb_field_storage.test
index 1953525..9d205cb 100644
--- a/mongodb_field_storage/mongodb_field_storage.test
+++ b/mongodb_field_storage/mongodb_field_storage.test
@@ -1,6 +1,11 @@
 <?php
 
 /**
+ * @file
+ * Contains \MongoDBFieldAttachStorageTestCase and \MongoDbEntityFieldQueryTestCase.
+ */
+
+/**
  * Execute all the Field storage unit test with MongoDB-based field storage.
  */
 class MongoDBFieldAttachStorageTestCase extends FieldAttachStorageTestCase {
diff --git a/mongodb_queue/mongodb_queue.inc b/mongodb_queue/mongodb_queue.inc
index 023543f..58b0135 100644
--- a/mongodb_queue/mongodb_queue.inc
+++ b/mongodb_queue/mongodb_queue.inc
@@ -2,7 +2,9 @@
 
 /**
  * @file
- * Queue functionality.
+ * Contains \MongoDBQueue.
+ *
+ * This is the MongoDB Queue API plugin.
  */
 
 class MongoDBQueue implements DrupalQueueInterface {
diff --git a/mongodb_session/mongodb_session.test b/mongodb_session/mongodb_session.test
index cfaa91c..8b2a5d2 100644
--- a/mongodb_session/mongodb_session.test
+++ b/mongodb_session/mongodb_session.test
@@ -1,7 +1,10 @@
 <?php
+
 /**
  * @file
- *   Test mongodb session implementation.
+ * Contains \MongoDBSessionTestCase and \MongoDBSessionHttpsTestCase.
+ *
+ * These tests cases cover the MongoDB session implementation.
  */
 
 /**
diff --git a/mongodb_watchdog/mongodb_watchdog.test b/mongodb_watchdog/mongodb_watchdog.test
index 7bcc299..f2ef9c5 100644
--- a/mongodb_watchdog/mongodb_watchdog.test
+++ b/mongodb_watchdog/mongodb_watchdog.test
@@ -1,7 +1,8 @@
 <?php
+
 /**
  * @file
- * Test class for MongoDB_watchdog.
+ * Contains \MongoDBLogTestCase.
  */
 
 /**