diff --git a/modules/aggregator/aggregator.test b/modules/aggregator/aggregator.test
index f595761133d85fa0659b256dd3c896f1d37bb314..e8e4f0875730d323600ed26a4a387acf33666b40 100644
--- a/modules/aggregator/aggregator.test
+++ b/modules/aggregator/aggregator.test
@@ -4,9 +4,6 @@
 class AggregatorTestCase extends DrupalWebTestCase {
   private static $prefix = 'simpletest_aggregator_';
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     parent::setUp('aggregator');
     $web_user = $this->drupalCreateUser(array('administer news feeds', 'access news feeds'));
@@ -229,9 +226,6 @@ EOT;
 }
 
 class AddFeedTestCase extends AggregatorTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Add feed functionality'),
@@ -261,9 +255,6 @@ class AddFeedTestCase extends AggregatorTestCase {
 }
 
 class UpdateFeedTestCase extends AggregatorTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Update feed functionality'),
@@ -306,9 +297,6 @@ class UpdateFeedTestCase extends AggregatorTestCase {
 }
 
 class RemoveFeedTestCase extends AggregatorTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Remove feed functionality'),
@@ -337,9 +325,6 @@ class RemoveFeedTestCase extends AggregatorTestCase {
 }
 
 class UpdateFeedItemTestCase extends AggregatorTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Update feed item functionality'),
@@ -398,9 +383,6 @@ class UpdateFeedItemTestCase extends AggregatorTestCase {
 }
 
 class RemoveFeedItemTestCase extends AggregatorTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Remove feed item functionality'),
@@ -428,9 +410,7 @@ class RemoveFeedItemTestCase extends AggregatorTestCase {
 
 class CategorizeFeedItemTestCase extends AggregatorTestCase {
   private static $prefix = 'simpletest_aggregator_';
-  /**
-   * Implementation of getInfo().
-   */
+
   function getInfo() {
     return array(
       'name' => t('Categorize feed item functionality'),
@@ -482,9 +462,6 @@ class CategorizeFeedItemTestCase extends AggregatorTestCase {
 class ImportOPMLTestCase extends AggregatorTestCase {
   private static $prefix = 'simpletest_aggregator_';
 
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Import feeds from OPML functionality'),
diff --git a/modules/block/block.test b/modules/block/block.test
index c54e132130f8ed2d9ca60bc736b89385f6656d97..0a203338c8ada56556266320e199099828bc2813 100644
--- a/modules/block/block.test
+++ b/modules/block/block.test
@@ -2,9 +2,6 @@
 // $Id$
 
 class BlockTestCase extends DrupalWebTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Block functionality'),
@@ -13,9 +10,6 @@ class BlockTestCase extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     parent::setUp();
 
@@ -134,9 +128,6 @@ class BlockTestCase extends DrupalWebTestCase {
 }
 
 class NonDefaultBlockAdmin extends DrupalWebTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Non default theme admin'),
diff --git a/modules/blog/blog.test b/modules/blog/blog.test
index f4cc5285ace05a1b447108225611710d2ee1112c..5086e001b19c38d52eb0439bd28fe0d0ca546475 100644
--- a/modules/blog/blog.test
+++ b/modules/blog/blog.test
@@ -6,9 +6,6 @@ class BlogTestCase extends DrupalWebTestCase {
   protected $own_user;
   protected $any_user;
 
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Blog functionality'),
diff --git a/modules/blogapi/blogapi.test b/modules/blogapi/blogapi.test
index eb77f50612cd6c98d4cbf84cf85ce7d6c6d365b3..f0156ce16692de05eb21d4f884480570fffd37e2 100644
--- a/modules/blogapi/blogapi.test
+++ b/modules/blogapi/blogapi.test
@@ -2,9 +2,6 @@
 // $Id$
 
 class BlogAPITestCase extends DrupalWebTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Blog API functionality'),
@@ -13,9 +10,6 @@ class BlogAPITestCase extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     parent::setUp('blog', 'blogapi', 'taxonomy');
   }
diff --git a/modules/book/book.test b/modules/book/book.test
index c041f9be227d7f40fda955ba35f77c88de78c19a..5843957fd20d247a9b449323dd82453ecff967fe 100644
--- a/modules/book/book.test
+++ b/modules/book/book.test
@@ -4,9 +4,6 @@
 class BookTestCase extends DrupalWebTestCase {
   protected $book;
 
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Book functionality'),
@@ -15,9 +12,6 @@ class BookTestCase extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     parent::setUp('book');
   }
diff --git a/modules/comment/comment.test b/modules/comment/comment.test
index a552adc011fed602a45c46cd421f7d98404504b2..98e425244d810607dba69eb3c0c93ea80dd94360 100644
--- a/modules/comment/comment.test
+++ b/modules/comment/comment.test
@@ -6,9 +6,6 @@ class CommentHelperCase extends DrupalWebTestCase {
   protected $web_user;
   protected $node;
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     parent::setUp('comment');
     // Create users.
@@ -230,10 +227,6 @@ class CommentHelperCase extends DrupalWebTestCase {
 }
 
 class CommentInterfaceTest extends CommentHelperCase {
-
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Comment interface'),
@@ -348,10 +341,6 @@ class CommentInterfaceTest extends CommentHelperCase {
 }
 
 class CommentNodePage extends CommentHelperCase {
-
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Comment on a node page'),
@@ -384,10 +373,6 @@ class CommentNodePage extends CommentHelperCase {
 }
 
 class CommentAnonymous extends CommentHelperCase {
-
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Comment on a node page'),
@@ -484,10 +469,6 @@ class CommentAnonymous extends CommentHelperCase {
 }
 
 class CommentApprovalTest extends CommentHelperCase {
-
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Comment approval'),
diff --git a/modules/contact/contact.test b/modules/contact/contact.test
index f6e570eca372608b0c9d413ba1f3e1c335eb2f9d..b99f9030ccb53ecb95cf73cb73e122496efed583 100644
--- a/modules/contact/contact.test
+++ b/modules/contact/contact.test
@@ -5,10 +5,6 @@
  * Test the sitewide contact form.
  */
 class ContactSitewideTestCase extends DrupalWebTestCase {
-
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Site-wide contact form'),
@@ -17,9 +13,6 @@ class ContactSitewideTestCase extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     parent::setUp('contact');
   }
@@ -263,10 +256,6 @@ class ContactSitewideTestCase extends DrupalWebTestCase {
  * Test the personal contact form.
  */
 class ContactPersonalTestCase extends DrupalWebTestCase {
-
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Personal contact form'),
@@ -275,9 +264,6 @@ class ContactPersonalTestCase extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     parent::setUp('contact');
   }
diff --git a/modules/dblog/dblog.test b/modules/dblog/dblog.test
index ef473017646aa562e2b27458fe2b1d9afec7afa6..c95ae6552914203cd64575458575662501924dd9 100644
--- a/modules/dblog/dblog.test
+++ b/modules/dblog/dblog.test
@@ -5,9 +5,6 @@ class DBLogTestCase extends DrupalWebTestCase {
   protected $big_user;
   protected $any_user;
 
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('DBLog functionality'),
diff --git a/modules/filter/filter.test b/modules/filter/filter.test
index cd6dc1a7e6a33105072f4e0249280e6d31a87f86..5a0883ad39bcec4e2d6ba6527d21d37e587c6881 100644
--- a/modules/filter/filter.test
+++ b/modules/filter/filter.test
@@ -2,9 +2,6 @@
 // $Id$
 
 class FilterAdminTestCase extends DrupalWebTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Filter administration functionality'),
@@ -184,9 +181,6 @@ class FilterAdminTestCase extends DrupalWebTestCase {
 class FilterTestCase extends DrupalWebTestCase {
   protected $format;
 
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Core filters'),
@@ -195,9 +189,6 @@ class FilterTestCase extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     parent::setUp();
 
diff --git a/modules/forum/forum.test b/modules/forum/forum.test
index 2dfb55f7bdecd22877ad128bf47df83135cd862c..4aaf18cad5fa154007a7ea1e80c185af0deb32b4 100644
--- a/modules/forum/forum.test
+++ b/modules/forum/forum.test
@@ -11,9 +11,6 @@ class ForumTestCase extends DrupalWebTestCase {
   protected $root_forum;
   protected $nids;
 
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Forum functionality'),
diff --git a/modules/help/help.test b/modules/help/help.test
index 4cc79c46fe05f64ee73059cb65d9b1b6835fbb45..0a988d6c9ef4946028ca084225c56dc078d1a226 100644
--- a/modules/help/help.test
+++ b/modules/help/help.test
@@ -5,9 +5,6 @@ class HelpTestCase extends DrupalWebTestCase {
   protected $big_user;
   protected $any_user;
 
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Help functionality'),
diff --git a/modules/locale/locale.test b/modules/locale/locale.test
index 3daf79f5ee1a575de787e279bd34b24f37d15ea9..45a014755e53f59ef2f1eaeb42d44a91e4d3a32b 100644
--- a/modules/locale/locale.test
+++ b/modules/locale/locale.test
@@ -2,9 +2,6 @@
 // $Id$
 
 class LocaleTestCase extends DrupalWebTestCase {
-  /**
-   * Implementation of getInfo() for information
-   */
   function getInfo() {
     return array(
       'name' => t('String translate'),
@@ -119,7 +116,6 @@ class LocaleTestCase extends DrupalWebTestCase {
  * Functional tests for the import of translation files.
  */
 class LocaleImportFunctionalTest extends DrupalWebTestCase {
-
   function getInfo() {
     return array(
       'name' => t('Translation import'),
diff --git a/modules/menu/menu.test b/modules/menu/menu.test
index 68d79964e363d836459a0056f7744d41a365e78b..bd453a097c1a8c9a3778cff7bd64b0cb1cfe8ce4 100644
--- a/modules/menu/menu.test
+++ b/modules/menu/menu.test
@@ -7,9 +7,6 @@ class MenuTestCase extends DrupalWebTestCase {
   protected $menu;
   protected $items;
 
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Menu item creation/deletion'),
@@ -18,9 +15,6 @@ class MenuTestCase extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     parent::setUp('menu');
     // Create users.
diff --git a/modules/node/node.test b/modules/node/node.test
index 13753ea53c3a37e1ee6d54f2470276e6890180cf..546e9915192e81f9863c3a9ad20d3ae5ec42f2bf 100644
--- a/modules/node/node.test
+++ b/modules/node/node.test
@@ -5,9 +5,6 @@ class NodeRevisionsTestCase extends DrupalWebTestCase {
   protected $nodes;
   protected $logs;
 
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Node revisions'),
@@ -16,9 +13,6 @@ class NodeRevisionsTestCase extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     parent::setUp();
 
@@ -93,9 +87,6 @@ class NodeRevisionsTestCase extends DrupalWebTestCase {
 }
 
 class NodeTeaserTestCase extends DrupalWebTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Node teaser'),
@@ -241,9 +232,6 @@ class NodeTeaserTestCase extends DrupalWebTestCase {
 }
 
 class PageEditTestCase extends DrupalWebTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Node edit'),
@@ -252,9 +240,6 @@ class PageEditTestCase extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     parent::setUp();
 
@@ -301,9 +286,6 @@ class PageEditTestCase extends DrupalWebTestCase {
 }
 
 class PagePreviewTestCase extends DrupalWebTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Node preview'),
@@ -312,9 +294,6 @@ class PagePreviewTestCase extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     parent::setUp();
 
@@ -344,9 +323,6 @@ class PagePreviewTestCase extends DrupalWebTestCase {
 }
 
 class PageCreationTestCase extends DrupalWebTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Node creation'),
@@ -355,9 +331,6 @@ class PageCreationTestCase extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     parent::setUp();
 
@@ -385,9 +358,6 @@ class PageCreationTestCase extends DrupalWebTestCase {
 }
 
 class PageViewTestCase extends DrupalWebTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Node edit permissions'),
@@ -427,9 +397,6 @@ class PageViewTestCase extends DrupalWebTestCase {
 }
 
 class NodeTitleXSSTestCase extends DrupalWebTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
      return array(
       'name' => t('Node title XSS filtering'),
diff --git a/modules/php/php.test b/modules/php/php.test
index e51e14497bc4f93a1599cbdcd622da9342aa276a..6ee4f3a5964487861014597afa10acf1b2ec2e08 100644
--- a/modules/php/php.test
+++ b/modules/php/php.test
@@ -5,10 +5,6 @@
  * Base PHP test case class.
  */
 class PHPTestCase extends DrupalWebTestCase {
-
-  /**
-   * Implementation of getInfo().
-   */
   function setUp() {
     parent::setUp('php');
 
@@ -41,9 +37,6 @@ class PHPTestCase extends DrupalWebTestCase {
  * Tests to make sure the PHP filter actually evaluates PHP code when used.
  */
 class PHPFilterTestCase extends PHPTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('PHP filter functionality'),
@@ -87,9 +80,6 @@ class PHPFilterTestCase extends PHPTestCase {
  * Tests to make sure access to the PHP filter is properly restricted.
  */
 class PHPAccessTestCase extends PHPTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('PHP filter access check'),
diff --git a/modules/poll/poll.test b/modules/poll/poll.test
index 6c190a4e3b879c7ad121e876035e42730e427cfa..0806d4720b36f626b13b9b6c8d0ed2ca28d37e45 100644
--- a/modules/poll/poll.test
+++ b/modules/poll/poll.test
@@ -74,10 +74,6 @@ class PollTestCase extends DrupalWebTestCase {
 }
 
 class PollCreateTestCase extends PollTestCase {
-
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array('name' => t('Poll create'), 'description' => 'Adds "more choices", previews and creates a poll.', 'group' => t('Poll'));
   }
@@ -94,9 +90,6 @@ class PollCreateTestCase extends PollTestCase {
 }
 
 class PollVoteTestCase extends PollTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array('name' => t('Poll vote'), 'description' => 'Vote on a poll', 'group' => t('Poll'));
   }
diff --git a/modules/profile/profile.test b/modules/profile/profile.test
index 485b79336ed5873ee736820921037035716bf2a9..4ffa921309c7dd8abd6aa288b1f4b24f8951c01f 100644
--- a/modules/profile/profile.test
+++ b/modules/profile/profile.test
@@ -114,9 +114,6 @@ class ProfileTestCase extends DrupalWebTestCase {
 }
 
 class ProfileTestFields extends ProfileTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => 'Test single fields',
@@ -150,10 +147,6 @@ class ProfileTestFields extends ProfileTestCase {
 }
 
 class ProfileTestSelect extends ProfileTestCase {
-
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => 'Test select field',
@@ -179,10 +172,6 @@ class ProfileTestSelect extends ProfileTestCase {
 }
 
 class ProfileTestDate extends ProfileTestCase {
-
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => 'Test date field',
@@ -219,10 +208,6 @@ class ProfileTestDate extends ProfileTestCase {
 }
 
 class ProfileTestWeights extends ProfileTestCase {
-
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => 'Test field weights',
@@ -252,10 +237,6 @@ class ProfileTestWeights extends ProfileTestCase {
  * Test profile field autocompletion and access.
  */
 class ProfileTestAutocomplete extends ProfileTestCase {
-
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Autocompletion'),
diff --git a/modules/search/search.test b/modules/search/search.test
index cf3081df3e96aaab34410cdc0c90997da9c0f312..849964dbcaf8c25c9024d7de95f0480010485180 100644
--- a/modules/search/search.test
+++ b/modules/search/search.test
@@ -4,9 +4,6 @@
 define('SEARCH_TYPE', '_test_');
 
 class SearchMatchTestCase extends DrupalWebTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Search engine queries'),
@@ -163,9 +160,7 @@ class SearchMatchTestCase extends DrupalWebTestCase {
 
 class SearchBikeShed extends DrupalWebTestCase {
   protected $searching_user;
-  /**
-   * Implementation of getInfo().
-   */
+
   function getInfo() {
     return array(
       'name' => t('Bike shed'),
@@ -174,9 +169,6 @@ class SearchBikeShed extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     parent::setUp('search');
 
@@ -199,9 +191,6 @@ class SearchBikeShed extends DrupalWebTestCase {
 class SearchAdvancedSearchForm extends DrupalWebTestCase {
   protected $node;
 
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Advanced search form'),
@@ -210,9 +199,6 @@ class SearchAdvancedSearchForm extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     parent::setUp('search');
     // Create and login user.
@@ -266,9 +252,6 @@ class SearchAdvancedSearchForm extends DrupalWebTestCase {
 }
 
 class SearchRankingTestCase extends DrupalWebTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Search engine ranking'),
diff --git a/modules/simpletest/simpletest.test b/modules/simpletest/simpletest.test
index e319d3334138f209af7e3931eec804fda3ea26ba..19278f23c3a7b06cecdbeaa804e207ce6ccd0611 100644
--- a/modules/simpletest/simpletest.test
+++ b/modules/simpletest/simpletest.test
@@ -13,9 +13,6 @@ class SimpleTestTestCase extends DrupalWebTestCase {
    */
   protected $test_ids = array();
 
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('SimpleTest functionality'),
@@ -27,9 +24,6 @@ class SimpleTestTestCase extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     if (!$this->inCURL()) {
       parent::setUp('simpletest');
diff --git a/modules/simpletest/tests/actions.test b/modules/simpletest/tests/actions.test
index 68b7a1b98b1bffeb4ec52bd063b2562bc1ecf520..3965500ef8a7f7ab08a4333cb07db7bfccf606c3 100644
--- a/modules/simpletest/tests/actions.test
+++ b/modules/simpletest/tests/actions.test
@@ -2,9 +2,6 @@
 // $Id$
 
 class ActionsConfigurationTestCase extends DrupalWebTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Actions configuration'),
diff --git a/modules/simpletest/tests/cache.test b/modules/simpletest/tests/cache.test
index e082da3fdeefbeae1744386c770bf2e052a3bc99..61acfa8e6c8e35323206ea954b63f2b7e5154085 100644
--- a/modules/simpletest/tests/cache.test
+++ b/modules/simpletest/tests/cache.test
@@ -102,9 +102,6 @@ class CacheTestCase extends DrupalWebTestCase {
 }
 
 class CacheSavingCase extends CacheTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Cache saving test'),
@@ -166,9 +163,6 @@ class CacheSavingCase extends CacheTestCase {
 }
 
 class CacheClearCase extends CacheTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Cache clear test'),
@@ -177,9 +171,6 @@ class CacheClearCase extends CacheTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     $this->default_table = 'cache_page';
     $this->default_value = $this->randomName(10);
diff --git a/modules/simpletest/tests/common.test b/modules/simpletest/tests/common.test
index ec04641e13e0e79173e9b3b13afff2fb91e221fa..60b397ebf96ac9bb273018e3f680551d52db47d3 100644
--- a/modules/simpletest/tests/common.test
+++ b/modules/simpletest/tests/common.test
@@ -5,9 +5,6 @@ class CommonSizeTestCase extends DrupalWebTestCase {
   protected $exact_test_cases;
   protected $rounded_test_cases;
 
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Size parsing test'),
@@ -16,9 +13,6 @@ class CommonSizeTestCase extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     $kb = DRUPAL_KILOBYTE;
     $this->exact_test_cases = array(
@@ -115,9 +109,6 @@ class DrupalTagsHandlingTestCase extends DrupalWebTestCase {
     '"Drupal, although it rhymes with sloopal, is as awesome as a troopal!"' => 'Drupal, although it rhymes with sloopal, is as awesome as a troopal!',
   );
 
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Drupal tags handling'),
@@ -168,9 +159,6 @@ class DrupalTagsHandlingTestCase extends DrupalWebTestCase {
  * Test the Drupal CSS system.
  */
 class CascadingStylesheetsTestCase extends DrupalWebTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Cascading stylesheets'),
@@ -179,9 +167,6 @@ class CascadingStylesheetsTestCase extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     parent::setUp();
     // Reset drupal_add_css() before each test.
@@ -218,9 +203,6 @@ class CascadingStylesheetsTestCase extends DrupalWebTestCase {
  * Test drupal_http_request().
  */
 class DrupalHTTPRequestTestCase extends DrupalWebTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Drupal HTTP request'),
@@ -229,9 +211,6 @@ class DrupalHTTPRequestTestCase extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     parent::setUp('system_test');
   }
@@ -307,9 +286,6 @@ class DrupalHTTPRequestTestCase extends DrupalWebTestCase {
  * Testing drupal_set_content and drupal_get_content.
  */
 class DrupalSetContentTestCase extends DrupalWebTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Drupal set/get content'),
@@ -361,9 +337,6 @@ class JavaScriptTestCase extends DrupalWebTestCase {
    */
   var $preprocess_js = NULL;
 
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('JavaScript'),
@@ -372,9 +345,6 @@ class JavaScriptTestCase extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     // Enable Locale and SimpleTest in the test environment.
     parent::setUp('locale', 'simpletest');
@@ -387,9 +357,6 @@ class JavaScriptTestCase extends DrupalWebTestCase {
     drupal_add_js(NULL, NULL, TRUE);
   }
 
-  /**
-   * Implementation of tearDown().
-   */
   function tearDown() {
     // Restore configured value for JavaScript preprocessing.
     variable_set('preprocess_js', $this->preprocess_js);
diff --git a/modules/simpletest/tests/database_test.test b/modules/simpletest/tests/database_test.test
index 377baa2e3d7d7e3b89a6b0caca48f25ef0e1bd8b..88b5f36d2c127d6116f18204139311da02ff5462 100644
--- a/modules/simpletest/tests/database_test.test
+++ b/modules/simpletest/tests/database_test.test
@@ -1978,10 +1978,6 @@ class DatabaseLoggingTestCase extends DatabaseTestCase {
  * Range query tests.
  */
 class DatabaseRangeQueryTestCase extends DrupalWebTestCase {
-
-  /**
-   * Define metadata for this test subclass.
-   */
   function getInfo() {
     return array(
       'name' => t('Range query test'),
@@ -1990,9 +1986,6 @@ class DatabaseRangeQueryTestCase extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     parent::setUp('database_test');
   }
@@ -2016,10 +2009,6 @@ class DatabaseRangeQueryTestCase extends DrupalWebTestCase {
  * Temporary query tests.
  */
 class DatabaseTemporaryQueryTestCase extends DrupalWebTestCase {
-
-  /**
-   * Define metadata for this test subclass.
-   */
   function getInfo() {
     return array(
       'name' => t('Temporary query test'),
@@ -2028,9 +2017,6 @@ class DatabaseTemporaryQueryTestCase extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     parent::setUp('database_test');
   }
diff --git a/modules/simpletest/tests/file.test b/modules/simpletest/tests/file.test
index 5da57ee5a625d8443fabe11ddbe1914dcfe75956..d27718cb9bfb25fb986d76581615789713316d2c 100644
--- a/modules/simpletest/tests/file.test
+++ b/modules/simpletest/tests/file.test
@@ -98,9 +98,6 @@ class FileTestCase extends DrupalWebTestCase {
  * hooks.
  */
 class FileHookTestCase extends FileTestCase {
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     // Install file_test module
     parent::setUp('file_test');
@@ -137,9 +134,6 @@ class FileHookTestCase extends FileTestCase {
  *  This will run tests against the file validation functions (file_validate_*).
  */
 class FileValidatorTest extends DrupalWebTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('File validator tests'),
@@ -148,9 +142,6 @@ class FileValidatorTest extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     parent::setUp();
 
@@ -301,9 +292,6 @@ class FileValidatorTest extends DrupalWebTestCase {
  *  Tests the file_unmanaged_save_data() function.
  */
 class FileUnmanagedSaveDataTest extends FileTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Unmanaged file save data'),
@@ -338,9 +326,6 @@ class FileUnmanagedSaveDataTest extends FileTestCase {
  * Test the file_save_upload() function.
  */
 class FileSaveUploadTest extends FileHookTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('File uploading'),
@@ -377,9 +362,6 @@ class FileSaveUploadTest extends FileHookTestCase {
  * Directory related tests.
  */
 class FileDirectoryTest extends FileTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('File paths and directories'),
@@ -545,9 +527,6 @@ class FileDirectoryTest extends FileTestCase {
  * Tests the file_scan_directory() function.
  */
 class FileScanDirectoryTest extends FileTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('File scan directory'),
@@ -577,9 +556,6 @@ class FileScanDirectoryTest extends FileTestCase {
  * Deletion related tests.
  */
 class FileUnmanagedDeleteTest extends FileTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Unmanaged file delete'),
@@ -626,9 +602,6 @@ class FileUnmanagedDeleteTest extends FileTestCase {
  * Unmanaged move related tests.
  */
 class FileUnmanagedMoveTest extends FileTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Unmanaged file moving'),
@@ -701,9 +674,6 @@ class FileUnmanagedMoveTest extends FileTestCase {
  * Unmanaged copy related tests.
  */
 class FileUnmanagedCopyTest extends FileTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Unmanaged file copying'),
@@ -791,9 +761,6 @@ class FileUnmanagedCopyTest extends FileTestCase {
  * Deletion related tests.
  */
 class FileDeleteTest extends FileHookTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('File delete'),
@@ -826,9 +793,6 @@ class FileDeleteTest extends FileHookTestCase {
  * Move related tests
  */
 class FileMoveTest extends FileHookTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('File moving'),
@@ -862,9 +826,6 @@ class FileMoveTest extends FileHookTestCase {
  * Copy related tests.
  */
 class FileCopyTest extends FileHookTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('File copying'),
@@ -903,9 +864,6 @@ class FileCopyTest extends FileHookTestCase {
  * Tests the file_load() function.
  */
 class FileLoadTest extends FileHookTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('File loading'),
@@ -978,9 +936,6 @@ class FileLoadTest extends FileHookTestCase {
  * Tests the file_save() function.
  */
 class FileSaveTest extends FileHookTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('File saving'),
@@ -1030,9 +985,6 @@ class FileSaveTest extends FileHookTestCase {
  * Tests the file_validate() function..
  */
 class FileValidateTest extends FileHookTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('File validate'),
@@ -1072,9 +1024,6 @@ class FileValidateTest extends FileHookTestCase {
  *  Tests the file_save_data() function.
  */
 class FileSaveDataTest extends FileHookTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('File save data'),
diff --git a/modules/simpletest/tests/registry.test b/modules/simpletest/tests/registry.test
index 794403dac27ff7a92f9f90262583074210bb797a..82d33b51b4619140fd034771aedb9287487955ab 100644
--- a/modules/simpletest/tests/registry.test
+++ b/modules/simpletest/tests/registry.test
@@ -2,10 +2,6 @@
 // $Id$
 
 class RegistryParseFileTestCase extends DrupalWebTestCase {
-
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Registry parse file test'),
@@ -14,9 +10,6 @@ class RegistryParseFileTestCase extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     $this->fileName = 'registry_test_' . md5(rand());
     $this->functionName = 'registry_test_function' . md5(rand());
@@ -56,12 +49,8 @@ CONTENTS;
 }
 
 class RegistryParseFilesTestCase extends DrupalWebTestCase {
-
   protected $fileTypes = array('new', 'existing_changed');
 
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Registry parse files test'),
@@ -70,9 +59,6 @@ class RegistryParseFilesTestCase extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     parent::setUp();
     // Create files with some php to parse - one 'new', one 'existing' so
diff --git a/modules/simpletest/tests/session.test b/modules/simpletest/tests/session.test
index 751917f128b15ed14e8726f985517684e23266ff..4512d9cd489b18903babaae8d7a9544eaccf4cee 100644
--- a/modules/simpletest/tests/session.test
+++ b/modules/simpletest/tests/session.test
@@ -7,12 +7,8 @@
  */
 
 class SessionTestCase extends DrupalWebTestCase {
-
   protected $saved_cookie;
 
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Session tests'),
@@ -21,12 +17,10 @@ class SessionTestCase extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     parent::setUp('session_test');
   }
+
   /**
    * Implementation of curlHeaderCallback().
    */
diff --git a/modules/simpletest/tests/taxonomy_test.test b/modules/simpletest/tests/taxonomy_test.test
index 27dfe308be792d24e4fa6aaf235013bda7bb7cbf..9d51e328f5de1a8c66d89bcee5dc794f5a47f988 100644
--- a/modules/simpletest/tests/taxonomy_test.test
+++ b/modules/simpletest/tests/taxonomy_test.test
@@ -2,9 +2,6 @@
 // $Id$
 
 class TaxonomyHooksTestCase extends DrupalWebTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Taxonomy term hooks'),
@@ -13,9 +10,6 @@ class TaxonomyHooksTestCase extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     parent::setUp('taxonomy', 'taxonomy_test');
     $taxonomy_admin = $this->drupalCreateUser(array('administer taxonomy'));
diff --git a/modules/simpletest/tests/xmlrpc.test b/modules/simpletest/tests/xmlrpc.test
index db35c79ed7657ec39a2fdd0b2b6661b56b4965e9..814c65f8e20f010901213acf8706b61c26916acf 100644
--- a/modules/simpletest/tests/xmlrpc.test
+++ b/modules/simpletest/tests/xmlrpc.test
@@ -2,9 +2,6 @@
 // $Id$
 
 class XMLRPCValidator1IncTestCase extends DrupalWebTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name'  => t('XML-RPC validator'),
@@ -13,9 +10,6 @@ class XMLRPCValidator1IncTestCase extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     parent::setUp('xmlrpc_test');
   }
@@ -128,9 +122,6 @@ class XMLRPCValidator1IncTestCase extends DrupalWebTestCase {
 }
 
 class XMLRPCMessagesTestCase extends DrupalWebTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name'  => t('XML-RPC message'),
@@ -139,9 +130,6 @@ class XMLRPCMessagesTestCase extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     parent::setUp('xmlrpc_test');
   }
diff --git a/modules/statistics/statistics.test b/modules/statistics/statistics.test
index 5081343726f53d8e5e9efa95c96ca2a1cb500f2e..2f760210306d341bd908399584e4545d93f8849e 100644
--- a/modules/statistics/statistics.test
+++ b/modules/statistics/statistics.test
@@ -2,9 +2,6 @@
 // $Id$
 
 class StatisticsBlockVisitorsTestCase extends DrupalWebTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Top visitor blocking'),
@@ -13,9 +10,6 @@ class StatisticsBlockVisitorsTestCase extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     parent::setUp('statistics');
 
diff --git a/modules/syslog/syslog.test b/modules/syslog/syslog.test
index a9693d676e0dfd2d6c8d5b24621e710e37e1536b..61a7affda052835529e9690387b1acf1e8f862ae 100644
--- a/modules/syslog/syslog.test
+++ b/modules/syslog/syslog.test
@@ -2,9 +2,6 @@
 // $Id$
 
 class SyslogTestCase extends DrupalWebTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Syslog functionality'),
@@ -13,9 +10,6 @@ class SyslogTestCase extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     parent::setUp('syslog');
   }
diff --git a/modules/tracker/tracker.test b/modules/tracker/tracker.test
index 045191be16ce43988d15897b7d272e1815fdb3c6..e696d24a82d682e68363a183efd91e8a2daf790e 100644
--- a/modules/tracker/tracker.test
+++ b/modules/tracker/tracker.test
@@ -6,9 +6,6 @@ class TrackerTest extends DrupalWebTestCase {
   protected $other_user;
   protected $new_node;
 
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Tracker'),
@@ -17,9 +14,6 @@ class TrackerTest extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     parent::setUp('comment', 'tracker');
 
diff --git a/modules/translation/translation.test b/modules/translation/translation.test
index 6e92e420027a2e7b5dc00d345c4aa7196f3b0be0..e7a97790a60466d60dfac14027deb58660aa5ba3 100644
--- a/modules/translation/translation.test
+++ b/modules/translation/translation.test
@@ -4,9 +4,6 @@
 class TranslationTestCase extends DrupalWebTestCase {
   protected $book;
 
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Translation functionality'),
@@ -15,9 +12,6 @@ class TranslationTestCase extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     parent::setUp('locale', 'translation');
   }
diff --git a/modules/trigger/trigger.test b/modules/trigger/trigger.test
index 566d252d99146e07d5b2d848a859a755e3b29e49..fab53e5f4da105380a31896addd7b4f790bf5aa5 100644
--- a/modules/trigger/trigger.test
+++ b/modules/trigger/trigger.test
@@ -5,9 +5,6 @@ class TriggerContentTestCase extends DrupalWebTestCase {
   var $_cleanup_roles = array();
   var $_cleanup_users = array();
 
-  /**
-   * Implementation of getInfo() for information
-   */
   function getInfo() {
     return array(
       'name' => t('Trigger content (node) actions'),
diff --git a/modules/upload/upload.test b/modules/upload/upload.test
index c143e486dc05197d69a4d4726cea3b5436160cbf..1a343884417af697bb6c418b6d85f53a77deba8c 100644
--- a/modules/upload/upload.test
+++ b/modules/upload/upload.test
@@ -2,9 +2,6 @@
 // $Id$
 
 class UploadTestCase extends DrupalWebTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Upload functionality'),
diff --git a/modules/user/user.test b/modules/user/user.test
index 7bb2d915bd9b3f3470a173859f0a4293a7646a7f..981539b8787a45b4ce6640cc3a878277af8d9452 100644
--- a/modules/user/user.test
+++ b/modules/user/user.test
@@ -2,9 +2,6 @@
 // $Id$
 
 class UserRegistrationTestCase extends DrupalWebTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('User registration'),
@@ -104,9 +101,6 @@ class UserRegistrationTestCase extends DrupalWebTestCase {
 
 
 class UserValidationTestCase extends DrupalWebTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Username/e-mail validation'),
@@ -159,9 +153,6 @@ class UserValidationTestCase extends DrupalWebTestCase {
 
 
 class UserDeleteTestCase extends DrupalWebTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('User delete'),
@@ -422,9 +413,6 @@ class UserPermissionsTestCase extends DrupalWebTestCase {
   protected $admin_user;
   protected $rid;
 
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('Role permissions'),
@@ -472,9 +460,6 @@ class UserPermissionsTestCase extends DrupalWebTestCase {
 }
 
 class UserAdminTestCase extends DrupalWebTestCase {
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('User admininstration'),
@@ -588,10 +573,6 @@ class UserTimeZoneFunctionalTest extends DrupalWebTestCase {
  * Test user autocompletion.
  */
 class UserAutocompleteTestCase extends DrupalWebTestCase {
-
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
       'name' => t('User autocompletion'),
@@ -600,9 +581,6 @@ class UserAutocompleteTestCase extends DrupalWebTestCase {
     );
   }
 
-  /**
-   * Implementation of setUp().
-   */
   function setUp() {
     parent::setUp();
 
@@ -635,7 +613,6 @@ class UserAutocompleteTestCase extends DrupalWebTestCase {
  * Test user blocks.
  */
 class UserBlocksUnitTests extends DrupalWebTestCase {
-
   function getInfo() {
     return array(
       'name' => t('User blocks'),