diff --git modules/aggregator/aggregator.test modules/aggregator/aggregator.test
index a8de3a7..6c2e943 100644
--- modules/aggregator/aggregator.test
+++ modules/aggregator/aggregator.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Creates tests for aggregator module.
+ * Tests for aggregator.module.
  */
 
 class AggregatorTestCase extends DrupalWebTestCase {
diff --git modules/block/block.test modules/block/block.test
index ce0ff80..cb614de 100644
--- modules/block/block.test
+++ modules/block/block.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Tests for the block module
+ * Tests for block.module.
  */
 
 class BlockTestCase extends DrupalWebTestCase {
diff --git modules/blog/blog.test modules/blog/blog.test
index 574e379..bd67ee8 100644
--- modules/blog/blog.test
+++ modules/blog/blog.test
@@ -1,6 +1,11 @@
 <?php
 // $Id: blog.test,v 1.30 2010/08/30 00:22:03 webchick Exp $
 
+/**
+ * @file
+ * Tests for blog.module.
+ */
+
 class BlogTestCase extends DrupalWebTestCase {
   protected $big_user;
   protected $own_user;
diff --git modules/book/book.test modules/book/book.test
index 62d547a..80478ec 100644
--- modules/book/book.test
+++ modules/book/book.test
@@ -1,6 +1,11 @@
 <?php
 // $Id: book.test,v 1.29 2011/01/28 08:04:59 webchick Exp $
 
+/**
+ * @file
+ * Tests for book.module.
+ */
+
 class BookTestCase extends DrupalWebTestCase {
   protected $book;
   // $book_author is a user with permission to create and edit books.
diff --git modules/comment/comment.test modules/comment/comment.test
index 8e3a92f..f78b791 100644
--- modules/comment/comment.test
+++ modules/comment/comment.test
@@ -1,6 +1,11 @@
 <?php
 // $Id: comment.test,v 1.98 2011/01/02 23:54:05 webchick Exp $
 
+/**
+ * @file 
+ * Tests for comment.module.
+ */
+
 class CommentHelperCase extends DrupalWebTestCase {
   protected $admin_user;
   protected $web_user;
diff --git modules/contact/contact.test modules/contact/contact.test
index b758a08..4d9a3e2 100644
--- modules/contact/contact.test
+++ modules/contact/contact.test
@@ -2,8 +2,10 @@
 // $Id: contact.test,v 1.45 2010/08/05 23:53:37 webchick Exp $
 
 /**
- * Test the sitewide contact form.
+ * @file 
+ * Tests for contact.module.
  */
+
 class ContactSitewideTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
diff --git modules/dashboard/dashboard.test modules/dashboard/dashboard.test
index e9b1283..02d9d6b 100644
--- modules/dashboard/dashboard.test
+++ modules/dashboard/dashboard.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Tests for the dashboard module.
+ * Tests for dashboard.module.
  */
 
 class DashboardBlocksTestCase extends DrupalWebTestCase {
diff --git modules/dblog/dblog.test modules/dblog/dblog.test
index 019f019..5dbd199 100644
--- modules/dblog/dblog.test
+++ modules/dblog/dblog.test
@@ -1,6 +1,11 @@
 <?php
 // $Id: dblog.test,v 1.40 2010/12/04 01:52:15 webchick Exp $
 
+/**
+ * @file
+ * Tests for dblog.module.
+ */
+
 class DBLogTestCase extends DrupalWebTestCase {
   protected $big_user;
   protected $any_user;
diff --git modules/field/modules/field_sql_storage/field_sql_storage.test modules/field/modules/field_sql_storage/field_sql_storage.test
index e5d6262..b8ba4db 100644
--- modules/field/modules/field_sql_storage/field_sql_storage.test
+++ modules/field/modules/field_sql_storage/field_sql_storage.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Unit tests for field_sql_ storage.module
+ * Tests for field_sql_storage.module.
  *
  * Field_sql_storage.module implements the default back-end storage plugin
  * for the Field Strage API.
diff --git modules/field/modules/list/tests/list.test modules/field/modules/list/tests/list.test
index 208b60f..9aabb64 100644
--- modules/field/modules/list/tests/list.test
+++ modules/field/modules/list/tests/list.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Tests for the 'List' field types.
+ * Tests for list.module.
  */
 
 /**
diff --git modules/field/modules/number/number.test modules/field/modules/number/number.test
index 21a4c94..6f1cc23 100644
--- modules/field/modules/number/number.test
+++ modules/field/modules/number/number.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Tests for number field types.
+ * Tests for number.module.
  */
 
 /**
diff --git modules/field/modules/options/options.test modules/field/modules/options/options.test
index e94f4c0..2798995 100644
--- modules/field/modules/options/options.test
+++ modules/field/modules/options/options.test
@@ -1,6 +1,11 @@
 <?php
 // $Id: options.test,v 1.23 2010/12/18 00:50:03 dries Exp $
 
+/**
+ * @file 
+ * Tests for options.module.
+ */
+
 class OptionsWidgetsTestCase extends FieldTestCase {
   public static function getInfo() {
     return array(
diff --git modules/field/modules/text/text.test modules/field/modules/text/text.test
index a2003ee..02752e4 100644
--- modules/field/modules/text/text.test
+++ modules/field/modules/text/text.test
@@ -1,6 +1,11 @@
 <?php
 // $Id: text.test,v 1.32 2010/10/25 15:51:21 webchick Exp $
 
+/**
+ * @file
+ * Tests for text.module.
+ */
+
 class TextFieldTestCase extends DrupalWebTestCase {
   protected $instance;
   protected $admin_user;
diff --git modules/field/tests/field.test modules/field/tests/field.test
index 2cbab81..14e253a 100644
--- modules/field/tests/field.test
+++ modules/field/tests/field.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Unit test file for fields in core.
+ * Tests for field.module.
  */
 
 /**
diff --git modules/field_ui/field_ui.test modules/field_ui/field_ui.test
index 1f1b43f..7953968 100644
--- modules/field_ui/field_ui.test
+++ modules/field_ui/field_ui.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Unit test file for fields in core UI.
+ * Tests for field_ui.module.
  */
 
 /**
diff --git modules/file/tests/file.test modules/file/tests/file.test
index 6291197..33d8772 100644
--- modules/file/tests/file.test
+++ modules/file/tests/file.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Tests file uploading through the File module.
+ * Tests for file.module.
  */
 
 /**
diff --git modules/filter/filter.test modules/filter/filter.test
index 42256bd..469b396 100644
--- modules/filter/filter.test
+++ modules/filter/filter.test
@@ -2,6 +2,11 @@
 // $Id: filter.test,v 1.83 2011/01/14 08:33:46 webchick Exp $
 
 /**
+ * @file
+ * Tests for filter.module.
+ */
+
+/**
  * Tests for text format and filter CRUD operations.
  */
 class FilterCRUDTestCase extends DrupalWebTestCase {
diff --git modules/forum/forum.test modules/forum/forum.test
index 119a7ab..fa93912 100644
--- modules/forum/forum.test
+++ modules/forum/forum.test
@@ -1,6 +1,11 @@
 <?php
 // $Id: forum.test,v 1.65 2010/09/28 02:30:31 dries Exp $
 
+/**
+ * @file
+ * Tests for forum.module.
+ */
+
 class ForumTestCase extends DrupalWebTestCase {
   protected $admin_user;
   protected $edit_own_topics_user;
diff --git modules/help/help.test modules/help/help.test
index 3725a1a..c216502 100644
--- modules/help/help.test
+++ modules/help/help.test
@@ -1,6 +1,11 @@
 <?php
 // $Id: help.test,v 1.22 2010/11/27 20:25:44 dries Exp $
 
+/**
+ * @file
+ * Tests for help.module.
+ */
+
 class HelpTestCase extends DrupalWebTestCase {
   protected $big_user;
   protected $any_user;
diff --git modules/image/image.test modules/image/image.test
index 42bd375..c8b81d5 100644
--- modules/image/image.test
+++ modules/image/image.test
@@ -3,10 +3,9 @@
 
 /**
  * @file
- * Image module tests.
+ * Tests for image.module.
  */
 
-
 /**
  * TODO: Test the following functions.
  *
diff --git modules/locale/locale.test modules/locale/locale.test
index f18ad41..1d66f95 100644
--- modules/locale/locale.test
+++ modules/locale/locale.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Tests for Locale module.
+ * Tests for locale.module.
  *
  * The test file includes:
  *  - a functional test for the language configuration forms;
diff --git modules/menu/menu.test modules/menu/menu.test
index a2c4ebd..86d9755 100644
--- modules/menu/menu.test
+++ modules/menu/menu.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Tests file for the menu module.
+ * Tests for menu.module.
  */
 
 class MenuTestCase extends DrupalWebTestCase {
diff --git modules/node/node.test modules/node/node.test
index 4c189a8..b2840df 100644
--- modules/node/node.test
+++ modules/node/node.test
@@ -2,6 +2,11 @@
 // $Id: node.test,v 1.106 2010/12/17 19:28:14 webchick Exp $
 
 /**
+ * @file
+ * Tests for node.module.
+ */
+
+/**
  * Test the node_load_multiple() function.
  */
 class NodeLoadMultipleUnitTest extends DrupalWebTestCase {
diff --git modules/openid/openid.test modules/openid/openid.test
index b0f88bb..f45a646 100644
--- modules/openid/openid.test
+++ modules/openid/openid.test
@@ -2,6 +2,11 @@
 // $Id: openid.test,v 1.32 2010/10/08 05:28:30 webchick Exp $
 
 /**
+ * @file
+ * Tests for openid.module.
+ */
+
+/**
  * Base class for OpenID tests.
  */
 abstract class OpenIDWebTestCase extends DrupalWebTestCase {
diff --git modules/path/path.test modules/path/path.test
index 9666466..6b02025 100644
--- modules/path/path.test
+++ modules/path/path.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Tests for the path module
+ * Tests for path.module.
  */
 
 class PathTestCase extends DrupalWebTestCase {
diff --git modules/php/php.test modules/php/php.test
index 24886c3..27d1f29 100644
--- modules/php/php.test
+++ modules/php/php.test
@@ -2,6 +2,11 @@
 // $Id: php.test,v 1.27 2010/11/29 06:38:51 webchick Exp $
 
 /**
+ * @file
+ * Tests for php.module.
+ */
+
+/**
  * Base PHP test case class.
  */
 class PHPTestCase extends DrupalWebTestCase {
diff --git modules/poll/poll.test modules/poll/poll.test
index a08090d..a0d5321 100644
--- modules/poll/poll.test
+++ modules/poll/poll.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Tests for the poll module.
+ * Tests for poll.module.
  */
 
 class PollTestCase extends DrupalWebTestCase {
diff --git modules/profile/profile.test modules/profile/profile.test
index 9542623..ba144a4 100644
--- modules/profile/profile.test
+++ modules/profile/profile.test
@@ -2,6 +2,11 @@
 // $Id: profile.test,v 1.30 2010/08/30 00:22:03 webchick Exp $
 
 /**
+ * @file
+ * Tests for profile.module.
+ */
+
+/**
  * A class for common methods for testing profile fields.
  */
 class ProfileTestCase extends DrupalWebTestCase {
diff --git modules/rdf/rdf.test modules/rdf/rdf.test
index 8a4a0f6..48ee919 100644
--- modules/rdf/rdf.test
+++ modules/rdf/rdf.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Tests for RDF functionality.
+ * Tests for rdf.module.
  */
 
 class RdfMappingHookTestCase extends DrupalWebTestCase {
diff --git modules/search/search.test modules/search/search.test
index c21d507..81fa112 100644
--- modules/search/search.test
+++ modules/search/search.test
@@ -1,6 +1,11 @@
 <?php
 // $Id: search.test,v 1.86 2011/01/04 05:31:09 webchick Exp $
 
+/**
+ * @file
+ * Tests for search.module.
+ */
+
 // The search index can contain different types of content. Typically the type is 'node'.
 // Here we test with _test_ and _test2_ as the type.
 define('SEARCH_TYPE', '_test_');
diff --git modules/shortcut/shortcut.test modules/shortcut/shortcut.test
index 458dfd6..3ff08ae 100644
--- modules/shortcut/shortcut.test
+++ modules/shortcut/shortcut.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Tests for the shortcut module.
+ * Tests for shortcut.module.
  */
 
 /**
diff --git modules/simpletest/simpletest.test modules/simpletest/simpletest.test
index 228199a..766c0e8 100644
--- modules/simpletest/simpletest.test
+++ modules/simpletest/simpletest.test
@@ -1,6 +1,11 @@
 <?php
 // $Id: simpletest.test,v 1.48 2010/11/12 03:06:52 dries Exp $
 
+/**
+ * @file
+ * Tests for simpletest.module.
+ */
+
 class SimpleTestFunctionalTest extends DrupalWebTestCase {
   /**
    * The results array that has been parsed by getTestResults().
diff --git modules/statistics/statistics.test modules/statistics/statistics.test
index d80e03b..b2126e3 100644
--- modules/statistics/statistics.test
+++ modules/statistics/statistics.test
@@ -2,6 +2,11 @@
 // $Id: statistics.test,v 1.24 2010/12/08 06:43:07 webchick Exp $
 
 /**
+ * @file
+ * Tests for statistics.module.
+ */
+
+/**
  * Sets up a base class for the Statistics module.
  */
 class StatisticsTestCase extends DrupalWebTestCase {
diff --git modules/syslog/syslog.test modules/syslog/syslog.test
index ec79420..18abf23 100644
--- modules/syslog/syslog.test
+++ modules/syslog/syslog.test
@@ -1,6 +1,11 @@
 <?php
 // $Id: syslog.test,v 1.14 2010/08/05 23:53:39 webchick Exp $
 
+/**
+ * @file
+ * Tests for syslog.module.
+ */
+
 class SyslogTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
diff --git modules/system/system.test modules/system/system.test
index 2043544..6d8d17d 100644
--- modules/system/system.test
+++ modules/system/system.test
@@ -2,6 +2,11 @@
 // $Id: system.test,v 1.153 2010/12/01 00:23:36 webchick Exp $
 
 /**
+ * @file
+ * Tests for system.module.
+ */
+
+/**
  * Helper class for module test cases.
  */
 class ModuleTestCase extends DrupalWebTestCase {
diff --git modules/taxonomy/taxonomy.test modules/taxonomy/taxonomy.test
index a561a40..9f2beea 100644
--- modules/taxonomy/taxonomy.test
+++ modules/taxonomy/taxonomy.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Tests for Taxonomy module.
+ * Tests for taxonomy.module.
  */
 
 /**
diff --git modules/tracker/tracker.test modules/tracker/tracker.test
index 6ff3712..493ce5f 100644
--- modules/tracker/tracker.test
+++ modules/tracker/tracker.test
@@ -1,6 +1,11 @@
 <?php
 // $Id: tracker.test,v 1.22 2010/12/28 18:39:23 webchick Exp $
 
+/**
+ * @file
+ * Tests for tracker.module.
+ */
+
 class TrackerTest extends DrupalWebTestCase {
   protected $user;
   protected $other_user;
diff --git modules/translation/translation.test modules/translation/translation.test
index d03acb5..d06fbd7 100644
--- modules/translation/translation.test
+++ modules/translation/translation.test
@@ -1,6 +1,11 @@
 <?php
 // $Id: translation.test,v 1.35 2010/12/31 20:45:25 webchick Exp $
 
+/**
+ * @file
+ * Tests for translation.module
+ */
+
 class TranslationTestCase extends DrupalWebTestCase {
   protected $book;
 
diff --git modules/trigger/trigger.test modules/trigger/trigger.test
index d3307d6..00efa8e 100644
--- modules/trigger/trigger.test
+++ modules/trigger/trigger.test
@@ -2,6 +2,11 @@
 // $Id: trigger.test,v 1.37 2010/10/05 06:17:29 webchick Exp $
 
 /**
+ * @file
+ * Tests for trigger.module.
+ */
+
+/**
  * Provides common helper methods.
  */
 class TriggerWebTestCase extends DrupalWebTestCase {
diff --git modules/update/update.test modules/update/update.test
index 6cb4491..af0d873 100644
--- modules/update/update.test
+++ modules/update/update.test
@@ -3,6 +3,8 @@
 
 /**
  * @file
+ * Tests for update.module.
+ *
  * This file contains tests for the update module. The overarching methodology
  * of these tests is we need to compare a given state of installed modules and
  * themes (e.g. version, project grouping, timestamps, etc) vs. a current
diff --git modules/user/user.test modules/user/user.test
index 7d89cd8..2ee2250 100644
--- modules/user/user.test
+++ modules/user/user.test
@@ -1,6 +1,11 @@
 <?php
 // $Id: user.test,v 1.112 2011/01/29 10:08:45 webchick Exp $
 
+/**
+ * @file
+ * Tests for user.module.
+ */
+
 class UserRegistrationTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(