diff --git a/modules/simpletest/tests/common.test b/modules/simpletest/tests/common.test
index 4664f04..e891c91 100644
--- a/modules/simpletest/tests/common.test
+++ b/modules/simpletest/tests/common.test
@@ -8,12 +8,12 @@
 /**
  * Tests for URL generation functions.
  */
-class DrupalAlterTestCase extends DrupalWebTestCase {
+class CommonDrupalAlterTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => 'drupal_alter() tests',
+      'name' => 'drupal_alter()',
       'description' => 'Confirm that alteration of arguments passed to drupal_alter() works correctly.',
-      'group' => 'System',
+      'group' => 'Common',
     );
   }
 
@@ -65,12 +65,12 @@ class DrupalAlterTestCase extends DrupalWebTestCase {
  * url() calls module_implements(), which may issue a db query, which requires
  * inheriting from a web test case rather than a unit test case.
  */
-class CommonURLUnitTest extends DrupalWebTestCase {
+class CommonURLTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'URL generation tests',
       'description' => 'Confirm that url(), drupal_get_query_parameters(), drupal_http_build_query(), and l() work correctly with various input.',
-      'group' => 'System',
+      'group' => 'Common',
     );
   }
 
@@ -347,13 +347,13 @@ class CommonURLUnitTest extends DrupalWebTestCase {
 /**
  * Tests for the check_plain() and filter_xss() functions.
  */
-class CommonXssUnitTest extends DrupalUnitTestCase {
+class CommonXssUnitTestCase extends DrupalUnitTestCase {
 
   public static function getInfo() {
     return array(
       'name' => 'String filtering tests',
       'description' => 'Confirm that check_plain(), filter_xss(), and check_url() work correctly, including invalid multi-byte sequences.',
-      'group' => 'System',
+      'group' => 'Common',
     );
   }
 
@@ -400,7 +400,7 @@ class CommonXssUnitTest extends DrupalUnitTestCase {
   }
 }
 
-class CommonSizeTestCase extends DrupalUnitTestCase {
+class CommonSizeUnitTestCase extends DrupalUnitTestCase {
   protected $exact_test_cases;
   protected $rounded_test_cases;
 
@@ -408,7 +408,7 @@ class CommonSizeTestCase extends DrupalUnitTestCase {
     return array(
       'name' => 'Size parsing test',
       'description' => 'Parse a predefined amount of bytes and compare the output with the expected value.',
-      'group' => 'System'
+      'group' => 'Common',
     );
   }
 
@@ -500,7 +500,7 @@ class CommonSizeTestCase extends DrupalUnitTestCase {
 /**
  * Test drupal_explode_tags() and drupal_implode_tags().
  */
-class DrupalTagsHandlingTestCase extends DrupalWebTestCase {
+class CommonAutocompleteTagsTestCase extends DrupalWebTestCase {
   var $validTags = array(
     'Drupal' => 'Drupal',
     'Drupal with some spaces' => 'Drupal with some spaces',
@@ -510,9 +510,9 @@ class DrupalTagsHandlingTestCase extends DrupalWebTestCase {
 
   public static function getInfo() {
     return array(
-      'name' => 'Drupal tags handling',
-      'description' => "Performs tests on Drupal's handling of tags, both explosion and implosion tactics used.",
-      'group' => 'System'
+      'name' => 'Autocomplete tags',
+      'description' => 'Tests handling of autocomplete tags; both explosion and implosion.',
+      'group' => 'Common',
     );
   }
 
@@ -557,12 +557,12 @@ class DrupalTagsHandlingTestCase extends DrupalWebTestCase {
 /**
  * Test the Drupal CSS system.
  */
-class CascadingStylesheetsTestCase extends DrupalWebTestCase {
+class CommonCascadingStylesheetsTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Cascading stylesheets',
       'description' => 'Tests adding various cascading stylesheets to the page.',
-      'group' => 'System',
+      'group' => 'Common',
     );
   }
 
@@ -789,12 +789,12 @@ class CascadingStylesheetsTestCase extends DrupalWebTestCase {
 /**
  * Test for cleaning HTML identifiers.
  */
-class DrupalHTMLIdentifierTestCase extends DrupalUnitTestCase {
+class CommonHTMLIdentifierTestCase extends DrupalUnitTestCase {
   public static function getInfo() {
     return array(
       'name' => 'HTML identifiers',
       'description' => 'Test the functions drupal_html_class(), drupal_html_id() and drupal_clean_css_identifier() for expected behavior',
-      'group' => 'System',
+      'group' => 'Common',
     );
   }
 
@@ -849,12 +849,12 @@ class DrupalHTMLIdentifierTestCase extends DrupalUnitTestCase {
 /**
  * CSS Unit Tests.
  */
-class CascadingStylesheetsUnitTest extends DrupalUnitTestCase {
+class CommonCascadingStylesheetsUnitTestCase extends DrupalUnitTestCase {
   public static function getInfo() {
     return array(
-      'name' => 'CSS Unit Tests',
+      'name' => 'CSS unit tests',
       'description' => 'Unit tests on CSS functions like aggregation.',
-      'group' => 'System',
+      'group' => 'Common',
     );
   }
 
@@ -901,12 +901,12 @@ class CascadingStylesheetsUnitTest extends DrupalUnitTestCase {
 /**
  * Test drupal_http_request().
  */
-class DrupalHTTPRequestTestCase extends DrupalWebTestCase {
+class CommonDrupalHTTPRequestTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => 'Drupal HTTP request',
-      'description' => "Performs tests on Drupal's HTTP request mechanism.",
-      'group' => 'System'
+      'name' => 'drupal_http_request()',
+      'description' => 'Tests drupal_http_request().',
+      'group' => 'Common',
     );
   }
 
@@ -1006,16 +1006,15 @@ class DrupalHTTPRequestTestCase extends DrupalWebTestCase {
 /**
  * Testing drupal_add_region_content and drupal_get_region_content.
  */
-class DrupalSetContentTestCase extends DrupalWebTestCase {
+class CommonRegionsTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => 'Drupal set/get regions',
-      'description' => 'Performs tests on setting and retrieiving content from theme regions.',
-      'group' => 'System'
+      'name' => 'Regions',
+      'description' => 'Tests setting and retrieving content from theme regions.',
+      'group' => 'Common',
     );
   }
 
-
   /**
    * Test setting and retrieving content for theme regions.
    */
@@ -1050,14 +1049,14 @@ class DrupalSetContentTestCase extends DrupalWebTestCase {
 }
 
 /**
- * Testing drupal_goto and hook_drupal_goto_alter().
+ * Testing drupal_goto() and hook_drupal_goto_alter().
  */
-class DrupalGotoTest extends DrupalWebTestCase {
+class CommonDrupalGotoTest extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => 'Drupal goto',
-      'description' => 'Performs tests on the drupal_goto function and hook_drupal_goto_alter',
-      'group' => 'System'
+      'name' => 'drupal_goto()',
+      'description' => 'Tests drupal_goto() and hook_drupal_goto_alter().',
+      'group' => 'Common',
     );
   }
 
@@ -1121,7 +1120,7 @@ class DrupalGotoTest extends DrupalWebTestCase {
 /**
  * Tests for the JavaScript system.
  */
-class JavaScriptTestCase extends DrupalWebTestCase {
+class CommonJavaScriptTestCase extends DrupalWebTestCase {
   /**
    * Store configured value for JavaScript preprocessing.
    */
@@ -1131,7 +1130,7 @@ class JavaScriptTestCase extends DrupalWebTestCase {
     return array(
       'name' => 'JavaScript',
       'description' => 'Tests the JavaScript system.',
-      'group' => 'System'
+      'group' => 'Common',
     );
   }
 
@@ -1456,12 +1455,12 @@ class JavaScriptTestCase extends DrupalWebTestCase {
 /**
  * Tests for drupal_render().
  */
-class DrupalRenderTestCase extends DrupalWebTestCase {
+class CommonDrupalRenderTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'drupal_render()',
       'description' => 'Performs functional tests on drupal_render().',
-      'group' => 'System',
+      'group' => 'Common',
     );
   }
 
@@ -1718,12 +1717,12 @@ class DrupalRenderTestCase extends DrupalWebTestCase {
 /**
  * Test for valid_url().
  */
-class ValidUrlTestCase extends DrupalUnitTestCase {
+class CommonValidUrlUnitTestCase extends DrupalUnitTestCase {
   public static function getInfo() {
     return array(
-      'name' => 'Valid Url',
-      'description' => "Performs tests on Drupal's valid url function.",
-      'group' => 'System'
+      'name' => 'valid_url()',
+      'description' => 'Tests valid_url().',
+      'group' => 'Common',
     );
   }
 
@@ -1824,14 +1823,14 @@ class ValidUrlTestCase extends DrupalUnitTestCase {
 }
 
 /**
- * Tests for CRUD API functions.
+ * Tests for drupal_write_record().
  */
-class DrupalDataApiTest extends DrupalWebTestCase {
+class CommonDrupalWriteRecordTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => 'Data API functions',
-      'description' => 'Tests the performance of CRUD APIs.',
-      'group' => 'System',
+      'name' => 'drupal_write_record()',
+      'description' => 'Tests drupal_write_record().',
+      'group' => 'Common',
     );
   }
 
@@ -2046,14 +2045,14 @@ class DrupalErrorCollectionUnitTest extends DrupalWebTestCase {
 }
 
 /**
- * Test the drupal_parse_info_file() API function.
+ * Test the drupal_parse_info_file() function.
  */
-class ParseInfoFilesTestCase extends DrupalWebTestCase {
+class CommonDrupalParseInfoFileTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => 'Parsing .info files',
-      'description' => 'Tests parsing .info files.',
-      'group' => 'System',
+      'name' => 'drupal_parse_info_file()',
+      'description' => 'Tests drupal_parse_info_file().',
+      'group' => 'Common',
     );
   }
 
@@ -2131,7 +2130,7 @@ class DrupalSystemListingTestCase extends DrupalWebTestCase {
 /**
  * Tests for the format_date() function.
  */
-class FormatDateUnitTest extends DrupalWebTestCase {
+class CommonFormatDateTestCase extends DrupalWebTestCase {
 
   /**
    * Arbitrary langcode for a custom language.
@@ -2140,9 +2139,9 @@ class FormatDateUnitTest extends DrupalWebTestCase {
 
   public static function getInfo() {
     return array(
-      'name' => 'Format date',
-      'description' => 'Test the format_date() function.',
-      'group' => 'System',
+      'name' => 'format_date()',
+      'description' => 'Test format_date().',
+      'group' => 'Common',
     );
   }
 
@@ -2245,14 +2244,14 @@ class FormatDateUnitTest extends DrupalWebTestCase {
 }
 
 /**
- * Tests for the format_date() function.
+ * Tests for drupal_attributes().
  */
-class DrupalAttributesUnitTest extends DrupalUnitTestCase {
+class CommonDrupalAttributesUnitTestCase extends DrupalUnitTestCase {
   public static function getInfo() {
     return array(
-      'name' => 'HTML Attributes',
-      'description' => 'Perform unit tests on the drupal_attributes() function.',
-      'group' => 'System',
+      'name' => 'drupal_attributes()',
+      'description' => 'Tests drupal_attributes().',
+      'group' => 'Common',
     );
   }
 
@@ -2287,12 +2286,12 @@ class DrupalAttributesUnitTest extends DrupalUnitTestCase {
 /**
  * Tests converting PHP variables to JSON strings and back.
  */
-class DrupalJSONTest extends DrupalUnitTestCase {
+class CommonJSONUnitTestCase extends DrupalUnitTestCase {
   public static function getInfo() {
     return array(
       'name' => 'JSON',
-      'description' => 'Perform unit tests on the drupal_json_encode() and drupal_json_decode() functions.',
-      'group' => 'System',
+      'description' => 'Unit tests for drupal_json_encode() and drupal_json_decode().',
+      'group' => 'Common',
     );
   }
 
@@ -2344,12 +2343,12 @@ class DrupalJSONTest extends DrupalUnitTestCase {
 /**
  * Tests for RDF namespaces XML serialization.
  */
-class DrupalGetRdfNamespacesTestCase extends DrupalWebTestCase {
+class CommonRdfNamespacesTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => 'RDF namespaces XML serialization tests',
-      'description' => 'Confirm that the serialization of RDF namespaces via drupal_get_rdf_namespaces() is output and parsed correctly in the XHTML document.',
-      'group' => 'System',
+      'name' => 'RDF namespaces',
+      'description' => 'Tests RDF namespace serialization via drupal_get_rdf_namespaces().',
+      'group' => 'Common',
     );
   }
 
diff --git a/modules/simpletest/tests/error.test b/modules/simpletest/tests/error.test
index b1ec4b3..bcdda1b 100644
--- a/modules/simpletest/tests/error.test
+++ b/modules/simpletest/tests/error.test
@@ -6,7 +6,7 @@
 class DrupalErrorHandlerUnitTest extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => 'Drupal error handlers',
+      'name' => 'Error handlers',
       'description' => 'Performs tests on the Drupal error and exception handler.',
       'group' => 'System',
     );
diff --git a/modules/simpletest/tests/filetransfer.test b/modules/simpletest/tests/filetransfer.test
index 905d23c..b8fa657 100644
--- a/modules/simpletest/tests/filetransfer.test
+++ b/modules/simpletest/tests/filetransfer.test
@@ -1,7 +1,7 @@
 <?php
 
 
-class FileTranferTest extends DrupalWebTestCase {
+class FileTransferTestCase extends DrupalWebTestCase {
   protected $hostname = 'localhost';
   protected $username = 'drupal';
   protected $password = 'password';
@@ -9,9 +9,9 @@ class FileTranferTest extends DrupalWebTestCase {
 
   public static function getInfo() {
     return array(
-      'name' => 'FileTransfer unit tests',
+      'name' => 'FileTransfer',
       'description' => 'Test that the jail is respected and that protocols using recursive file move operations work.',
-      'group' => 'System'
+      'group' => 'System',
     );
   }
 
diff --git a/modules/simpletest/tests/lock.test b/modules/simpletest/tests/lock.test
index 0b423ff..86ac087 100644
--- a/modules/simpletest/tests/lock.test
+++ b/modules/simpletest/tests/lock.test
@@ -3,11 +3,11 @@
 /**
  * Tests for the lock system.
  */
-class LockFunctionalTest extends DrupalWebTestCase {
+class LockTestCase extends DrupalWebTestCase {
 
   public static function getInfo() {
     return array(
-      'name' => 'Locking framework tests',
+      'name' => 'Locking framework',
       'description' => 'Confirm locking works between two separate requests.',
       'group' => 'System',
     );
diff --git a/modules/simpletest/tests/mail.test b/modules/simpletest/tests/mail.test
index 8a7b152..fa0ca3a 100644
--- a/modules/simpletest/tests/mail.test
+++ b/modules/simpletest/tests/mail.test
@@ -16,7 +16,7 @@ class MailTestCase extends DrupalWebTestCase implements MailSystemInterface {
     return array(
       'name' => 'Mail system',
       'description' => 'Performs tests on the pluggable mailing framework.',
-      'group' => 'System',
+      'group' => 'Mail',
     );
   }
 
diff --git a/modules/simpletest/tests/registry.test b/modules/simpletest/tests/registry.test
index bcd8d4e..b133696 100644
--- a/modules/simpletest/tests/registry.test
+++ b/modules/simpletest/tests/registry.test
@@ -1,11 +1,11 @@
 <?php
 
-class RegistryParseFileTestCase extends DrupalWebTestCase {
+class RegistryParseSingleFileTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => 'Registry parse file test',
+      'name' => 'Registry single file parsing',
       'description' => 'Parse a simple file and check that its resources are saved to the database.',
-      'group' => 'System'
+      'group' => 'System',
     );
   }
 
@@ -45,14 +45,14 @@ CONTENTS;
 
 }
 
-class RegistryParseFilesTestCase extends DrupalWebTestCase {
+class RegistryParseMultipleFilesTestCase extends DrupalWebTestCase {
   protected $fileTypes = array('new', 'existing_changed');
 
   public static function getInfo() {
     return array(
-      'name' => 'Registry parse files test',
+      'name' => 'Registry mutliple file parsing',
       'description' => 'Read two a simple files from disc, and check that their resources are saved to the database.',
-      'group' => 'System'
+      'group' => 'System',
     );
   }
 
diff --git a/modules/simpletest/tests/unicode.test b/modules/simpletest/tests/unicode.test
index 47a4938..442dee8 100644
--- a/modules/simpletest/tests/unicode.test
+++ b/modules/simpletest/tests/unicode.test
@@ -8,7 +8,7 @@
 /**
  * Test unicode handling features implemented in unicode.inc.
  */
-class UnicodeUnitTest extends DrupalWebTestCase {
+class UnicodeTestCase extends DrupalWebTestCase {
 
   /**
    * Whether to run the extended version of the tests (including non latin1 characters).
@@ -20,7 +20,7 @@ class UnicodeUnitTest extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Unicode handling',
-      'description' => 'Tests Drupal Unicode handling.',
+      'description' => 'Tests Unicode handling.',
       'group' => 'System',
     );
   }
diff --git a/modules/system/system.test b/modules/system/system.test
index ae69d1f..dd7a4f3 100644
--- a/modules/system/system.test
+++ b/modules/system/system.test
@@ -488,20 +488,14 @@ class ModuleRequiredTestCase extends ModuleTestCase {
 class IPAddressBlockingTestCase extends DrupalWebTestCase {
   protected $blocking_user;
 
-  /**
-   * Implement getInfo().
-   */
   public static function getInfo() {
     return array(
       'name' => 'IP address blocking',
       'description' => 'Test IP address blocking.',
-      'group' => 'System'
+      'group' => 'System',
     );
   }
 
-  /**
-   * Implement setUp().
-   */
   function setUp() {
     parent::setUp();
 
@@ -565,20 +559,14 @@ class IPAddressBlockingTestCase extends DrupalWebTestCase {
 }
 
 class CronRunTestCase extends DrupalWebTestCase {
-  /**
-   * Implement getInfo().
-   */
   public static function getInfo() {
     return array(
-      'name' => 'Cron run',
+      'name' => 'Cron',
       'description' => 'Test cron run.',
-      'group' => 'System'
+      'group' => 'System',
     );
   }
 
-  /**
-   * Test cron runs.
-   */
   function testCronRun() {
     global $base_url;
 
@@ -682,15 +670,12 @@ class CronRunTestCase extends DrupalWebTestCase {
   }
 }
 
-class AdminMetaTagTestCase extends DrupalWebTestCase {
-  /**
-   * Implement getInfo().
-   */
+class SystemMetaTagTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Fingerprinting meta tag',
       'description' => 'Confirm that the fingerprinting meta tag appears as expected.',
-      'group' => 'System'
+      'group' => 'System',
     );
   }
 
@@ -713,9 +698,9 @@ class AccessDeniedTestCase extends DrupalWebTestCase {
 
   public static function getInfo() {
     return array(
-      'name' => '403 functionality',
+      'name' => '403 Access denied',
       'description' => 'Tests page access denied functionality, including custom 403 pages.',
-      'group' => 'System'
+      'group' => 'System',
     );
   }
 
@@ -785,20 +770,14 @@ class AccessDeniedTestCase extends DrupalWebTestCase {
 class PageNotFoundTestCase extends DrupalWebTestCase {
   protected $admin_user;
 
-  /**
-   * Implement getInfo().
-   */
   public static function getInfo() {
     return array(
-      'name' => '404 functionality',
+      'name' => '404 Not found',
       'description' => "Tests page not found functionality, including custom 404 pages.",
-      'group' => 'System'
+      'group' => 'System',
     );
   }
 
-  /**
-   * Implement setUp().
-   */
   function setUp() {
     parent::setUp();
 
@@ -828,7 +807,7 @@ class PageNotFoundTestCase extends DrupalWebTestCase {
 /**
  * Tests site maintenance functionality.
  */
-class SiteMaintenanceTestCase extends DrupalWebTestCase {
+class SystemSiteMaintenanceTestCase extends DrupalWebTestCase {
   protected $admin_user;
 
   public static function getInfo() {
@@ -946,7 +925,6 @@ class DateTimeFunctionalTest extends DrupalWebTestCase {
     $this->drupalLogin($this->admin_user);
   }
 
-
   /**
    * Test time zones and DST handling.
    */
@@ -1054,20 +1032,14 @@ class PageTitleFiltering extends DrupalWebTestCase {
   protected $content_user;
   protected $saved_title;
 
-  /**
-   * Implement getInfo().
-   */
   public static function getInfo() {
     return array(
       'name' => 'HTML in page titles',
       'description' => 'Tests correct handling or conversion by drupal_set_title() and drupal_get_title() and checks the correct escaping of site name and slogan.',
-      'group' => 'System'
+      'group' => 'System',
     );
   }
 
-  /**
-   * Implement setUp().
-   */
   function setUp() {
     parent::setUp();
 
@@ -1157,7 +1129,7 @@ class PageTitleFiltering extends DrupalWebTestCase {
 /**
  * Test front page functionality and administration.
  */
-class FrontPageTestCase extends DrupalWebTestCase {
+class SystemFrontPageTestCase extends DrupalWebTestCase {
 
   public static function getInfo() {
     return array(
@@ -1212,7 +1184,7 @@ class FrontPageTestCase extends DrupalWebTestCase {
 class SystemBlockTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => 'Block functionality',
+      'name' => 'System module blocks',
       'description' => 'Configure and move powered-by block.',
       'group' => 'System',
     );
@@ -1263,7 +1235,7 @@ class SystemBlockTestCase extends DrupalWebTestCase {
 /**
  * Test main content rendering fallback provided by system module.
  */
-class SystemMainContentFallback extends DrupalWebTestCase {
+class MainContentFallback extends DrupalWebTestCase {
   protected $admin_user;
   protected $web_user;
 
@@ -1347,10 +1319,10 @@ class SystemMainContentFallback extends DrupalWebTestCase {
 /**
  * Tests for the theme interface functionality.
  */
-class SystemThemeFunctionalTest extends DrupalWebTestCase {
+class SystemThemeTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => 'Theme interface functionality',
+      'name' => 'Theme interface',
       'description' => 'Tests the theme interface functionality by enabling and switching themes, and using an administration theme.',
       'group' => 'System',
     );
@@ -1445,7 +1417,6 @@ class SystemThemeFunctionalTest extends DrupalWebTestCase {
   }
 }
 
-
 /**
  * Test the basic queue functionality.
  */
@@ -1540,7 +1511,7 @@ class QueueTestCase extends DrupalWebTestCase {
 /**
  * Test token replacement in strings.
  */
-class TokenReplaceTestCase extends DrupalWebTestCase {
+class TokenTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Token replacement',
@@ -1665,17 +1636,17 @@ class TokenReplaceTestCase extends DrupalWebTestCase {
   }
 }
 
-class InfoFileParserTestCase extends DrupalUnitTestCase {
+class CommonInfoFileParserUnitTestCase extends DrupalUnitTestCase {
   public static function getInfo() {
     return array(
-      'name' => 'Info file format parser',
-      'description' => 'Tests proper parsing of a .info file formatted string.',
-      'group' => 'System',
+      'name' => 'drupal_parse_info_format()',
+      'description' => 'Tests parsing of a .info file formatted string.',
+      'group' => 'Common',
     );
   }
 
   /**
-   * Test drupal_parse_info_format().
+   * Tests drupal_parse_info_format().
    */
   function testDrupalParseInfoFormat() {
     $config = '
@@ -1812,7 +1783,7 @@ class UpdateScriptFunctionalTest extends DrupalWebTestCase {
 
   public static function getInfo() {
     return array(
-      'name' => 'Update functionality',
+      'name' => 'update.php',
       'description' => 'Tests the update script access and functionality.',
       'group' => 'System',
     );
@@ -1873,7 +1844,7 @@ class UpdateScriptFunctionalTest extends DrupalWebTestCase {
 /**
  * Functional tests for the flood control mechanism.
  */
-class FloodFunctionalTest extends DrupalWebTestCase {
+class FloodTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Flood control mechanism',
@@ -1911,11 +1882,11 @@ class FloodFunctionalTest extends DrupalWebTestCase {
 /**
  * Test HTTP file downloading capability.
  */
-class RetrieveFileTestCase extends DrupalWebTestCase {
+class SystemRetrieveFileTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => 'HTTP file retrieval',
-      'description' => 'Checks HTTP file fetching and error handling.',
+      'name' => 'system_retrieve_file()',
+      'description' => 'Tests HTTP file fetching and error handling.',
       'group' => 'System',
     );
   }