reverted:
--- b/core/modules/simpletest/tests/actions.test
+++ a/core/modules/simpletest/tests/actions.test
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * @file
- * Tests complex actions configuration and makes sure they abort properly.
- */
-
-/**
- * Tests for the actions API.
- */
 class ActionsConfigurationTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
@@ -18,7 +10,8 @@
   }
 
   /**
+   * Test the configuration of advanced actions through the administration
+   * interface.
-   * Tests configuration of advanced actions through administration interface.
    */
   function testActionConfiguration() {
     // Create a user with permission to view the actions administration pages.
@@ -71,7 +64,7 @@
 }
 
 /**
+ * Test actions executing in a potential loop, and make sure they abort properly.
- * Tests actions executing in a potential loop, and ensures they abort properly.
  */
 class ActionLoopTestCase extends DrupalWebTestCase {
   protected $aid;
@@ -89,7 +82,7 @@
   }
 
   /**
+   * Set up a loop with 3 - 12 recursions, and see if it aborts properly.
-   * Sets up a loop with 3 - 12 recursions, and sees if it aborts properly.
    */
   function testActionLoop() {
     $user = $this->drupalCreateUser(array('administer actions'));
@@ -110,9 +103,7 @@
   }
 
   /**
+   * Create an infinite loop by causing a watchdog message to be set,
-   * Loops watchdog messages up to actions_max_stack times.
-   *
-   * Creates an infinite loop by causing a watchdog message to be set,
    * which causes the actions to be triggered again, up to actions_max_stack
    * times.
    */
reverted:
--- b/core/modules/simpletest/tests/actions_loop_test.install
+++ a/core/modules/simpletest/tests/actions_loop_test.install
@@ -1,11 +1,6 @@
 <?php
 
 /**
- * @file
- * Install, update and uninstall functions for the actions_loop_test module.
- */
-
-/**
  * Implements hook_install().
  */
 function actions_loop_test_install() {
reverted:
--- b/core/modules/simpletest/tests/actions_loop_test.module
+++ a/core/modules/simpletest/tests/actions_loop_test.module
@@ -1,11 +1,6 @@
 <?php
 
 /**
- * @file
- * Actions loop test module file.
- */
-
-/**
  * Implements hook_watchdog().
  */
 function actions_loop_test_watchdog(array $log_entry) {
@@ -48,7 +43,7 @@
 }
 
 /**
+ * Write a message to the log.
- * Writes a message to the log.
  */
 function actions_loop_test_log() {
   $count = &drupal_static(__FUNCTION__, 0);
@@ -57,11 +52,8 @@
 }
 
 /**
+ * Replacement of the watchdog() function that eliminates the use of semaphores
+ * so that we can test the abortion of an action loop.
- * Uses a watchdog replacement to test the abortion of an action loop.
- *
- * Replaces the watchdog() function so that we can test the abortion of an
- * action loop.  This function is like the watchdog() function except that it
- * does not use semaphores.
  */
 function watchdog_skip_semaphore($type, $message, $variables = array(), $severity = WATCHDOG_NOTICE, $link = NULL) {
   global $user, $base_root;
@@ -81,7 +73,7 @@
     'timestamp'   => REQUEST_TIME,
   );
 
+  // Call the logging hooks to log/process the message
-  // Calls the logging hooks to log/process the message
   foreach (module_implements('watchdog') as $module) {
     module_invoke($module, 'watchdog', $log_entry);
   }
reverted:
--- b/core/modules/simpletest/tests/ajax.test
+++ a/core/modules/simpletest/tests/ajax.test
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * @file
- * Tests AJAX values.
- */
-
-/**
- * Tests the AJAX forms.
- */
 class AJAXTestCase extends DrupalWebTestCase {
   function setUp() {
     $modules = func_get_args();
@@ -18,7 +10,7 @@
   }
 
   /**
+   * Assert that a command with the required properties exists within the array of Ajax commands returned by the server.
-   * Asserts the array of Ajax commands contains the searched command.
    *
    * The Ajax framework, via the ajax_deliver() and ajax_render() functions,
    * returns an array of commands. This array sometimes includes commands
@@ -75,7 +67,7 @@
   }
 
   /**
+   * Test that ajax_render() returns JavaScript settings generated during the page request.
-   * Ensures ajax_render() returns JavaScript settings from the page request.
    *
    * @todo Add tests to ensure that ajax_render() returns commands for new CSS
    *   and JavaScript files to be loaded by the page. See
@@ -100,7 +92,7 @@
   }
 
   /**
+   * Test behavior of ajax_render_error().
-   * Tests behavior of ajax_render_error().
    */
   function testAJAXRenderError() {
     // Verify default error message.
@@ -124,7 +116,7 @@
   }
 
   /**
+   * Test that new JavaScript and CSS files added during an AJAX request are returned.
-   * Tests that new JavaScript and CSS files are returned on an AJAX request.
    */
   function testLazyLoad() {
     $expected = array(
@@ -237,7 +229,7 @@
   }
 
   /**
+   * Test the various Ajax Commands.
-   * Tests the various Ajax Commands.
    */
   function testAJAXCommands() {
     $form_path = 'ajax_forms_test_ajax_commands_form';
@@ -378,7 +370,7 @@
 }
 
 /**
+ * Test that $form_state['values'] is properly delivered to $ajax['callback'].
- * Tests that $form_state['values'] is properly delivered to $ajax['callback'].
  */
 class AJAXFormValuesTestCase extends AJAXTestCase {
   public static function getInfo() {
@@ -397,7 +389,7 @@
   }
 
   /**
+   * Create a simple form, then POST to system/ajax to change to it.
-   * Creates a simple form, then POST to system/ajax to change to it.
    */
   function testSimpleAJAXFormValue() {
     // Verify form values of a select element.
@@ -466,7 +458,7 @@
   }
 
   /**
+   * Test that a page with the 'page_node_form' included twice works correctly.
-   * Tests that pages with the 'page_node_form' included twice works correctly.
    */
   function testMultiForm() {
     // HTML IDs for elements within the field are potentially modified with
@@ -506,7 +498,7 @@
 }
 
 /**
+ * Miscellaneous Ajax tests using ajax_test module.
- * Tests using ajax_test module.
  */
 class AJAXElementValidation extends AJAXTestCase {
   public static function getInfo() {
@@ -518,7 +510,7 @@
   }
 
   /**
+   * Try to post an Ajax change to a form that has a validated element.
-   * Trys to post an Ajax change to a form that has a validated element.
    *
    * The drivertext field is Ajax-enabled. An additional field is not, but
    * is set to be a required field. In this test the required field is not
reverted:
--- b/core/modules/simpletest/tests/ajax_forms_test.module
+++ a/core/modules/simpletest/tests/ajax_forms_test.module
@@ -38,8 +38,9 @@
   return $items;
 }
 
+
 /**
+ * A basic form used to test form_state['values'] during callback.
- * Tests form_state['values'] during callback.
  */
 function ajax_forms_test_simple_form($form, &$form_state) {
   $form = array();
@@ -71,7 +72,7 @@
 }
 
 /**
+ * Ajax callback triggered by select.
- * Ajax form callback: Selects color.
  */
 function ajax_forms_test_simple_form_select_callback($form, $form_state) {
   $commands = array();
@@ -81,7 +82,7 @@
 }
 
 /**
+ * Ajax callback triggered by checkbox.
- * Ajax form callback: Selects checkbox value.
  */
 function ajax_forms_test_simple_form_checkbox_callback($form, $form_state) {
   $commands = array();
@@ -90,8 +91,9 @@
   return array('#type' => 'ajax', '#commands' => $commands);
 }
 
+
 /**
+ * Form to display the Ajax Commands.
- * Forms to display the Ajax Commands.
  * @param $form
  * @param $form_state
  * @return unknown_type
@@ -265,7 +267,7 @@
 }
 
 /**
+ * Ajax callback for 'after'.
- * Ajax form callback: Selects 'after'.
  */
 function ajax_forms_test_advanced_commands_after_callback($form, $form_state) {
   $selector = '#after_div';
@@ -276,7 +278,7 @@
 }
 
 /**
+ * Ajax callback for 'alert'.
- * Ajax form callback: Selects 'alert'.
  */
 function ajax_forms_test_advanced_commands_alert_callback($form, $form_state) {
   $commands = array();
@@ -285,7 +287,7 @@
 }
 
 /**
+ * Ajax callback for 'append'.
- * Ajax form callback: Selects 'append'.
  */
 function ajax_forms_test_advanced_commands_append_callback($form, $form_state) {
   $selector = '#append_div';
@@ -295,7 +297,7 @@
 }
 
 /**
+ * Ajax callback for 'before'.
- * Ajax form callback: Selects 'before'.
  */
 function ajax_forms_test_advanced_commands_before_callback($form, $form_state) {
   $selector = '#before_div';
@@ -306,15 +308,14 @@
 }
 
 /**
+ * Ajax callback for 'changed'.
- * Ajax form callback: Selects 'changed'.
  */
 function ajax_forms_test_advanced_commands_changed_callback($form, $form_state) {
   $commands[] = ajax_command_changed('#changed_div');
   return array('#type' => 'ajax', '#commands' => $commands);
 }
-
 /**
+ * Ajax callback for 'changed' with asterisk marking inner div.
- * Ajax form callback: Selects 'changed' with asterisk marking inner div.
  */
 function ajax_forms_test_advanced_commands_changed_asterisk_callback($form, $form_state) {
   $commands = array();
@@ -323,7 +324,7 @@
 }
 
 /**
+ * Ajax callback for 'css'.
- * Ajax form callback: Selects 'css'.
  */
 function ajax_forms_test_advanced_commands_css_callback($form, $form_state) {
   $selector = '#css_div';
@@ -335,7 +336,7 @@
 }
 
 /**
+ * Ajax callback for 'data'.
- * Ajax form callback: Selects 'data'.
  */
 function ajax_forms_test_advanced_commands_data_callback($form, $form_state) {
   $selector = '#data_div';
@@ -346,7 +347,7 @@
 }
 
 /**
+ * Ajax callback for 'invoke'.
- * Ajax form callback: Selects 'invoke'.
  */
 function ajax_forms_test_advanced_commands_invoke_callback($form, $form_state) {
   $commands = array();
@@ -355,7 +356,7 @@
 }
 
 /**
+ * Ajax callback for 'html'.
- * Ajax form callback: Selects 'html'.
  */
 function ajax_forms_test_advanced_commands_html_callback($form, $form_state) {
   $commands = array();
@@ -364,7 +365,7 @@
 }
 
 /**
+ * Ajax callback for 'insert'.
- * Ajax form callback: Selects 'insert'.
  */
 function ajax_forms_test_advanced_commands_insert_callback($form, $form_state) {
   $commands = array();
@@ -373,7 +374,7 @@
 }
 
 /**
+ * Ajax callback for 'prepend'.
- * Ajax form callback: Selects 'prepend'.
  */
 function ajax_forms_test_advanced_commands_prepend_callback($form, $form_state) {
   $commands = array();
@@ -382,7 +383,7 @@
 }
 
 /**
+ * Ajax callback for 'remove'.
- * Ajax form callback: Selects 'remove'.
  */
 function ajax_forms_test_advanced_commands_remove_callback($form, $form_state) {
   $commands = array();
@@ -391,7 +392,7 @@
 }
 
 /**
+ * Ajax callback for 'restripe'.
- * Ajax form callback: Selects 'restripe'.
  */
 function ajax_forms_test_advanced_commands_restripe_callback($form, $form_state) {
   $commands = array();
@@ -400,7 +401,7 @@
 }
 
 /**
+ * Ajax callback for 'settings'.
- * Ajax form callback: Selects 'settings'.
  */
 function ajax_forms_test_advanced_commands_settings_callback($form, $form_state) {
   $commands = array();
@@ -410,8 +411,6 @@
 }
 
 /**
- * Builds AJAX validation form.
- *
  * This form and its related submit and callback functions demonstrate
  * not validating another form element when a single Ajax element is triggered.
  *
@@ -449,16 +448,15 @@
 
   return $form;
 }
-
 /**
+ * Submit handler for the validation form.
- * Submits handler for the validation form.
  */
 function ajax_forms_test_validation_form_submit($form, $form_state) {
   drupal_set_message(t("Validation form submitted"));
 }
 
 /**
+ * Ajax callback for the 'drivertext' element of the validation form.
- * Ajax form callback: Selects the 'drivertext' element of the validation form.
  */
 function ajax_forms_test_validation_form_callback($form, $form_state) {
   drupal_set_message("ajax_forms_test_validation_form_callback invoked");
@@ -497,7 +495,7 @@
 }
 
 /**
+ * AJAX callback for the ajax_forms_test_lazy_load_form() form.
- * AJAX form callback: Selects for the ajax_forms_test_lazy_load_form() form.
  *
  * This function returns nothing, because all we're interested in testing is
  * ajax_render() adding commands for JavaScript and CSS added during the page
reverted:
--- b/core/modules/simpletest/tests/ajax_test.module
+++ a/core/modules/simpletest/tests/ajax_test.module
@@ -40,7 +40,7 @@
 }
 
 /**
+ * Menu callback; Return an element suitable for use by ajax_deliver().
- * Menu callback: Returns an element suitable for use by ajax_deliver().
  *
  * Additionally ensures that ajax_render() incorporates JavaScript settings
  * generated during the page request by invoking drupal_add_js() with a dummy
@@ -52,7 +52,7 @@
 }
 
 /**
+ * Menu callback; Returns Ajax element with #error property set.
- * Menu callback: Returns Ajax element with #error property set.
  */
 function ajax_test_error() {
   $message = '';
@@ -63,7 +63,7 @@
 }
 
 /**
+ * Menu callback; Renders a #type link with #ajax.
- * Menu callback: Renders a #type link with #ajax.
  */
 function ajax_test_link() {
   $build['link'] = array(
@@ -76,3 +76,4 @@
   );
   return $build;
 }
+
reverted:
--- b/core/modules/simpletest/tests/batch.test
+++ a/core/modules/simpletest/tests/batch.test
@@ -22,7 +22,7 @@
   }
 
   /**
+   * Test batches triggered outside of form submission.
-   * Tests batches triggered outside of form submission.
    */
   function testBatchNoForm() {
     // Displaying the page triggers batch 1.
@@ -33,7 +33,7 @@
   }
 
   /**
+   * Test batches defined in a form submit handler.
-   * Tests batches defined in a form submit handler.
    */
   function testBatchForm() {
     // Batch 0: no operation.
@@ -72,7 +72,7 @@
   }
 
   /**
+   * Test batches defined in a multistep form.
-   * Tests batches defined in a multistep form.
    */
   function testBatchFormMultistep() {
     $this->drupalGet('batch-test/multistep');
@@ -92,7 +92,7 @@
   }
 
   /**
+   * Test batches defined in different submit handlers on the same form.
-   * Tests batches defined in different submit handlers on the same form.
    */
   function testBatchFormMultipleBatches() {
     // Batches 1, 2 and 3 are triggered in sequence by different submit
@@ -109,7 +109,7 @@
   }
 
   /**
+   * Test batches defined in a programmatically submitted form.
-   * Tests batches defined in a programmatically submitted form.
    *
    * Same as above, but the form is submitted through drupal_form_execute().
    */
@@ -127,7 +127,7 @@
   }
 
   /**
+   * Test that drupal_form_submit() can run within a batch operation.
-   * Tests that drupal_form_submit() can run within a batch operation.
    */
   function testDrupalFormSubmitInBatch() {
     // Displaying the page triggers a batch that programmatically submits a
@@ -138,7 +138,7 @@
   }
 
   /**
+   * Test batches that return $context['finished'] > 1 do in fact complete.
-   * Tests batches that return $context['finished'] > 1 do in fact complete.
    * See http://drupal.org/node/600836
    */
   function testBatchLargePercentage() {
@@ -151,7 +151,7 @@
 
 
   /**
+   * Will trigger a pass if the texts were found in order in the raw content.
-   * Triggers a pass if the texts were found in order in the raw content.
    *
    * @param $texts
    *   Array of raw strings to look for .
@@ -166,7 +166,7 @@
   }
 
   /**
+   * Helper function: return expected execution stacks for the test batches.
-   * Returns expected execution stacks for the test batches.
    */
   function _resultStack($id, $value = 0) {
     $stack = array();
@@ -233,7 +233,7 @@
   }
 
   /**
+   * Helper function: return expected result messages for the test batches.
-   * Returns expected result messages for the test batches.
    */
   function _resultMessages($id) {
     $messages = array();
@@ -384,7 +384,7 @@
   }
 
   /**
+   * Test the _batch_api_percentage() function.
-   * Tests the _batch_api_percentage() function.
    */
   function testBatchPercentages() {
     foreach ($this->testCases as $expected_result => $arguments) {
reverted:
--- b/core/modules/simpletest/tests/batch_test.callbacks.inc
+++ a/core/modules/simpletest/tests/batch_test.callbacks.inc
@@ -1,12 +1,13 @@
 <?php
 
+
 /**
  * @file
  * Batch callbacks for the Batch API tests.
  */
 
 /**
+ * Simple batch operation.
- * Preforms a simple batch operation.
  */
 function _batch_test_callback_1($id, $sleep, &$context) {
   // No-op, but ensure the batch take a couple iterations.
@@ -19,7 +20,7 @@
 }
 
 /**
+ * Multistep batch operation.
- * Preforms a multistep batch operation.
  */
 function _batch_test_callback_2($start, $total, $sleep, &$context) {
   // Initialize context with progress information.
@@ -52,7 +53,7 @@
 }
 
 /**
+ * Simple batch operation.
- * Preforms a simple batch operation.
  */
 function _batch_test_callback_5($id, $sleep, &$context) {
   // No-op, but ensure the batch take a couple iterations.
@@ -67,7 +68,7 @@
 }
 
 /**
+ * Batch operation setting up its own batch.
- * Preforms a batch operation setting up its own batch.
  */
 function _batch_test_nested_batch_callback() {
   batch_test_stack('setting up batch 2');
@@ -75,7 +76,7 @@
 }
 
 /**
+ * Common 'finished' callbacks for batches 1 to 4.
- * Preforms a common 'finished' callbacks for batches 1 to 4.
  */
 function _batch_test_finished_helper($batch_id, $success, $results, $operations) {
   $messages = array("results for batch $batch_id");
@@ -98,42 +99,42 @@
 }
 
 /**
+ * 'finished' callback for batch 0.
- * Triggers 'finished' callback for batch 0.
  */
 function _batch_test_finished_0($success, $results, $operations) {
   _batch_test_finished_helper(0, $success, $results, $operations);
 }
 
 /**
+ * 'finished' callback for batch 1.
- * Triggers 'finished' callback for batch 1.
  */
 function _batch_test_finished_1($success, $results, $operations) {
   _batch_test_finished_helper(1, $success, $results, $operations);
 }
 
 /**
+ * 'finished' callback for batch 2.
- * Triggers 'finished' callback for batch 2.
  */
 function _batch_test_finished_2($success, $results, $operations) {
   _batch_test_finished_helper(2, $success, $results, $operations);
 }
 
 /**
+ * 'finished' callback for batch 3.
- * Triggers 'finished' callback for batch 3.
  */
 function _batch_test_finished_3($success, $results, $operations) {
   _batch_test_finished_helper(3, $success, $results, $operations);
 }
 
 /**
+ * 'finished' callback for batch 4.
- * Triggers 'finished' callback for batch 4.
  */
 function _batch_test_finished_4($success, $results, $operations) {
   _batch_test_finished_helper(4, $success, $results, $operations);
 }
 
 /**
+ * 'finished' callback for batch 5.
- * Triggers 'finished' callback for batch 5.
  */
 function _batch_test_finished_5($success, $results, $operations) {
   _batch_test_finished_helper(5, $success, $results, $operations);
reverted:
--- b/core/modules/simpletest/tests/batch_test.module
+++ a/core/modules/simpletest/tests/batch_test.module
@@ -6,7 +6,7 @@
  */
 
 /**
+ * Implement hook_menu().
- * Implements hook_menu().
  */
 function batch_test_menu() {
   $items = array();
@@ -93,7 +93,7 @@
 }
 
 /**
+ * Simple form.
- * Preforms a simple form.
  */
 function batch_test_simple_form() {
   $form['batch'] = array(
@@ -116,7 +116,7 @@
 }
 
 /**
+ * Submit handler for the simple form.
- * Triggers submit handler for the simple form.
  */
 function batch_test_simple_form_submit($form, &$form_state) {
   batch_test_stack(NULL, TRUE);
@@ -129,7 +129,7 @@
 
 
 /**
+ * Multistep form.
- * Preforms a multistep form.
  */
 function batch_test_multistep_form($form, &$form_state) {
   if (empty($form_state['storage']['step'])) {
@@ -148,7 +148,7 @@
 }
 
 /**
+ * Submit handler for the multistep form.
- * Submits handler for the multistep form.
  */
 function batch_test_multistep_form_submit($form, &$form_state) {
   batch_test_stack(NULL, TRUE);
@@ -172,7 +172,7 @@
 }
 
 /**
+ * Form with chained submit callbacks.
- * Tests a form with chained submit callbacks.
  */
 function batch_test_chained_form() {
   // This value is used to test that $form_state persists through batched
@@ -197,7 +197,7 @@
 }
 
 /**
+ * Submit handler #1 for the chained form.
- * Triggers submit handler #1 for the chained form.
  */
 function batch_test_chained_form_submit_1($form, &$form_state) {
   batch_test_stack(NULL, TRUE);
@@ -213,7 +213,7 @@
 }
 
 /**
+ * Submit handler #2 for the chained form.
- * Triggers submit handler #2 for the chained form.
  */
 function batch_test_chained_form_submit_2($form, &$form_state) {
   batch_test_stack('submit handler 2');
@@ -227,7 +227,7 @@
 }
 
 /**
+ * Submit handler #3 for the chained form.
- * Triggers submit handler #3 for the chained form.
  */
 function batch_test_chained_form_submit_3($form, &$form_state) {
   batch_test_stack('submit handler 3');
@@ -240,7 +240,7 @@
 }
 
 /**
+ * Submit handler #4 for the chained form.
- * Triggers submit handler #4 for the chained form.
  */
 function batch_test_chained_form_submit_4($form, &$form_state) {
   batch_test_stack('submit handler 4');
@@ -254,7 +254,7 @@
 }
 
 /**
+ * Menu callback: programmatically submits the 'Chained' form.
- * Menu callback: Submits the 'Chained' form programmatically.
  */
 function batch_test_programmatic($value = 1) {
   $form_state = array(
@@ -265,7 +265,7 @@
 }
 
 /**
+ * Menu callback: programmatically submits a form within a batch.
- * Menu callback: Submits a form within a batch programmatically.
  */
 function batch_test_nested_drupal_form_submit($value = 1) {
   // Set the batch and process it.
@@ -277,7 +277,7 @@
 }
 
 /**
+ * Batch operation: submits form_test_mock_form using drupal_form_submit().
- * Batch operation: Submits form_test_mock_form using drupal_form_submit().
  */
 function _batch_test_nested_drupal_form_submit_callback($value) {
   $state['values']['test_value'] = $value;
@@ -285,7 +285,7 @@
 }
 
 /**
+ * A simple form with a textfield and submit button.
- * Returns a simple form with a textfield and submit button.
  */
 function batch_test_mock_form($form, $form_state) {
   $form['test_value'] = array(
@@ -300,14 +300,14 @@
 }
 
 /**
+ * Submit handler for the batch_test_mock form.
- * Triggers submit handler for the batch_test_mock form.
  */
 function batch_test_mock_form_submit($form, &$form_state) {
   batch_test_stack('mock form submitted with value = ' . $form_state['values']['test_value']);
 }
 
 /**
+ * Menu callback: fire a batch process without a form submission.
- * Menu callback: Fires a batch process without a form submission.
  */
 function batch_test_no_form() {
   batch_test_stack(NULL, TRUE);
@@ -317,7 +317,7 @@
 }
 
 /**
+ * Menu callback: fire a batch process without a form submission.
- * Menu callback: Fires a batch process without a form submission.
  */
 function batch_test_large_percentage() {
   batch_test_stack(NULL, TRUE);
@@ -327,14 +327,14 @@
 }
 
 /**
+ * Menu callback: successful redirection.
- * Menu callback: Redirects successfuly.
  */
 function batch_test_redirect_page() {
   return 'Redirection successful.';
 }
 
 /**
+ * Batch 0: no operation.
- * Batch 0: Operates nothing.
  */
 function _batch_test_batch_0() {
   $batch = array(
@@ -346,7 +346,7 @@
 }
 
 /**
+ * Batch 1: repeats a simple operation.
- * Batch 1: Repeats a simple operation.
  *
  * Operations: op 1 from 1 to 10.
  */
@@ -368,7 +368,7 @@
 }
 
 /**
+ * Batch 2: single multistep operation.
- * Batch 2: Preforms a single multistep operation.
  *
  * Operations: op 2 from 1 to 10.
  */
@@ -389,7 +389,7 @@
 }
 
 /**
+ * Batch 3: both single and multistep operations.
- * Batch 3: Preforms both single and multistep operations.
  *
  * Operations:
  * - op 1 from 1 to 5,
@@ -420,7 +420,7 @@
 }
 
 /**
+ * Batch 4: batch within a batch.
- * Batch 4: Preforms a batch within a batch.
  *
  * Operations:
  * - op 1 from 1 to 5,
@@ -449,7 +449,7 @@
 }
 
 /**
+ * Batch 5: repeats a simple operation.
- * Batch 5: Repeats a simple operation.
  *
  * Operations: op 1 from 1 to 10.
  */
@@ -471,7 +471,7 @@
 }
 
 /**
+ * Menu callback: run a batch for testing theme used on the progress page.
- * Menu callback: Runs a batch for testing theme used on the progress page.
  */
 function batch_test_theme_batch() {
   batch_test_stack(NULL, TRUE);
@@ -485,7 +485,7 @@
 }
 
 /**
+ * Batch callback function for testing the theme used on the progress page.
- * Tests the progress page theme by performing a batch callback.
  */
 function _batch_test_theme_callback() {
   // Because drupalGet() steps through the full progressive batch before
@@ -498,7 +498,7 @@
 }
 
 /**
+ * Helper function: store or retrieve traced execution data.
- * Helper function: Stores or retrieve traced execution data.
  */
 function batch_test_stack($data = NULL, $reset = FALSE) {
   if ($reset) {
reverted:
--- b/core/modules/simpletest/tests/bootstrap.test
+++ a/core/modules/simpletest/tests/bootstrap.test
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * @file
- * Tests the current visitor's ip address from the variables.
- */
-
-/**
- * Tests the bootstrap.
- */
 class BootstrapIPAddressTestCase extends DrupalWebTestCase {
 
   public static function getInfo() {
@@ -37,9 +29,6 @@
     parent::setUp();
   }
 
-  /**
-   * Resets the static ip address.
-   */
   function tearDown() {
     $_SERVER = $this->oldserver;
     drupal_static_reset('ip_address');
@@ -47,7 +36,7 @@
   }
 
   /**
+   * test IP Address and hostname
-   * Tests IP Address and hostname.
    */
   function testIPAddressHost() {
     // Test the normal IP address.
@@ -109,9 +98,6 @@
   }
 }
 
-/**
- * Enables and tests the page cache.
- */
 class BootstrapPageCacheTestCase extends DrupalWebTestCase {
 
   public static function getInfo() {
@@ -130,7 +116,7 @@
   }
 
   /**
+   * Test support for requests containing If-Modified-Since and If-None-Match headers.
-   * Tests support of requests with If-Modified-Since and If-None-Match headers.
    */
   function testConditionalRequests() {
     $config = config('system.performance');
@@ -170,7 +156,7 @@
   }
 
   /**
+   * Test cache headers.
-   * Tests cache headers.
    */
   function testPageCache() {
     $config = config('system.performance');
@@ -212,7 +198,7 @@
   }
 
   /**
+   * Test page compression.
-   * Tests page compression.
    *
    * The test should pass even if zlib.output_compression is enabled in php.ini,
    * .htaccess or similar, or if compression is done outside PHP, e.g. by the
@@ -245,9 +231,6 @@
   }
 }
 
-/**
- * Tests the variable system.
- */
 class BootstrapVariableTestCase extends DrupalWebTestCase {
 
   function setUp() {
@@ -263,7 +246,7 @@
   }
 
   /**
+   * testVariable
-   * Tests variables then deletes them.
    */
   function testVariable() {
     // Setting and retrieving values.
@@ -296,7 +279,7 @@
 }
 
 /**
+ * Test hook_boot() and hook_exit().
- * Tests hook_boot() and hook_exit().
  */
 class HookBootExitTestCase extends DrupalWebTestCase {
 
@@ -313,7 +296,7 @@
   }
 
   /**
+   * Test calling of hook_boot() and hook_exit().
-   * Tests calling of hook_boot() and hook_exit().
    */
   function testHookBootExit() {
     // Test with cache disabled. Boot and exit should always fire.
@@ -351,7 +334,7 @@
 }
 
 /**
+ * Test drupal_get_filename()'s availability.
- * Tests drupal_get_filename()'s availability.
  */
 class BootstrapGetFilenameTestCase extends DrupalUnitTestCase {
 
@@ -364,7 +347,7 @@
   }
 
   /**
+   * Test that drupal_get_filename() works correctly when the file is not found in the database.
-   * Tests that drupal_get_filename() works when the file is not in database.
    */
   function testDrupalGetFilename() {
     // Reset the static cache so we can test the "db is not active" code of
@@ -395,9 +378,6 @@
   }
 }
 
-/**
- * Tests that the timer_read() is working correctly.
- */
 class BootstrapTimerTestCase extends DrupalUnitTestCase {
 
   public static function getInfo() {
@@ -409,8 +389,8 @@
   }
 
   /**
+   * Test timer_read() to ensure it properly accumulates time when the timer
+   * started and stopped multiple times.
-   * Tests timer_read() to ensure it properly accumulates time when the timer
-   * is started and stopped multiple times.
    * @return
    */
   function testTimer() {
@@ -431,7 +411,7 @@
 }
 
 /**
+ * Test that resetting static variables works.
- * Tests that resetting static variables works.
  */
 class BootstrapResettableStaticTestCase extends DrupalUnitTestCase {
 
@@ -444,7 +424,7 @@
   }
 
   /**
+   * Test that a variable reference returned by drupal_static() gets reset when
-   * Tests that a variable reference returned by drupal_static() gets reset when
    * drupal_static_reset() is called.
    */
   function testDrupalStatic() {
@@ -470,7 +450,7 @@
 }
 
 /**
+ * Test miscellaneous functions in bootstrap.inc.
- * Tests miscellaneous functions in bootstrap.inc.
  */
 class BootstrapMiscTestCase extends DrupalUnitTestCase {
 
@@ -483,7 +463,7 @@
   }
 
   /**
+   * Test miscellaneous functions in bootstrap.inc.
-   * Tests miscellaneous functions in bootstrap.inc.
    */
   function testMisc() {
     // Test drupal_array_merge_deep().
@@ -507,7 +487,7 @@
   }
 
   /**
+   * Test providing a direct URL to to drupal_override_server_variables().
-   * Tests providing a direct URL to to drupal_override_server_variables().
    */
   function testDrupalOverrideServerVariablesProvidedURL() {
     $tests = array(
reverted:
--- b/core/modules/simpletest/tests/cache.test
+++ a/core/modules/simpletest/tests/cache.test
@@ -1,20 +1,12 @@
 <?php
 
-/**
- * @file
- * Tests saved and clears caches.
- */
-
-/**
- * Tests the temporary cache.
- */
 class CacheTestCase extends DrupalWebTestCase {
   protected $default_bin = 'page';
   protected $default_cid = 'test_temporary';
   protected $default_value = 'CacheTest';
 
   /**
+   * Check whether or not a cache entry exists.
-   * Checks whether or not a cache entry exists.
    *
    * @param $cid
    *   The cache id.
@@ -84,7 +76,7 @@
   }
 
   /**
+   * Perform the general wipe.
-   * Performs the general wipe.
    * @param $bin
    *   The bin to perform the wipe on.
    */
@@ -97,7 +89,7 @@
   }
 
   /**
+   * Setup the lifetime settings for caching.
-   * Sets up the lifetime settings for caching.
    *
    * @param $time
    *   The time in seconds the cache should minimal live.
@@ -110,9 +102,6 @@
   }
 }
 
-/**
- * Checks that the cache variables are saved.
- */
 class CacheSavingCase extends CacheTestCase {
   public static function getInfo() {
     return array(
@@ -123,35 +112,35 @@
   }
 
   /**
+   * Test the saving and restoring of a string.
-   * Tests the saving and restoring of a string.
    */
   function testString() {
     $this->checkVariable($this->randomName(100));
   }
 
   /**
+   * Test the saving and restoring of an integer.
-   * Tests the saving and restoring of an integer.
    */
   function testInteger() {
     $this->checkVariable(100);
   }
 
   /**
+   * Test the saving and restoring of a double.
-   * Tests the saving and restoring of a double.
    */
   function testDouble() {
     $this->checkVariable(1.29);
   }
 
   /**
+   * Test the saving and restoring of an array.
-   * Tests the saving and restoring of an array.
    */
   function testArray() {
     $this->checkVariable(array('drupal1', 'drupal2' => 'drupal3', 'drupal4' => array('drupal5', 'drupal6')));
   }
 
   /**
+   * Test the saving and restoring of an object.
-   * Tests the saving and restoring of an object.
    */
   function testObject() {
     $test_object = new stdClass();
@@ -166,7 +155,7 @@
   }
 
   /**
+   * Check or a variable is stored and restored properly.
-   * Checks that a variable is stored and restored properly.
    */
   function checkVariable($var) {
     cache()->set('test_var', $var);
@@ -175,7 +164,7 @@
   }
 
   /**
+   * Test no empty cids are written in cache table.
-   * Tests no empty cids are written in cache table.
    */
   function testNoEmptyCids() {
     $this->drupalGet('user/register');
@@ -184,7 +173,7 @@
 }
 
 /**
+ * Test getMultiple().
- * Tests getMultiple().
  */
 class CacheGetMultipleUnitTest extends CacheTestCase {
 
@@ -202,7 +191,7 @@
   }
 
   /**
+   * Test getMultiple().
-   * Tests getMultiple().
    */
   function testCacheMultiple() {
     $item1 = $this->randomName(10);
@@ -232,7 +221,7 @@
 }
 
 /**
+ * Test cache clearing methods.
- * Tests cache clearing methods.
  */
 class CacheClearCase extends CacheTestCase {
   public static function getInfo() {
@@ -251,7 +240,7 @@
   }
 
   /**
+   * Test clearing using a cid.
-   * Tests clearing using a cid.
    */
   function testClearCid() {
     $cache = cache($this->default_bin);
@@ -264,7 +253,7 @@
   }
 
   /**
+   * Test clearing using wildcard.
-   * Tests clearing using wildcard.
    */
   function testClearWildcard() {
     $cache = cache($this->default_bin);
@@ -290,7 +279,7 @@
   }
 
   /**
+   * Test clearing using an array.
-   * Tests clearing using an array.
    */
   function testClearArray() {
     // Create three cache entries.
@@ -328,7 +317,7 @@
   }
 
   /**
+   * Test drupal_flush_all_caches().
-   * Tests drupal_flush_all_caches().
    */
   function testFlushAllCaches() {
     // Create cache entries for each flushed cache bin.
@@ -349,7 +338,7 @@
   }
 
   /**
+   * Test minimum cache lifetime.
-   * Tests minimum cache lifetime.
    */
   function testMinimumCacheLifetime() {
     // Set a minimum/maximum cache lifetime.
@@ -384,7 +373,7 @@
 }
 
 /**
+ * Test isEmpty() method.
- * Tests isEmpty() method.
  */
 class CacheIsEmptyCase extends CacheTestCase {
   public static function getInfo() {
@@ -403,7 +392,7 @@
   }
 
   /**
+   * Test clearing using a cid.
-   * Tests clearing using a cid.
    */
   function testIsEmpty() {
     // Clear the cache bin.
reverted:
--- b/core/modules/simpletest/tests/common.test
+++ a/core/modules/simpletest/tests/common.test
@@ -21,12 +21,6 @@
     parent::setUp(array('block', 'common_test'));
   }
 
-  /**
-   * Tests if the theme has been altered.
-   *
-   * @global string $theme
-   * @global array $base_theme_info
-   */
   function testDrupalAlter() {
     // This test depends on Bartik, so make sure that it is always the current
     // active theme.
@@ -89,7 +83,7 @@
   }
 
   /**
+   * Confirm that invalid text given as $path is filtered.
-   * Confirms that invalid text given as $path is filtered.
    */
   function testLXSS() {
     $text = $this->randomName();
@@ -122,7 +116,7 @@
   }
 
   /**
+   * Test drupal_get_query_parameters().
-   * Tests drupal_get_query_parameters().
    */
   function testDrupalGetQueryParameters() {
     $original = array(
@@ -169,7 +163,7 @@
   }
 
   /**
+   * Test drupal_http_build_query().
-   * Tests drupal_http_build_query().
    */
   function testDrupalHttpBuildQuery() {
     $this->assertEqual(drupal_http_build_query(array('a' => ' &#//+%20@۞')), 'a=%20%26%23//%2B%2520%40%DB%9E', t('Value was properly encoded.'));
@@ -179,7 +173,7 @@
   }
 
   /**
+   * Test drupal_parse_url().
-   * Tests drupal_parse_url().
    */
   function testDrupalParseUrl() {
     // Relative URL.
@@ -247,9 +241,7 @@
   }
 
   /**
+   * Test url() with/without query, with/without fragment, absolute on/off and
-   * Tests url() functionality.
-   *
-   * Tests url() with/without query, with/without fragment, absolute on/off and
    * assert all that works when clean URLs are on and off.
    */
   function testUrl() {
@@ -325,7 +317,7 @@
   }
 
   /**
+   * Test external URL handling.
-   * Tests external URL handling.
    */
   function testExternalUrls() {
     $test_url = 'http://drupal.org/';
@@ -374,7 +366,7 @@
   }
 
   /**
+   * Check that invalid multi-byte sequences are rejected.
-   * Checks that invalid multi-byte sequences are rejected.
    */
   function testInvalidMultiByte() {
      // Ignore PHP 5.3+ invalid multibyte sequence warning.
@@ -392,7 +384,7 @@
   }
 
   /**
+   * Check that special characters are escaped.
-   * Checks that special characters are escaped.
    */
   function testEscaping() {
      $text = check_plain("<script>");
@@ -402,7 +394,7 @@
   }
 
   /**
+   * Test t() and format_string() replacement functionality.
-   * Tests t() and format_string() replacement functionality.
    */
   function testFormatStringAndT() {
     foreach (array('format_string', 't') as $function) {
@@ -418,7 +410,7 @@
   }
 
   /**
+   * Check that harmful protocols are stripped.
-   * Checks that harmful protocols are stripped.
    */
   function testBadProtocolStripping() {
     // Ensure that check_url() strips out harmful protocols, and encodes for
@@ -471,7 +463,7 @@
   }
 
   /**
+   * Check that format_size() returns the expected string.
-   * Checks that format_size() returns the expected string.
    */
   function testCommonFormatSize() {
     foreach (array($this->exact_test_cases, $this->rounded_test_cases) as $test_cases) {
@@ -486,7 +478,7 @@
   }
 
   /**
+   * Check that parse_size() returns the proper byte sizes.
-   * Checks that parse_size() returns the proper byte sizes.
    */
   function testCommonParseSize() {
     foreach ($this->exact_test_cases as $string => $size) {
@@ -519,7 +511,7 @@
   }
 
   /**
+   * Cross-test parse_size() and format_size().
-   * Cross-tests parse_size() and format_size().
    */
   function testCommonParseSizeFormatSize() {
     foreach ($this->exact_test_cases as $size) {
@@ -533,7 +525,7 @@
 }
 
 /**
+ * Test drupal_explode_tags() and drupal_implode_tags().
- * Tests drupal_explode_tags() and drupal_implode_tags().
  */
 class CommonAutocompleteTagsTestCase extends DrupalUnitTestCase {
   var $validTags = array(
@@ -552,7 +544,7 @@
   }
 
   /**
+   * Explode a series of tags.
-   * Explodes a series of tags.
    */
   function testDrupalExplodeTags() {
     $string = implode(', ', array_keys($this->validTags));
@@ -561,7 +553,7 @@
   }
 
   /**
+   * Implode a series of tags.
-   * Implodes a series of tags.
    */
   function testDrupalImplodeTags() {
     $tags = array_values($this->validTags);
@@ -590,7 +582,7 @@
 }
 
 /**
+ * Test the Drupal CSS system.
- * Tests the Drupal CSS system.
  */
 class CommonCascadingStylesheetsTestCase extends DrupalWebTestCase {
   public static function getInfo() {
@@ -608,14 +600,14 @@
   }
 
   /**
+   * Check default stylesheets as empty.
-   * Checks default stylesheets as empty.
    */
   function testDefault() {
     $this->assertEqual(array(), drupal_add_css(), t('Default CSS is empty.'));
   }
 
   /**
+   * Test that stylesheets in module .info files are loaded.
-   * Tests that stylesheets in module .info files are loaded.
    */
   function testModuleInfo() {
     $this->drupalGet('');
@@ -740,7 +732,7 @@
   }
 
   /**
+   * Test CSS ordering.
-   * Tests CSS ordering.
    */
   function testRenderOrder() {
     // A module CSS file.
@@ -771,7 +763,7 @@
   }
 
   /**
+   * Test CSS override.
-   * Tests CSS override.
    */
   function testRenderOverride() {
     $system = drupal_get_path('module', 'system');
@@ -813,7 +805,8 @@
   }
 
   /**
+   * Tests that the query string remains intact when adding CSS files that have
+   * query string parameters.
-   * Tests that CSS query string remains intact when added to file.
    */
   function testAddCssFileWithQueryString() {
     $this->drupalGet('common-test/query-string');
@@ -884,7 +877,7 @@
 }
 
 /**
+ * CSS Unit Tests.
- * Tests CSS functions.
  */
 class CommonCascadingStylesheetsUnitTestCase extends DrupalUnitTestCase {
   public static function getInfo() {
@@ -896,9 +889,8 @@
   }
 
   /**
+   * Tests basic CSS loading with and without optimization via drupal_load_stylesheet().
-   * Tests CSS loading via drupal_load_stylesheet().
    *
-   * This test loads CSS files with and without CSS optimization.
    * Known tests:
    * - Retain white-space in selectors. (http://drupal.org/node/472820)
    * - Proper URLs in imported files. (http://drupal.org/node/265719)
@@ -937,7 +929,7 @@
 }
 
 /**
+ * Test drupal_http_request().
- * Tests drupal_http_request().
  */
 class CommonDrupalHTTPRequestTestCase extends DrupalWebTestCase {
   public static function getInfo() {
@@ -952,11 +944,6 @@
     parent::setUp('system_test', 'locale');
   }
 
-  /**
-   * Checks HTTP requests.
-   *
-   * @global type $is_https
-   */
   function testDrupalHTTPRequest() {
     global $is_https;
 
@@ -1000,9 +987,6 @@
     }
   }
 
-  /**
-   * Tests HTTP basic authorization.
-   */
   function testDrupalHTTPRequestBasicAuth() {
     $username = $this->randomName();
     $password = $this->randomName();
@@ -1016,9 +1000,6 @@
     $this->assertRaw($password, t('$_SERVER["PHP_AUTH_PW"] is passed correctly.'));
   }
 
-  /**
-   * Tests HTTP redirect requests.
-   */
   function testDrupalHTTPRequestRedirect() {
     $redirect_301 = drupal_http_request(url('system-test/redirect/301', array('absolute' => TRUE)), array('max_redirects' => 1));
     $this->assertEqual($redirect_301->redirect_code, 301, t('drupal_http_request follows the 301 redirect.'));
@@ -1092,7 +1073,7 @@
   }
 
   /**
+   * Test setting and retrieving content for theme regions.
-   * Tests setting and retrieving content for theme regions.
    */
   function testRegions() {
     global $theme_key;
@@ -1141,7 +1122,7 @@
   }
 
   /**
+   * Test drupal_goto().
-   * Tests drupal_goto().
    */
   function testDrupalGoto() {
     $this->drupalGet('common-test/drupal_goto/redirect');
@@ -1167,7 +1148,7 @@
   }
 
   /**
+   * Test hook_drupal_goto_alter().
-   * Tests hook_drupal_goto_alter().
    */
   function testDrupalGotoAlter() {
     $this->drupalGet('common-test/drupal_goto/redirect_fail');
@@ -1177,7 +1158,7 @@
   }
 
   /**
+   * Test drupal_get_destination().
-   * Tests drupal_get_destination().
    */
   function testDrupalGetDestination() {
     $query = $this->randomName(10);
@@ -1198,7 +1179,7 @@
  */
 class CommonJavaScriptTestCase extends DrupalWebTestCase {
   /**
+   * Store configured value for JavaScript preprocessing.
-   * Stores configured value for JavaScript preprocessing.
    */
   protected $preprocess_js = NULL;
 
@@ -1234,14 +1215,14 @@
   }
 
   /**
+   * Test default JavaScript is empty.
-   * Tests default JavaScript is empty.
    */
   function testDefault() {
     $this->assertEqual(array(), drupal_add_js(), t('Default JavaScript is empty.'));
   }
 
   /**
+   * Test adding a JavaScript file.
-   * Tests adding a JavaScript file.
    */
   function testAddFile() {
     $javascript = drupal_add_js('core/misc/collapse.js');
@@ -1255,7 +1236,7 @@
   }
 
   /**
+   * Test adding settings.
-   * Tests adding settings.
    */
   function testAddSetting() {
     $javascript = drupal_add_js(array('drupal' => 'rocks', 'dries' => 280342800), 'setting');
@@ -1273,7 +1254,7 @@
   }
 
   /**
+   * Test drupal_get_js() for JavaScript settings.
-   * Tests drupal_get_js() for JavaScript settings.
    */
   function testHeaderSetting() {
     // Only the second of these two entries should appear in Drupal.settings.
@@ -1308,7 +1289,7 @@
   }
 
   /**
+   * Test to see if resetting the JavaScript empties the cache.
-   * Tests to see if resetting the JavaScript empties the cache.
    */
   function testReset() {
     drupal_add_js('core/misc/collapse.js');
@@ -1317,7 +1298,7 @@
   }
 
   /**
+   * Test adding inline scripts.
-   * Tests adding inline scripts.
    */
   function testAddInline() {
     $inline = 'jQuery(function () { });';
@@ -1328,7 +1309,7 @@
   }
 
   /**
+   * Test rendering an external JavaScript file.
-   * Tests rendering an external JavaScript file.
    */
   function testRenderExternal() {
     $external = 'http://example.com/example.js';
@@ -1339,7 +1320,7 @@
   }
 
   /**
+   * Test drupal_get_js() with a footer scope.
-   * Tests drupal_get_js() with a footer scope.
    */
   function testFooterHTML() {
     $inline = 'jQuery(function () { });';
@@ -1349,7 +1330,7 @@
   }
 
   /**
+   * Test drupal_add_js() sets preproccess to false when cache is set to false.
-   * Tests drupal_add_js() sets preproccess to false when cache is set to false.
    */
   function testNoCache() {
     $javascript = drupal_add_js('core/misc/collapse.js', array('cache' => FALSE));
@@ -1357,7 +1338,7 @@
   }
 
   /**
+   * Test adding a JavaScript file with a different group.
-   * Tests adding a JavaScript file with a different group.
    */
   function testDifferentGroup() {
     $javascript = drupal_add_js('core/misc/collapse.js', array('group' => JS_THEME));
@@ -1365,7 +1346,7 @@
   }
 
   /**
+   * Test adding a JavaScript file with a different weight.
-   * Tests adding a JavaScript file with a different weight.
    */
   function testDifferentWeight() {
     $javascript = drupal_add_js('core/misc/collapse.js', array('weight' => 2));
@@ -1373,7 +1354,7 @@
   }
 
   /**
+   * Test adding JavaScript within conditional comments.
-   * Tests adding JavaScript within conditional comments.
    *
    * @see drupal_pre_render_conditional_comments()
    */
@@ -1392,7 +1373,7 @@
   }
 
   /**
+   * Test JavaScript versioning.
-   * Tests JavaScript versioning.
    */
   function testVersionQueryString() {
     drupal_add_js('core/misc/collapse.js', array('version' => 'foo'));
@@ -1402,7 +1383,7 @@
   }
 
   /**
+   * Test JavaScript grouping and aggregation.
-   * Tests JavaScript grouping and aggregation.
    */
   function testAggregation() {
     $default_query_string = variable_get('css_js_query_string', '0');
@@ -1444,7 +1425,7 @@
   }
 
   /**
+   * Test JavaScript ordering.
-   * Tests JavaScript ordering.
    */
   function testRenderOrder() {
     // Add a bunch of JavaScript in strange ordering.
@@ -1486,7 +1467,7 @@
   }
 
   /**
+   * Test rendering the JavaScript with a file's weight above jQuery's.
-   * Tests rendering the JavaScript with a file's weight above jQuery's.
    */
   function testRenderDifferentWeight() {
     // JavaScript files are sorted first by group, then by the 'every_page'
@@ -1498,7 +1479,7 @@
   }
 
   /**
+   * Test altering a JavaScript's weight via hook_js_alter().
-   * Tests altering a JavaScript's weight via hook_js_alter().
    *
    * @see simpletest_js_alter()
    */
@@ -1597,7 +1578,8 @@
   }
 
   /**
+   * Tests that the query string remains intact when adding JavaScript files
+   *  that have query string parameters.
-   * Tests JavaScript files that have query strings attached get added right.
    */
   function testAddJsFileWithQueryString() {
     $this->drupalGet('common-test/query-string');
@@ -1623,7 +1605,7 @@
   }
 
   /**
+   * Test sorting by weight.
-   * Tests sorting by weight.
    */
   function testDrupalRenderSorting() {
     $first = $this->randomName();
@@ -1674,7 +1656,7 @@
   }
 
   /**
+   * Test #attached functionality in children elements.
-   * Tests #attached functionality in children elements.
    */
   function testDrupalRenderChildrenAttached() {
     // The cache system is turned off for POST requests.
@@ -1724,7 +1706,7 @@
   }
 
   /**
+   * Test passing arguments to the theme function.
-   * Tests passing arguments to the theme function.
    */
   function testDrupalRenderThemeArguments() {
     $element = array(
@@ -1737,12 +1719,12 @@
       '#foo' => $this->randomName(),
       '#bar' => $this->randomName(),
     );
+    // Test that passing arguments to the theme function works.
-    // Tests that passing arguments to the theme function works.
     $this->assertEqual(drupal_render($element), $element['#foo'] . $element['#bar'], 'Passing arguments to theme functions works');
   }
 
   /**
+   * Test rendering form elements without passing through form_builder().
-   * Tests rendering form elements without passing through form_builder().
    */
   function testDrupalRenderFormElements() {
     // Define a series of form elements.
@@ -1852,7 +1834,7 @@
   }
 
   /**
+   * Test rendering elements with invalid keys.
-   * Tests rendering elements with invalid keys.
    */
   function testDrupalRenderInvalidKeys() {
     $error = array(
@@ -1868,9 +1850,6 @@
     $this->assertRaw($message, t('Found error message: !message.', array('!message' => $message)));
   }
 
-  /**
-   * Asserts rendered elements.
-   */
   protected function assertRenderedElement(array $element, $xpath, array $xpath_args = array()) {
     $original_element = $element;
     $this->drupalSetContent(drupal_render($element));
@@ -1967,7 +1946,7 @@
   }
 
   /**
+   * Test invalid absolute urls.
-   * Tests invalid absolute urls.
    */
   function testInvalidAbsolute() {
     $url_schemes = array('http', 'https', 'ftp');
@@ -1987,7 +1966,7 @@
   }
 
   /**
+   * Test valid relative urls.
-   * Tests valid relative urls.
    */
   function testValidRelative() {
     $valid_relative_urls = array(
@@ -2008,7 +1987,7 @@
   }
 
   /**
+   * Test invalid relative urls.
-   * Tests invalid relative urls.
    */
   function testInvalidRelative() {
     $invalid_relative_urls = array(
@@ -2111,7 +2090,7 @@
   }
 
   /**
+   * Test the drupal_write_record() API function.
-   * Tests the drupal_write_record() API function.
    */
   function testDrupalWriteRecord() {
     // Insert a record with no columns populated.
@@ -2258,7 +2237,7 @@
   }
 
   /**
+   * Test that simpletest collects errors from the tested site.
-   * Tests that simpletest collects errors from the tested site.
    */
   function testErrorCollect() {
     $this->collectedErrors = array();
@@ -2309,7 +2288,7 @@
   }
 
   /**
+   * Assert that a collected error matches what we are expecting.
-   * Asserts that a collected error matches what we are expecting.
    */
   function assertError($error, $group, $function, $file, $message = NULL) {
     $this->assertEqual($error['group'], $group, t("Group was %group", array('%group' => $group)));
@@ -2334,7 +2313,7 @@
   }
 
   /**
+   * Parse an example .info file an verify the results.
-   * Parses an example .info file an verify the results.
    */
   function testParseInfoFile() {
     $info_values = drupal_parse_info_file(drupal_get_path('module', 'simpletest') . '/tests/common_test_info.txt');
@@ -2357,7 +2336,7 @@
   }
 
   /**
+   * Test that files in different directories take precedence as expected.
-   * Tests that files in different directories take precedence as expected.
    */
   function testDirectoryPrecedence() {
     // Define the module files we will search for, and the directory precedence
@@ -2431,7 +2410,7 @@
   }
 
   /**
+   * Test admin-defined formats in format_date().
-   * Tests admin-defined formats in format_date().
    */
   function testAdminDefinedFormatDate() {
     // Create an admin user.
@@ -2743,7 +2722,7 @@
 }
 
 /**
+ * Basic tests for drupal_add_feed().
- * Tests for drupal_add_feed().
  */
 class CommonDrupalAddFeedTestCase extends DrupalWebTestCase {
   public static function getInfo() {
@@ -2755,7 +2734,7 @@
   }
 
   /**
+   * Test drupal_add_feed() with paths, URLs, and titles.
-   * Tests drupal_add_feed() with paths, URLs, and titles.
    */
   function testBasicFeedAddNoTitle() {
     $path = $this->randomName(12);
@@ -2814,7 +2793,7 @@
   }
 
   /**
+   * Create a pattern representing the RSS feed in the page.
-   * Creates a pattern representing the RSS feed in the page.
    */
   function urlToRSSLinkPattern($url, $title = '') {
     // Escape any regular expression characters in the url ('?' is the worst).
reverted:
--- b/core/modules/simpletest/tests/common_test.module
+++ a/core/modules/simpletest/tests/common_test.module
@@ -62,28 +62,28 @@
 }
 
 /**
+ * Redirect using drupal_goto().
- * Redirects using drupal_goto().
  */
 function common_test_drupal_goto_redirect() {
   drupal_goto('common-test/drupal_goto');
 }
 
 /**
+ * Redirect using drupal_goto().
- * Redirects using drupal_goto().
  */
 function common_test_drupal_goto_redirect_advanced() {
   drupal_goto('common-test/drupal_goto', array('query' => array('foo' => '123')), 301);
 }
 
 /**
+ * Landing page for drupal_goto().
- * This is a landing a page for drupal_goto().
  */
 function common_test_drupal_goto_land() {
   print "drupal_goto";
 }
 
 /**
+ * Fail landing page for drupal_goto().
- * This is a failure landing page for drupal_goto().
  */
 function common_test_drupal_goto_land_fail() {
   print "drupal_goto_fail";
@@ -99,7 +99,7 @@
 }
 
 /**
+ * Print destination query parameter.
- * Prints a destination query parameter.
  */
 function common_test_destination() {
   $destination = drupal_get_destination();
@@ -107,7 +107,7 @@
 }
 
 /**
+ * Render an element with an invalid render array key.
- * Renders an element with an invalid render array key.
  */
 function common_test_drupal_render_invalid_keys() {
   define('SIMPLETEST_COLLECT_ERRORS', FALSE);
@@ -227,7 +227,7 @@
 }
 
 /**
+ * Theme function for testing drupal_render() theming.
- * Testing a theme function for drupal_render() theming.
  */
 function theme_common_test_foo($variables) {
   return $variables['foo'] . $variables['bar'];
reverted:
--- b/core/modules/simpletest/tests/common_test_cron_helper.module
+++ a/core/modules/simpletest/tests/common_test_cron_helper.module
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @file
  * Helper module for the testCronExceptions in addition to common_test module.
reverted:
--- b/core/modules/simpletest/tests/database_test.module
+++ a/core/modules/simpletest/tests/database_test.module
@@ -76,7 +76,7 @@
 }
 
 /**
+ * Run a db_query_temporary and output the table name and its number of rows.
- * Runs a db_query_temporary and output the table name and its number of rows.
  *
  * We need to test that the table created is temporary, so we run it here, in a
  * separate menu callback request; After this request is done, the temporary
@@ -92,7 +92,7 @@
 }
 
 /**
+ * Run a pager query and return the results.
- * Runs a pager query and return the results.
  *
  * This function does care about the page GET parameter, as set by the
  * simpletest HTTP call.
@@ -116,7 +116,7 @@
 }
 
 /**
+ * Run a pager query and return the results.
- * Runs a pager query and return the results.
  *
  * This function does care about the page GET parameter, as set by the
  * simpletest HTTP call.
@@ -140,7 +140,7 @@
 }
 
 /**
+ * Run a tablesort query and return the results.
- * Runs a tablesort query and return the results.
  *
  * This function does care about the page GET parameter, as set by the
  * simpletest HTTP call.
@@ -169,7 +169,7 @@
 }
 
 /**
+ * Run a tablesort query with a second order_by after and return the results.
- * Runs a tablesort query with a second order_by after and return the results.
  *
  * This function does care about the page GET parameter, as set by the
  * simpletest HTTP call.
@@ -198,7 +198,7 @@
 }
 
 /**
+ * Output a form without setting a header sort.
- * Outputs a form without setting a header sort.
  */
 function database_test_theme_tablesort($form, &$form_state) {
   $header = array(
reverted:
--- b/core/modules/simpletest/tests/database_test.test
+++ a/core/modules/simpletest/tests/database_test.test
@@ -10,7 +10,7 @@
 use Drupal\Core\Database\Query\NoFieldsException;
 
 /**
+ * Dummy class for fetching into a class.
- * Fetches into a class.
  *
  * PDO supports using a new instance of an arbitrary class for records
  * rather than just a stdClass or array. This class is for testing that
@@ -19,7 +19,7 @@
 class FakeRecord { }
 
 /**
+ * Base test class for databases.
- * Tests class for databases.
  *
  * Because all database tests share the same test data, we can centralize that
  * here.
@@ -45,7 +45,7 @@
   }
 
   /**
+   * Set up several tables needed by a certain test.
-   * Sets up several tables needed by a certain test.
    *
    * @param $schema
    *   An array of table definitions to install.
@@ -65,7 +65,7 @@
   }
 
   /**
+   * Set up tables for NULL handling.
-   * Sets up tables for NULL handling.
    */
   function ensureSampleDataNull() {
     $schema['test_null'] = drupal_get_schema('test_null');
@@ -89,7 +89,7 @@
   }
 
   /**
+   * Setup our sample data.
-   * Sets up our sample data.
    *
    * These are added using db_query(), since we're not trying to test the
    * INSERT operations here, just populate.
@@ -178,7 +178,7 @@
 }
 
 /**
+ * Test connection management.
- * Tests connection management.
  */
 class DatabaseConnectionTestCase extends DatabaseTestCase {
 
@@ -191,7 +191,7 @@
   }
 
   /**
+   * Test that connections return appropriate connection objects.
-   * Tests that connections return appropriate connection objects.
    */
   function testConnectionRouting() {
     // Clone the master credentials to a slave connection.
@@ -225,7 +225,7 @@
   }
 
   /**
+   * Test that connections return appropriate connection objects.
-   * Tests that connections return appropriate connection objects.
    */
   function testConnectionRoutingOverride() {
     // Clone the master credentials to a slave connection.
@@ -294,7 +294,7 @@
 }
 
 /**
+ * Test fetch actions, part 1.
- * Tests fetch actions, part 1.
  *
  * We get timeout errors if we try to run too many tests at once.
  */
@@ -309,7 +309,7 @@
   }
 
   /**
+   * Confirm that we can fetch a record properly in default object mode.
-   * Confirms that we can fetch a record properly in default object mode.
    */
   function testQueryFetchDefault() {
     $records = array();
@@ -325,7 +325,7 @@
   }
 
   /**
+   * Confirm that we can fetch a record to an object explicitly.
-   * Confirms that we can fetch a record to an object explicitly.
    */
   function testQueryFetchObject() {
     $records = array();
@@ -340,7 +340,7 @@
   }
 
   /**
+   * Confirm that we can fetch a record to an array associative explicitly.
-   * Confirms that we can fetch a record to an array associative explicitly.
    */
   function testQueryFetchArray() {
     $records = array();
@@ -356,7 +356,7 @@
   }
 
   /**
+   * Confirm that we can fetch a record into a new instance of a custom class.
-   * Confirms that we can fetch a record into a new instance of a custom class.
    *
    * @see FakeRecord
    */
@@ -375,7 +375,7 @@
 }
 
 /**
+ * Test fetch actions, part 2.
- * Tests fetch actions, part 2.
  *
  * We get timeout errors if we try to run too many tests at once.
  */
@@ -389,7 +389,7 @@
     );
   }
 
+  // Confirm that we can fetch a record into an indexed array explicitly.
-  // Confirms that we can fetch a record into an indexed array explicitly.
   function testQueryFetchNum() {
     $records = array();
     $result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25), array('fetch' => PDO::FETCH_NUM));
@@ -404,7 +404,7 @@
   }
 
   /**
+   * Confirm that we can fetch a record into a doubly-keyed array explicitly.
-   * Confirms that we can fetch a record into a doubly-keyed array explicitly.
    */
   function testQueryFetchBoth() {
     $records = array();
@@ -421,7 +421,7 @@
   }
 
   /**
+   * Confirm that we can fetch an entire column of a result set at once.
-   * Confirms that we can fetch an entire column of a result set at once.
    */
   function testQueryFetchCol() {
     $records = array();
@@ -438,7 +438,7 @@
 }
 
 /**
+ * Test the insert builder.
- * Tests the insert builder.
  */
 class DatabaseInsertTestCase extends DatabaseTestCase {
 
@@ -451,7 +451,7 @@
   }
 
   /**
+   * Test the very basic insert functionality.
-   * Tests the very basic insert functionality.
    */
   function testSimpleInsert() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
@@ -470,7 +470,7 @@
   }
 
   /**
+   * Test that we can insert multiple records in one query object.
-   * Tests that we can insert multiple records in one query object.
    */
   function testMultiInsert() {
     $num_records_before = (int) db_query('SELECT COUNT(*) FROM {test}')->fetchField();
@@ -503,7 +503,7 @@
   }
 
   /**
+   * Test that an insert object can be reused with new data after it executes.
-   * Tests that an insert object can be reused with new data after it executes.
    */
   function testRepeatedInsert() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
@@ -538,7 +538,7 @@
   }
 
   /**
+   * Test that we can specify fields without values and specify values later.
-   * Tests that we can specify fields without values and specify values later.
    */
   function testInsertFieldOnlyDefinintion() {
     // This is useful for importers, when we want to create a query and define
@@ -572,7 +572,7 @@
   }
 
   /**
+   * Test that the INSERT INTO ... SELECT ... syntax works.
-   * Tests that the INSERT INTO ... SELECT ... syntax works.
    */
   function testInsertSelect() {
     $query = db_select('test_people', 'tp');
@@ -599,7 +599,7 @@
 }
 
 /**
+ * Insert tests using LOB fields, which are weird on some databases.
- * Inserts tests using LOB fields, which are weird on some databases.
  */
 class DatabaseInsertLOBTestCase extends DatabaseTestCase {
 
@@ -612,7 +612,7 @@
   }
 
   /**
+   * Test that we can insert a single blob field successfully.
-   * Tests that we can insert a single blob field successfully.
    */
   function testInsertOneBlob() {
     $data = "This is\000a test.";
@@ -625,7 +625,7 @@
   }
 
   /**
+   * Test that we can insert multiple blob fields in the same query.
-   * Tests that we can insert multiple blob fields in the same query.
    */
   function testInsertMultipleBlob() {
     $id = db_insert('test_two_blobs')
@@ -640,7 +640,7 @@
 }
 
 /**
+ * Insert tests for "database default" values.
- * Inserts tests for "database default" values.
  */
 class DatabaseInsertDefaultsTestCase extends DatabaseTestCase {
 
@@ -653,7 +653,7 @@
   }
 
   /**
+   * Test that we can run a query that is "default values for everything".
-   * Tests that we can run a query that is "default values for everything".
    */
   function testDefaultInsert() {
     $query = db_insert('test')->useDefaults(array('job'));
@@ -666,7 +666,7 @@
   }
 
   /**
+   * Test that no action will be preformed if no fields are specified.
-   * Tests that no action will be preformed if no fields are specified.
    */
   function testDefaultEmptyInsert() {
     $num_records_before = (int) db_query('SELECT COUNT(*) FROM {test}')->fetchField();
@@ -684,7 +684,7 @@
   }
 
   /**
+   * Test that we can insert fields with values and defaults in the same query.
-   * Tests that we can insert fields with values and defaults in the same query.
    */
   function testDefaultInsertWithFields() {
     $query = db_insert('test')
@@ -700,7 +700,7 @@
 }
 
 /**
+ * Update builder tests.
- * Updates builder tests.
  */
 class DatabaseUpdateTestCase extends DatabaseTestCase {
 
@@ -713,7 +713,7 @@
   }
 
   /**
+   * Confirm that we can update a single record successfully.
-   * Confirms that we can update a single record successfully.
    */
   function testSimpleUpdate() {
     $num_updated = db_update('test')
@@ -727,7 +727,7 @@
   }
 
   /**
+   * Confirm updating to NULL.
-   * Confirms updating to NULL.
    */
   function testSimpleNullUpdate() {
     $this->ensureSampleDataNull();
@@ -742,7 +742,7 @@
   }
 
   /**
+   * Confirm that we can update a multiple records successfully.
-   * Confirms that we can update a multiple records successfully.
    */
   function testMultiUpdate() {
     $num_updated = db_update('test')
@@ -756,7 +756,7 @@
   }
 
   /**
+   * Confirm that we can update a multiple records with a non-equality condition.
-   * Confirms that we can update a multiple records with a non-equality condition.
    */
   function testMultiGTUpdate() {
     $num_updated = db_update('test')
@@ -770,7 +770,7 @@
   }
 
   /**
+   * Confirm that we can update a multiple records with a where call.
-   * Confirms that we can update a multiple records with a where call.
    */
   function testWhereUpdate() {
     $num_updated = db_update('test')
@@ -784,7 +784,7 @@
   }
 
   /**
+   * Confirm that we can stack condition and where calls.
-   * Confirms that we can stack condition and where calls.
    */
   function testWhereAndConditionUpdate() {
     $update = db_update('test')
@@ -799,7 +799,7 @@
   }
 
   /**
+   * Test updating with expressions.
-   * Tests updating with expressions.
    */
   function testExpressionUpdate() {
     // Set age = 1 for a single row for this test to work.
@@ -833,7 +833,7 @@
   }
 
   /**
+   * Test updates with OR conditionals.
-   * Tests updates with OR conditionals.
    */
   function testOrConditionUpdate() {
     $update = db_update('test')
@@ -850,7 +850,7 @@
   }
 
   /**
+   * Test WHERE IN clauses.
-   * Tests WHERE IN clauses.
    */
   function testInConditionUpdate() {
     $num_updated = db_update('test')
@@ -864,7 +864,7 @@
   }
 
   /**
+   * Test WHERE NOT IN clauses.
-   * Tests WHERE NOT IN clauses.
    */
   function testNotInConditionUpdate() {
     // The o is lowercase in the 'NoT IN' operator, to make sure the operators
@@ -880,7 +880,7 @@
   }
 
   /**
+   * Test BETWEEN conditional clauses.
-   * Tests BETWEEN conditional clauses.
    */
   function testBetweenConditionUpdate() {
     $num_updated = db_update('test')
@@ -894,7 +894,7 @@
   }
 
   /**
+   * Test LIKE conditionals.
-   * Tests LIKE conditionals.
    */
   function testLikeConditionUpdate() {
     $num_updated = db_update('test')
@@ -908,7 +908,7 @@
   }
 
   /**
+   * Test update with expression values.
-   * Tests update with expression values.
    */
   function testUpdateExpression() {
     $before_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetchField();
@@ -931,7 +931,7 @@
   }
 
   /**
+   * Test update with only expression values.
-   * Tests update with only expression values.
    */
   function testUpdateOnlyExpression() {
     $before_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetchField();
@@ -947,7 +947,7 @@
 }
 
 /**
+ * Test update queries involving LOB values.
- * Tests update queries involving LOB values.
  */
 class DatabaseUpdateLOBTestCase extends DatabaseTestCase {
 
@@ -960,7 +960,7 @@
   }
 
   /**
+   * Confirm that we can update a blob column.
-   * Confirms that we can update a blob column.
    */
   function testUpdateOneBlob() {
     $data = "This is\000a test.";
@@ -980,7 +980,7 @@
   }
 
   /**
+   * Confirm that we can update two blob columns in the same table.
-   * Confirms that we can update two blob columns in the same table.
    */
   function testUpdateMultipleBlob() {
     $id = db_insert('test_two_blobs')
@@ -1001,7 +1001,7 @@
 }
 
 /**
+ * Delete/Truncate tests.
- * Deletes/Truncates tests.
  *
  * The DELETE tests are not as extensive, as all of the interesting code for
  * DELETE queries is in the conditional which is identical to the UPDATE and
@@ -1022,7 +1022,7 @@
   }
 
   /**
+   * Confirm that we can use a subselect in a delete successfully.
-   * Confirms that we can use a subselect in a delete successfully.
    */
   function testSubselectDelete() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_task}')->fetchField();
@@ -1043,7 +1043,7 @@
   }
 
   /**
+   * Confirm that we can delete a single record successfully.
-   * Confirms that we can delete a single record successfully.
    */
   function testSimpleDelete() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
@@ -1058,7 +1058,7 @@
   }
 
   /**
+   * Confirm that we can truncate a whole table successfully.
-   * Confirms that we can truncate a whole table successfully.
    */
   function testTruncate() {
     $num_records_before = db_query("SELECT COUNT(*) FROM {test}")->fetchField();
@@ -1071,7 +1071,7 @@
 }
 
 /**
+ * Test the MERGE query builder.
- * Tests the MERGE query builder.
  */
 class DatabaseMergeTestCase extends DatabaseTestCase {
 
@@ -1084,7 +1084,7 @@
   }
 
   /**
+   * Confirm that we can merge-insert a record successfully.
-   * Confirms that we can merge-insert a record successfully.
    */
   function testMergeInsert() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
@@ -1109,7 +1109,7 @@
   }
 
   /**
+   * Confirm that we can merge-update a record successfully.
-   * Confirms that we can merge-update a record successfully.
    */
   function testMergeUpdate() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
@@ -1134,7 +1134,7 @@
   }
 
   /**
+   * Confirm that we can merge-update a record successfully, with different insert and update.
-   * Confirms that we can merge-update a record successfully, with different insert and update.
    */
   function testMergeUpdateExcept() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
@@ -1155,7 +1155,7 @@
   }
 
   /**
+   * Confirm that we can merge-update a record successfully, with alternate replacement.
-   * Confirms that we can merge-update a record successfully, with alternate replacement.
    */
   function testMergeUpdateExplicit() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
@@ -1181,7 +1181,7 @@
   }
 
   /**
+   * Confirm that we can merge-update a record successfully, with expressions.
-   * Confirms that we can merge-update a record successfully, with expressions.
    */
   function testMergeUpdateExpression() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
@@ -1210,7 +1210,7 @@
   }
 
   /**
+   * Test that we can merge-insert without any update fields.
-   * Tests that we can merge-insert without any update fields.
    */
   function testMergeInsertWithoutUpdate() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
@@ -1229,7 +1229,7 @@
   }
 
   /**
+   * Confirm that we can merge-update without any update fields.
-   * Confirms that we can merge-update without any update fields.
    */
   function testMergeUpdateWithoutUpdate() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
@@ -1261,7 +1261,7 @@
   }
 
   /**
+   * Test that an invalid merge query throws an exception like it is supposed to.
-   * Tests that an invalid merge query throws an exception like it is supposed to.
    */
   function testInvalidMerge() {
     try {
@@ -1282,7 +1282,7 @@
 }
 
 /**
+ * Test the SELECT builder.
- * Tests the SELECT builder.
  */
 class DatabaseSelectTestCase extends DatabaseTestCase {
 
@@ -1295,7 +1295,7 @@
   }
 
   /**
+   * Test rudimentary SELECT statements.
-   * Tests rudimentary SELECT statements.
    */
   function testSimpleSelect() {
     $query = db_select('test');
@@ -1312,7 +1312,7 @@
   }
 
   /**
+   * Test rudimentary SELECT statement with a COMMENT.
-   * Tests rudimentary SELECT statement with a COMMENT.
    */
   function testSimpleComment() {
     $query = db_select('test')->comment('Testing query comments');
@@ -1333,7 +1333,7 @@
   }
 
   /**
+   * Test query COMMENT system against vulnerabilities.
-   * Tests query COMMENT system against vulnerabilities.
    */
   function testVulnerableComment() {
     $query = db_select('test')->comment('Testing query comments */ SELECT nid FROM {node}; --');
@@ -1354,7 +1354,7 @@
   }
 
   /**
+   * Test basic conditionals on SELECT statements.
-   * Tests basic conditionals on SELECT statements.
    */
   function testSimpleSelectConditional() {
     $query = db_select('test');
@@ -1374,7 +1374,7 @@
   }
 
   /**
+   * Test SELECT statements with expressions.
-   * Tests SELECT statements with expressions.
    */
   function testSimpleSelectExpression() {
     $query = db_select('test');
@@ -1394,7 +1394,7 @@
   }
 
   /**
+   * Test SELECT statements with multiple expressions.
-   * Tests SELECT statements with multiple expressions.
    */
   function testSimpleSelectExpressionMultiple() {
     $query = db_select('test');
@@ -1416,7 +1416,7 @@
   }
 
   /**
+   * Test adding multiple fields to a select statement at the same time.
-   * Tests adding multiple fields to a select statement at the same time.
    */
   function testSimpleSelectMultipleFields() {
     $record = db_select('test')
@@ -1439,7 +1439,7 @@
   }
 
   /**
+   * Test adding all fields from a given table to a select statement.
-   * Tests adding all fields from a given table to a select statement.
    */
   function testSimpleSelectAllFields() {
     $record = db_select('test')
@@ -1462,7 +1462,7 @@
   }
 
   /**
+   * Test that a comparison with NULL is always FALSE.
-   * Tests that a comparison with NULL is always FALSE.
    */
   function testNullCondition() {
     $this->ensureSampleDataNull();
@@ -1476,7 +1476,7 @@
   }
 
   /**
+   * Test that we can find a record with a NULL value.
-   * Tests that we can find a record with a NULL value.
    */
   function testIsNullCondition() {
     $this->ensureSampleDataNull();
@@ -1491,7 +1491,7 @@
   }
 
   /**
+   * Test that we can find a record without a NULL value.
-   * Tests that we can find a record without a NULL value.
    */
   function testIsNotNullCondition() {
     $this->ensureSampleDataNull();
@@ -1508,7 +1508,7 @@
   }
 
   /**
+   * Test that we can UNION multiple Select queries together. This is
-   * Tests that we can UNION multiple Select queries together. This is
    * semantically equal to UNION DISTINCT, so we don't explicity test that.
    */
   function testUnion() {
@@ -1532,7 +1532,7 @@
   }
 
   /**
+   * Test that we can UNION ALL multiple Select queries together.
-   * Tests that we can UNION ALL multiple Select queries together.
    */
   function testUnionAll() {
     $query_1 = db_select('test', 't')
@@ -1556,7 +1556,7 @@
   }
 
   /**
+   * Test that random ordering of queries works.
-   * Tests that random ordering of queries works.
    *
    * We take the approach of testing the Drupal layer only, rather than trying
    * to test that the database's random number generator actually produces
@@ -1618,7 +1618,7 @@
   }
 
   /**
+   * Test that aliases are renamed when duplicates.
-   * Tests that aliases are renamed when duplicates.
    */
   function testSelectDuplicateAlias() {
     $query = db_select('test', 't');
@@ -1629,7 +1629,7 @@
 }
 
 /**
+ * Test case for subselects in a dynamic SELECT query.
- * Tests case for subselects in a dynamic SELECT query.
  */
 class DatabaseSelectSubqueryTestCase extends DatabaseTestCase {
 
@@ -1642,7 +1642,7 @@
   }
 
   /**
+   * Test that we can use a subquery in a FROM clause.
-   * Tests that we can use a subquery in a FROM clause.
    */
   function testFromSubquerySelect() {
     // Create a subquery, which is just a normal query object.
@@ -1676,7 +1676,7 @@
   }
 
   /**
+   * Test that we can use a subquery in a FROM clause with a limit.
-   * Tests that we can use a subquery in a FROM clause with a limit.
    */
   function testFromSubquerySelectWithLimit() {
     // Create a subquery, which is just a normal query object.
@@ -1702,7 +1702,7 @@
   }
 
   /**
+   * Test that we can use a subquery in a WHERE clause.
-   * Tests that we can use a subquery in a WHERE clause.
    */
   function testConditionSubquerySelect() {
     // Create a subquery, which is just a normal query object.
@@ -1725,7 +1725,7 @@
   }
 
   /**
+   * Test that we can use a subquery in a JOIN clause.
-   * Tests that we can use a subquery in a JOIN clause.
    */
   function testJoinSubquerySelect() {
     // Create a subquery, which is just a normal query object.
@@ -1749,7 +1749,7 @@
   }
 
   /**
+   * Test EXISTS subquery conditionals on SELECT statements.
-   * Tests EXISTS subquery conditionals on SELECT statements.
    *
    * We essentially select all rows from the {test} table that have matching
    * rows in the {test_people} table based on the shared name column.
@@ -1779,7 +1779,7 @@
   }
 
   /**
+   * Test NOT EXISTS subquery conditionals on SELECT statements.
-   * Tests NOT EXISTS subquery conditionals on SELECT statements.
    *
    * We essentially select all rows from the {test} table that don't have
    * matching rows in the {test_people} table based on the shared name column.
@@ -1810,7 +1810,7 @@
 }
 
 /**
+ * Test select with order by clauses.
- * Tests select with order by clauses.
  */
 class DatabaseSelectOrderedTestCase extends DatabaseTestCase {
 
@@ -1823,7 +1823,7 @@
   }
 
   /**
+   * Test basic order by.
-   * Tests basic order by.
    */
   function testSimpleSelectOrdered() {
     $query = db_select('test');
@@ -1844,7 +1844,7 @@
   }
 
   /**
+   * Test multiple order by.
-   * Tests multiple order by.
    */
   function testSimpleSelectMultiOrdered() {
     $query = db_select('test');
@@ -1875,7 +1875,7 @@
   }
 
   /**
+   * Test order by descending.
-   * Tests order by descending.
    */
   function testSimpleSelectOrderedDesc() {
     $query = db_select('test');
@@ -1897,7 +1897,7 @@
 }
 
 /**
+ * Test more complex select statements.
- * Tests more complex select statements.
  */
 class DatabaseSelectComplexTestCase extends DatabaseTestCase {
 
@@ -1910,7 +1910,7 @@
   }
 
   /**
+   * Test simple JOIN statements.
-   * Tests simple JOIN statements.
    */
   function testDefaultJoin() {
     $query = db_select('test_task', 't');
@@ -1935,7 +1935,7 @@
   }
 
   /**
+   * Test LEFT OUTER joins.
-   * Tests LEFT OUTER joins.
    */
   function testLeftOuterJoin() {
     $query = db_select('test', 'p');
@@ -1960,7 +1960,7 @@
   }
 
   /**
+   * Test GROUP BY clauses.
-   * Tests GROUP BY clauses.
    */
   function testGroupBy() {
     $query = db_select('test_task', 't');
@@ -1996,7 +1996,7 @@
   }
 
   /**
+   * Test GROUP BY and HAVING clauses together.
-   * Tests GROUP BY and HAVING clauses together.
    */
   function testGroupByAndHaving() {
     $query = db_select('test_task', 't');
@@ -2030,7 +2030,7 @@
   }
 
   /**
+   * Test range queries. The SQL clause varies with the database.
-   * Tests range queries. The SQL clause varies with the database.
    */
   function testRange() {
     $query = db_select('test');
@@ -2048,7 +2048,7 @@
   }
 
   /**
+   * Test distinct queries.
-   * Tests distinct queries.
    */
   function testDistinct() {
     $query = db_select('test_task');
@@ -2065,7 +2065,7 @@
   }
 
   /**
+   * Test that we can generate a count query from a built query.
-   * Tests that we can generate a count query from a built query.
    */
   function testCountQuery() {
     $query = db_select('test');
@@ -2096,7 +2096,7 @@
   }
 
   /**
+   * Test that countQuery properly removes 'all_fields' statements and
-   * Tests that countQuery properly removes 'all_fields' statements and
    * ordering clauses.
    */
   function testCountQueryRemovals() {
@@ -2125,7 +2125,7 @@
 
 
   /**
+   * Test that countQuery properly removes fields and expressions.
-   * Tests that countQuery properly removes fields and expressions.
    */
   function testCountQueryFieldRemovals() {
     // countQuery should remove all fields and expressions, so this can be
@@ -2143,7 +2143,7 @@
   }
 
   /**
+   * Test that we can generate a count query from a query with distinct.
-   * Tests that we can generate a count query from a query with distinct.
    */
   function testCountQueryDistinct() {
     $query = db_select('test_task');
@@ -2156,7 +2156,7 @@
   }
 
   /**
+   * Test that we can generate a count query from a query with GROUP BY.
-   * Tests that we can generate a count query from a query with GROUP BY.
    */
   function testCountQueryGroupBy() {
     $query = db_select('test_task');
@@ -2181,7 +2181,7 @@
   }
 
   /**
+   * Confirm that we can properly nest conditional clauses.
-   * Confirms that we can properly nest conditional clauses.
    */
   function testNestedConditions() {
     // This query should translate to:
@@ -2198,7 +2198,7 @@
   }
 
   /**
+   * Confirm we can join on a single table twice with a dynamic alias.
-   * Confirms we can join on a single table twice with a dynamic alias.
    */
   function testJoinTwice() {
     $query = db_select('test')->fields('test');
@@ -2214,7 +2214,7 @@
 }
 
 /**
+ * Test more complex select statements, part 2.
- * Tests more complex select statements, part 2.
  */
 class DatabaseSelectComplexTestCase2 extends DatabaseTestCase {
 
@@ -2231,7 +2231,7 @@
   }
 
   /**
+   * Test that we can join on a query.
-   * Tests that we can join on a query.
    */
   function testJoinSubquery() {
     $acct = $this->drupalCreateUser();
@@ -2267,9 +2267,6 @@
   }
 }
 
-/**
- * Selects the database pager.
- */
 class DatabaseSelectPagerDefaultTestCase extends DatabaseTestCase {
 
   public static function getInfo() {
@@ -2281,7 +2278,7 @@
   }
 
   /**
+   * Confirm that a pager query returns the correct results.
-   * Confirms that a pager query returns the correct results.
    *
    * Note that we have to make an HTTP request to a test page handler
    * because the pager depends on GET parameters.
@@ -2315,7 +2312,7 @@
   }
 
   /**
+   * Confirm that a pager query returns the correct results.
-   * Confirms that a pager query returns the correct results.
    *
    * Note that we have to make an HTTP request to a test page handler
    * because the pager depends on GET parameters.
@@ -2349,7 +2346,7 @@
   }
 
   /**
+   * Confirm that a pager query with inner pager query returns valid results.
-   * Confirms that a pager query with inner pager query returns valid results.
    *
    * This is a regression test for #467984.
    */
@@ -2370,7 +2367,7 @@
   }
 
   /**
+   * Confirm that a paging query with a having expression returns valid results.
-   * Confirms that a paging query with a having expression returns valid results.
    *
    * This is a regression test for #467984.
    */
@@ -2390,7 +2387,7 @@
   }
 
   /**
+   * Confirm that every pager gets a valid non-overlaping element ID.
-   * Confirms that every pager gets a valid non-overlaping element ID.
    */
   function testElementNumbers() {
     $_GET['page'] = '3, 2, 1, 0';
@@ -2427,9 +2424,7 @@
   }
 }
 
+
-/**
- * Tests the table sort query.
- */
 class DatabaseSelectTableSortDefaultTestCase extends DatabaseTestCase {
 
   public static function getInfo() {
@@ -2441,7 +2436,7 @@
   }
 
   /**
+   * Confirm that a tablesort query returns the correct results.
-   * Confirms that a tablesort query returns the correct results.
    *
    * Note that we have to make an HTTP request to a test page handler
    * because the pager depends on GET parameters.
@@ -2469,8 +2464,8 @@
   }
 
   /**
+   * Confirm that if a tablesort's orderByHeader is called before another orderBy, that the header happens first.
+   *
-   * Confirms that if a tablesort's orderByHeader is called before another
-   * orderBy, that the header happens first.
    */
   function testTableSortQueryFirst() {
     $sorts = array(
@@ -2495,8 +2490,7 @@
   }
 
   /**
+   * Confirm that if a sort is not set in a tableselect form there is no error thrown when using the default.
-   * Confirms that if a sort is not set in a tableselect form there is no error
-   * thrown when using the default.
    */
   function testTableSortDefaultSort() {
     $this->drupalGet('database_test/tablesort_default_sort');
@@ -2506,7 +2500,7 @@
 }
 
 /**
+ * Select tagging tests.
- * Selects tagging tests.
  *
  * Tags are a way to flag queries for alter hooks so they know
  * what type of query it is, such as "node_access".
@@ -2522,7 +2516,7 @@
   }
 
   /**
+   * Confirm that a query has a "tag" added to it.
-   * Confirms that a query has a "tag" added to it.
    */
   function testHasTag() {
     $query = db_select('test');
@@ -2536,7 +2530,7 @@
   }
 
   /**
+   * Test query tagging "has all of these tags" functionality.
-   * Tests query tagging "has all of these tags" functionality.
    */
   function testHasAllTags() {
     $query = db_select('test');
@@ -2551,7 +2545,7 @@
   }
 
   /**
+   * Test query tagging "has at least one of these tags" functionality.
-   * Tests query tagging "has at least one of these tags" functionality.
    */
   function testHasAnyTag() {
     $query = db_select('test');
@@ -2565,7 +2559,7 @@
   }
 
   /**
+   * Test that we can attach meta data to a query object.
-   * Tests that we can attach meta data to a query object.
    *
    * This is how we pass additional context to alter hooks.
    */
@@ -2590,7 +2584,7 @@
 }
 
 /**
+ * Select alter tests.
- * Selects alter tests.
  *
  * @see database_test_query_alter()
  */
@@ -2605,7 +2599,7 @@
   }
 
   /**
+   * Test that we can do basic alters.
-   * Tests that we can do basic alters.
    */
   function testSimpleAlter() {
     $query = db_select('test');
@@ -2624,7 +2618,7 @@
   }
 
   /**
+   * Test that we can alter the joins on a query.
-   * Tests that we can alter the joins on a query.
    */
   function testAlterWithJoin() {
     $query = db_select('test_task');
@@ -2648,7 +2642,7 @@
   }
 
   /**
+   * Test that we can alter a query's conditionals.
-   * Tests that we can alter a query's conditionals.
    */
   function testAlterChangeConditional() {
     $query = db_select('test_task');
@@ -2673,7 +2667,7 @@
   }
 
   /**
+   * Test that we can alter the fields of a query.
-   * Tests that we can alter the fields of a query.
    */
   function testAlterChangeFields() {
     $query = db_select('test');
@@ -2688,7 +2682,7 @@
   }
 
   /**
+   * Test that we can alter expressions in the query.
-   * Tests that we can alter expressions in the query.
    */
   function testAlterExpression() {
     $query = db_select('test');
@@ -2706,7 +2700,7 @@
   }
 
   /**
+   * Test that we can remove a range() value from a query. This also tests hook_query_TAG_alter().
-   * Tests that we can remove a range() value from a query. This also tests hook_query_TAG_alter().
    */
   function testAlterRemoveRange() {
     $query = db_select('test');
@@ -2721,7 +2715,7 @@
   }
 
   /**
+   * Test that we can do basic alters on subqueries.
-   * Tests that we can do basic alters on subqueries.
    */
   function testSimpleAlterSubquery() {
     // Create a sub-query with an alter tag.
@@ -2747,7 +2741,7 @@
 }
 
 /**
+ * Regression tests.
- * Tests regressions.
  */
 class DatabaseRegressionTestCase extends DatabaseTestCase {
 
@@ -2764,7 +2758,7 @@
   }
 
   /**
+   * Regression test for #310447.
-   * Tests regression for #310447.
    *
    * Tries to insert non-ascii UTF-8 data in a database column and checks
    * if its stored properly.
@@ -2784,7 +2778,7 @@
   }
 
   /**
+   * Test the db_table_exists() function.
-   * Tests the db_table_exists() function.
    */
   function testDBTableExists() {
     $this->assertIdentical(TRUE, db_table_exists('node'), t('Returns true for existent table.'));
@@ -2792,7 +2786,7 @@
   }
 
   /**
+   * Test the db_field_exists() function.
-   * Tests the db_field_exists() function.
    */
   function testDBFieldExists() {
     $this->assertIdentical(TRUE, db_field_exists('node', 'nid'), t('Returns true for existent column.'));
@@ -2800,7 +2794,7 @@
   }
 
   /**
+   * Test the db_index_exists() function.
-   * Tests the db_index_exists() function.
    */
   function testDBIndexExists() {
     $this->assertIdentical(TRUE, db_index_exists('node', 'node_created'), t('Returns true for existent index.'));
@@ -2809,7 +2803,7 @@
 }
 
 /**
+ * Query logging tests.
- * Tests query logging.
  */
 class DatabaseLoggingTestCase extends DatabaseTestCase {
 
@@ -2822,7 +2816,7 @@
   }
 
   /**
+   * Test that we can log the existence of a query.
-   * Tests that we can log the existence of a query.
    */
   function testEnableLogging() {
     Database::startLog('testing');
@@ -2840,7 +2834,7 @@
   }
 
   /**
+   * Test that we can run two logs in parallel.
-   * Tests that we can run two logs in parallel.
    */
   function testEnableMultiLogging() {
     Database::startLog('testing1');
@@ -2859,7 +2853,7 @@
   }
 
   /**
+   * Test that we can log queries against multiple targets on the same connection.
-   * Tests that we can log queries against multiple targets on the same connection.
    */
   function testEnableTargetLogging() {
     // Clone the master credentials to a slave connection and to another fake
@@ -2881,7 +2875,7 @@
   }
 
   /**
+   * Test that logs to separate targets collapse to the same connection properly.
-   * Tests that logs to separate targets collapse to the same connection properly.
    *
    * This test is identical to the one above, except that it doesn't create
    * a fake target so the query should fall back to running on the default
@@ -2907,7 +2901,7 @@
   }
 
   /**
+   * Test that we can log queries separately on different connections.
-   * Tests that we can log queries separately on different connections.
    */
   function testEnableMultiConnectionLogging() {
     // Clone the master credentials to a fake connection.
@@ -2935,7 +2929,7 @@
 }
 
 /**
+ * Query serialization tests.
- * Querys serialization tests.
  */
 class DatabaseSerializeQueryTestCase extends DatabaseTestCase {
   public static function getInfo() {
@@ -2947,7 +2941,7 @@
   }
 
   /**
+   * Confirm that a query can be serialized and unserialized.
-   * Confirms that a query can be serialized and unserialized.
    */
   function testSerializeQuery() {
     $query = db_select('test');
@@ -2962,7 +2956,7 @@
 }
 
 /**
+ * Range query tests.
- * Ranges query tests.
  */
 class DatabaseRangeQueryTestCase extends DrupalWebTestCase {
   public static function getInfo() {
@@ -2978,7 +2972,7 @@
   }
 
   /**
+   * Confirm that range query work and return correct result.
-   * Confirms that range query work and return correct result.
    */
   function testRangeQuery() {
     // Test if return correct number of rows.
@@ -2993,7 +2987,7 @@
 }
 
 /**
+ * Temporary query tests.
- * Tests temporary queries.
  */
 class DatabaseTemporaryQueryTestCase extends DrupalWebTestCase {
   public static function getInfo() {
@@ -3009,14 +3003,14 @@
   }
 
   /**
+   * Return the number of rows of a table.
-   * Returns the number of rows of a table.
    */
   function countTableRows($table_name) {
     return db_select($table_name)->countQuery()->execute()->fetchField();
   }
 
   /**
+   * Confirm that temporary tables work and are limited to one request.
-   * Confirms that temporary tables work and are limited to one request.
    */
   function testTemporaryQuery() {
     $this->drupalGet('database_test/db_query_temporary');
@@ -3039,7 +3033,7 @@
 }
 
 /**
+ * Test how the current database driver interprets the SQL syntax.
- * Tests how the current database driver interprets the SQL syntax.
  *
  * In order to ensure consistent SQL handling throughout Drupal
  * across multiple kinds of database systems, we test that the
@@ -3055,7 +3049,7 @@
   }
 
   /**
+   * Test for string concatenation.
-   * Tests for string concatenation.
    */
   function testBasicConcat() {
     $result = db_query('SELECT CONCAT(:a1, CONCAT(:a2, CONCAT(:a3, CONCAT(:a4, :a5))))', array(
@@ -3069,7 +3063,7 @@
   }
 
   /**
+   * Test for string concatenation with field values.
-   * Tests for string concatenation with field values.
    */
   function testFieldConcat() {
     $result = db_query('SELECT CONCAT(:a1, CONCAT(name, CONCAT(:a2, CONCAT(age, :a3)))) FROM {test} WHERE age = :age', array(
@@ -3082,7 +3076,7 @@
   }
 
   /**
+   * Test escaping of LIKE wildcards.
-   * Tests escaping of LIKE wildcards.
    */
   function testLikeEscape() {
     db_insert('test')
@@ -3108,7 +3102,7 @@
   }
 
   /**
+   * Test LIKE query containing a backslash.
-   * Tests LIKE query containing a backslash.
    */
   function testLikeBackslash() {
     db_insert('test')
@@ -3140,7 +3134,7 @@
 }
 
 /**
+ * Test invalid data handling.
- * Tests invalid data handling.
  */
 class DatabaseInvalidDataTestCase extends DatabaseTestCase {
   public static function getInfo() {
@@ -3152,8 +3146,7 @@
   }
 
   /**
+   * Traditional SQL database systems abort inserts when invalid data is encountered.
-   * Traditional SQL database systems abort inserts when invalid data is
-   * encountered.
    */
   function testInsertDuplicateData() {
     // Try to insert multiple records where at least one has bad data.
@@ -3210,7 +3203,7 @@
 }
 
 /**
+ * Drupal-specific SQL syntax tests.
- * Tests Drupal-specific SQL syntax.
  */
 class DatabaseQueryTestCase extends DatabaseTestCase {
   public static function getInfo() {
@@ -3222,7 +3215,7 @@
   }
 
   /**
+   * Test that we can specify an array of values in the query by simply passing in an array.
-   * Tests that we can specify an array of values in the query by simply passing in an array.
    */
   function testArraySubstitution() {
     $names = db_query('SELECT name FROM {test} WHERE age IN (:ages) ORDER BY age', array(':ages' => array(25, 26, 27)))->fetchAll();
@@ -3232,7 +3225,7 @@
 }
 
 /**
+ * Test transaction support, particularly nesting.
- * Tests transaction support, particularly nesting.
  *
  * We test nesting by having two transaction layers, an outer and inner. The
  * outer layer encapsulates the inner layer. Our transaction nesting abstraction
@@ -3262,12 +3255,12 @@
   }
 
   /**
+   * Helper method for transaction unit test. This "outer layer" transaction
+   * starts and then encapsulates the "inner layer" transaction. This nesting
+   * is used to evaluate whether the the database transaction API properly
+   * supports nesting. By "properly supports," we mean the outer transaction
+   * continues to exist regardless of what functions are called and whether
+   * those functions start their own transactions.
-   * This is a helper method for transaction unit tests. This "outer layer"
-   * transaction starts and then encapsulates the "inner layer" transaction.
-   * This nesting is used to evaluate whether the the database transaction API
-   * properly supports nesting. By "properly supports," we mean the outer
-   * transaction continues to exist regardless of what functions are called
-   * and whether those functions start their own transactions.
    *
    * In contrast, a typical database would commit the outer transaction, start
    * a new transaction for the inner layer, commit the inner layer transaction,
@@ -3370,7 +3363,7 @@
   }
 
   /**
+   * Test transaction rollback on a database that supports transactions.
-   * Tests transaction rollback on a database that supports transactions.
    *
    * If the active connection does not support transactions, this test does nothing.
    */
@@ -3396,7 +3389,7 @@
   }
 
   /**
+   * Test transaction rollback on a database that does not support transactions.
-   * Tests transaction rollback on a database that does not support transactions.
    *
    * If the active driver supports transactions, this test does nothing.
    */
@@ -3422,7 +3415,7 @@
   }
 
   /**
+   * Test committed transaction.
-   * Tests committed transaction.
    *
    * The behavior of this test should be identical for connections that support
    * transactions and those that do not.
@@ -3444,7 +3437,7 @@
   }
 
   /**
+   * Test the compatibility of transactions with DDL statements.
-   * Tests the compatibility of transactions with DDL statements.
    */
   function testTransactionWithDdlStatement() {
     // First, test that a commit works normally, even with DDL statements.
@@ -3535,7 +3528,7 @@
   }
 
   /**
+   * Insert a single row into the testing table.
-   * Inserts a single row into the testing table.
    */
   protected function insertRow($name) {
     db_insert('test')
@@ -3546,7 +3539,7 @@
   }
 
   /**
+   * Execute a DDL statement.
-   * Executes a DDL statement.
    */
   protected function executeDDLStatement() {
     static $count = 0;
@@ -3564,7 +3557,7 @@
   }
 
   /**
+   * Start over for a new test.
-   * Starts over for a new test.
    */
   protected function cleanUp() {
     db_truncate('test')
@@ -3572,7 +3565,7 @@
   }
 
   /**
+   * Assert that a given row is present in the test table.
-   * Asserts that a given row is present in the test table.
    *
    * @param $name
    *   The name of the row.
@@ -3588,7 +3581,7 @@
   }
 
   /**
+   * Assert that a given row is absent from the test table.
-   * Asserts that a given row is absent from the test table.
    *
    * @param $name
    *   The name of the row.
@@ -3604,7 +3597,7 @@
   }
 
   /**
+   * Test transaction stacking and commit / rollback.
-   * Tests transaction stacking and commit / rollback.
    */
   function testTransactionStacking() {
     // This test won't work right if transactions are not supported.
@@ -3719,7 +3712,7 @@
 
 
 /**
+ * Check the sequences API.
- * Checks the sequences API.
  */
 class DatabaseNextIdCase extends DrupalWebTestCase {
   public static function getInfo() {
@@ -3731,7 +3724,7 @@
   }
 
   /**
+   * Test that the sequences API work.
-   * Tests that the sequences API work.
    */
   function testDbNextId() {
     $first = db_next_id();
@@ -3758,7 +3751,7 @@
   }
 
   /**
+   * Test that the empty result set behaves as empty.
-   * Tests that the empty result set behaves as empty.
    */
   function testEmpty() {
     $result = new StatementEmpty();
@@ -3768,7 +3761,7 @@
   }
 
   /**
+   * Test that the empty result set iterates safely.
-   * Tests that the empty result set iterates safely.
    */
   function testEmptyIteration() {
     $result = new StatementEmpty();
@@ -3782,7 +3775,7 @@
   }
 
   /**
+   * Test that the empty result set mass-fetches in an expected way.
-   * Tests that the empty result set mass-fetches in an expected way.
    */
   function testEmptyFetchAll() {
     $result = new StatementEmpty();
only in patch2:
unchanged:
--- a/core/modules/system/tests/actions.test
+++ b/core/modules/system/tests/actions.test
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * @file
+ * Tests complex actions configuration and makes sure they abort properly.
+ */
+
+/**
+ * Tests for the actions API.
+ */
 class ActionsConfigurationTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
@@ -10,8 +18,7 @@ class ActionsConfigurationTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test the configuration of advanced actions through the administration
-   * interface.
+   * Tests configuration of advanced actions through administration interface.
    */
   function testActionConfiguration() {
     // Create a user with permission to view the actions administration pages.
@@ -64,7 +71,7 @@ class ActionsConfigurationTestCase extends DrupalWebTestCase {
 }
 
 /**
- * Test actions executing in a potential loop, and make sure they abort properly.
+ * Tests actions executing in a potential loop, and ensures they abort properly.
  */
 class ActionLoopTestCase extends DrupalWebTestCase {
   protected $aid;
@@ -82,7 +89,7 @@ class ActionLoopTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Set up a loop with 3 - 12 recursions, and see if it aborts properly.
+   * Sets up a loop with 3 - 12 recursions, and sees if it aborts properly.
    */
   function testActionLoop() {
     $user = $this->drupalCreateUser(array('administer actions'));
@@ -103,7 +110,9 @@ class ActionLoopTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Create an infinite loop by causing a watchdog message to be set,
+   * Loops watchdog messages up to actions_max_stack times.
+   *
+   * Creates an infinite loop by causing a watchdog message to be set,
    * which causes the actions to be triggered again, up to actions_max_stack
    * times.
    */
only in patch2:
unchanged:
--- a/core/modules/system/tests/ajax.test
+++ b/core/modules/system/tests/ajax.test
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * @file
+ * Tests AJAX values.
+ */
+
+/**
+ * Tests the AJAX forms.
+ */
 class AJAXTestCase extends DrupalWebTestCase {
   function setUp() {
     $modules = func_get_args();
@@ -10,7 +18,7 @@ class AJAXTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Assert that a command with the required properties exists within the array of Ajax commands returned by the server.
+   * Asserts the array of Ajax commands contains the searched command.
    *
    * The Ajax framework, via the ajax_deliver() and ajax_render() functions,
    * returns an array of commands. This array sometimes includes commands
@@ -67,7 +75,7 @@ class AJAXFrameworkTestCase extends AJAXTestCase {
   }
 
   /**
-   * Test that ajax_render() returns JavaScript settings generated during the page request.
+   * Ensures ajax_render() returns JavaScript settings from the page request.
    *
    * @todo Add tests to ensure that ajax_render() returns commands for new CSS
    *   and JavaScript files to be loaded by the page. See
@@ -92,7 +100,7 @@ class AJAXFrameworkTestCase extends AJAXTestCase {
   }
 
   /**
-   * Test behavior of ajax_render_error().
+   * Tests behavior of ajax_render_error().
    */
   function testAJAXRenderError() {
     // Verify default error message.
@@ -116,7 +124,7 @@ class AJAXFrameworkTestCase extends AJAXTestCase {
   }
 
   /**
-   * Test that new JavaScript and CSS files added during an AJAX request are returned.
+   * Tests that new JavaScript and CSS files are returned on an AJAX request.
    */
   function testLazyLoad() {
     $expected = array(
@@ -229,7 +237,7 @@ class AJAXCommandsTestCase extends AJAXTestCase {
   }
 
   /**
-   * Test the various Ajax Commands.
+   * Tests the various Ajax Commands.
    */
   function testAJAXCommands() {
     $form_path = 'ajax_forms_test_ajax_commands_form';
@@ -370,7 +378,7 @@ class AJAXCommandsTestCase extends AJAXTestCase {
 }
 
 /**
- * Test that $form_state['values'] is properly delivered to $ajax['callback'].
+ * Tests that $form_state['values'] is properly delivered to $ajax['callback'].
  */
 class AJAXFormValuesTestCase extends AJAXTestCase {
   public static function getInfo() {
@@ -389,7 +397,7 @@ class AJAXFormValuesTestCase extends AJAXTestCase {
   }
 
   /**
-   * Create a simple form, then POST to system/ajax to change to it.
+   * Creates a simple form, then POST to system/ajax to change to it.
    */
   function testSimpleAJAXFormValue() {
     // Verify form values of a select element.
@@ -458,7 +466,7 @@ class AJAXMultiFormTestCase extends AJAXTestCase {
   }
 
   /**
-   * Test that a page with the 'page_node_form' included twice works correctly.
+   * Tests that pages with the 'page_node_form' included twice works correctly.
    */
   function testMultiForm() {
     // HTML IDs for elements within the field are potentially modified with
@@ -498,7 +506,7 @@ class AJAXMultiFormTestCase extends AJAXTestCase {
 }
 
 /**
- * Miscellaneous Ajax tests using ajax_test module.
+ * Tests using ajax_test module.
  */
 class AJAXElementValidation extends AJAXTestCase {
   public static function getInfo() {
@@ -510,7 +518,7 @@ class AJAXElementValidation extends AJAXTestCase {
   }
 
   /**
-   * Try to post an Ajax change to a form that has a validated element.
+   * Trys to post an Ajax change to a form that has a validated element.
    *
    * The drivertext field is Ajax-enabled. An additional field is not, but
    * is set to be a required field. In this test the required field is not
only in patch2:
unchanged:
--- a/core/modules/system/tests/batch.test
+++ b/core/modules/system/tests/batch.test
@@ -22,7 +22,7 @@ class BatchProcessingTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test batches triggered outside of form submission.
+   * Tests batches triggered outside of form submission.
    */
   function testBatchNoForm() {
     // Displaying the page triggers batch 1.
@@ -33,7 +33,7 @@ class BatchProcessingTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test batches defined in a form submit handler.
+   * Tests batches defined in a form submit handler.
    */
   function testBatchForm() {
     // Batch 0: no operation.
@@ -72,7 +72,7 @@ class BatchProcessingTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test batches defined in a multistep form.
+   * Tests batches defined in a multistep form.
    */
   function testBatchFormMultistep() {
     $this->drupalGet('batch-test/multistep');
@@ -92,7 +92,7 @@ class BatchProcessingTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test batches defined in different submit handlers on the same form.
+   * Tests batches defined in different submit handlers on the same form.
    */
   function testBatchFormMultipleBatches() {
     // Batches 1, 2 and 3 are triggered in sequence by different submit
@@ -109,7 +109,7 @@ class BatchProcessingTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test batches defined in a programmatically submitted form.
+   * Tests batches defined in a programmatically submitted form.
    *
    * Same as above, but the form is submitted through drupal_form_execute().
    */
@@ -127,7 +127,7 @@ class BatchProcessingTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test that drupal_form_submit() can run within a batch operation.
+   * Tests that drupal_form_submit() can run within a batch operation.
    */
   function testDrupalFormSubmitInBatch() {
     // Displaying the page triggers a batch that programmatically submits a
@@ -138,7 +138,7 @@ class BatchProcessingTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test batches that return $context['finished'] > 1 do in fact complete.
+   * Tests batches that return $context['finished'] > 1 do in fact complete.
    * See http://drupal.org/node/600836
    */
   function testBatchLargePercentage() {
@@ -151,7 +151,7 @@ class BatchProcessingTestCase extends DrupalWebTestCase {
 
 
   /**
-   * Will trigger a pass if the texts were found in order in the raw content.
+   * Triggers a pass if the texts were found in order in the raw content.
    *
    * @param $texts
    *   Array of raw strings to look for .
@@ -166,7 +166,7 @@ class BatchProcessingTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Helper function: return expected execution stacks for the test batches.
+   * Returns expected execution stacks for the test batches.
    */
   function _resultStack($id, $value = 0) {
     $stack = array();
@@ -233,7 +233,7 @@ class BatchProcessingTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Helper function: return expected result messages for the test batches.
+   * Returns expected result messages for the test batches.
    */
   function _resultMessages($id) {
     $messages = array();
@@ -384,7 +384,7 @@ class BatchPercentagesUnitTestCase extends DrupalUnitTestCase {
   }
 
   /**
-   * Test the _batch_api_percentage() function.
+   * Tests the _batch_api_percentage() function.
    */
   function testBatchPercentages() {
     foreach ($this->testCases as $expected_result => $arguments) {
only in patch2:
unchanged:
--- a/core/modules/system/tests/bootstrap.test
+++ b/core/modules/system/tests/bootstrap.test
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * @file
+ * Tests the current visitor's ip address from the variables.
+ */
+
+/**
+ * Tests the bootstrap.
+ */
 class BootstrapIPAddressTestCase extends DrupalWebTestCase {
 
   public static function getInfo() {
@@ -29,6 +37,9 @@ class BootstrapIPAddressTestCase extends DrupalWebTestCase {
     parent::setUp();
   }
 
+  /**
+   * Resets the static ip address.
+   */
   function tearDown() {
     $_SERVER = $this->oldserver;
     drupal_static_reset('ip_address');
@@ -36,7 +47,7 @@ class BootstrapIPAddressTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * test IP Address and hostname
+   * Tests IP Address and hostname.
    */
   function testIPAddressHost() {
     // Test the normal IP address.
@@ -98,6 +109,9 @@ class BootstrapIPAddressTestCase extends DrupalWebTestCase {
   }
 }
 
+/**
+ * Enables and tests the page cache.
+ */
 class BootstrapPageCacheTestCase extends DrupalWebTestCase {
 
   public static function getInfo() {
@@ -116,7 +130,7 @@ class BootstrapPageCacheTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test support for requests containing If-Modified-Since and If-None-Match headers.
+   * Tests support of requests with If-Modified-Since and If-None-Match headers.
    */
   function testConditionalRequests() {
     $config = config('system.performance');
@@ -156,7 +170,7 @@ class BootstrapPageCacheTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test cache headers.
+   * Tests cache headers.
    */
   function testPageCache() {
     $config = config('system.performance');
@@ -198,7 +212,7 @@ class BootstrapPageCacheTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test page compression.
+   * Tests page compression.
    *
    * The test should pass even if zlib.output_compression is enabled in php.ini,
    * .htaccess or similar, or if compression is done outside PHP, e.g. by the
@@ -231,6 +245,9 @@ class BootstrapPageCacheTestCase extends DrupalWebTestCase {
   }
 }
 
+/**
+ * Tests the variable system.
+ */
 class BootstrapVariableTestCase extends DrupalWebTestCase {
 
   function setUp() {
@@ -246,7 +263,7 @@ class BootstrapVariableTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * testVariable
+   * Tests variables then deletes them.
    */
   function testVariable() {
     // Setting and retrieving values.
@@ -279,7 +296,7 @@ class BootstrapVariableTestCase extends DrupalWebTestCase {
 }
 
 /**
- * Test hook_boot() and hook_exit().
+ * Tests hook_boot() and hook_exit().
  */
 class HookBootExitTestCase extends DrupalWebTestCase {
 
@@ -296,7 +313,7 @@ class HookBootExitTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test calling of hook_boot() and hook_exit().
+   * Tests calling of hook_boot() and hook_exit().
    */
   function testHookBootExit() {
     // Test with cache disabled. Boot and exit should always fire.
@@ -334,7 +351,7 @@ class HookBootExitTestCase extends DrupalWebTestCase {
 }
 
 /**
- * Test drupal_get_filename()'s availability.
+ * Tests drupal_get_filename()'s availability.
  */
 class BootstrapGetFilenameTestCase extends DrupalUnitTestCase {
 
@@ -347,7 +364,7 @@ class BootstrapGetFilenameTestCase extends DrupalUnitTestCase {
   }
 
   /**
-   * Test that drupal_get_filename() works correctly when the file is not found in the database.
+   * Tests that drupal_get_filename() works when the file is not in database.
    */
   function testDrupalGetFilename() {
     // Reset the static cache so we can test the "db is not active" code of
@@ -378,6 +395,9 @@ class BootstrapGetFilenameTestCase extends DrupalUnitTestCase {
   }
 }
 
+/**
+ * Tests that the timer_read() is working correctly.
+ */
 class BootstrapTimerTestCase extends DrupalUnitTestCase {
 
   public static function getInfo() {
@@ -389,8 +409,8 @@ class BootstrapTimerTestCase extends DrupalUnitTestCase {
   }
 
   /**
-   * Test timer_read() to ensure it properly accumulates time when the timer
-   * started and stopped multiple times.
+   * Tests timer_read() to ensure it properly accumulates time when the timer
+   * is started and stopped multiple times.
    * @return
    */
   function testTimer() {
@@ -411,7 +431,7 @@ class BootstrapTimerTestCase extends DrupalUnitTestCase {
 }
 
 /**
- * Test that resetting static variables works.
+ * Tests that resetting static variables works.
  */
 class BootstrapResettableStaticTestCase extends DrupalUnitTestCase {
 
@@ -424,7 +444,7 @@ class BootstrapResettableStaticTestCase extends DrupalUnitTestCase {
   }
 
   /**
-   * Test that a variable reference returned by drupal_static() gets reset when
+   * Tests that a variable reference returned by drupal_static() gets reset when
    * drupal_static_reset() is called.
    */
   function testDrupalStatic() {
@@ -450,7 +470,7 @@ class BootstrapResettableStaticTestCase extends DrupalUnitTestCase {
 }
 
 /**
- * Test miscellaneous functions in bootstrap.inc.
+ * Tests miscellaneous functions in bootstrap.inc.
  */
 class BootstrapMiscTestCase extends DrupalUnitTestCase {
 
@@ -463,7 +483,7 @@ class BootstrapMiscTestCase extends DrupalUnitTestCase {
   }
 
   /**
-   * Test miscellaneous functions in bootstrap.inc.
+   * Tests miscellaneous functions in bootstrap.inc.
    */
   function testMisc() {
     // Test drupal_array_merge_deep().
@@ -487,7 +507,7 @@ class BootstrapOverrideServerVariablesTestCase extends DrupalUnitTestCase {
   }
 
   /**
-   * Test providing a direct URL to to drupal_override_server_variables().
+   * Tests providing a direct URL to to drupal_override_server_variables().
    */
   function testDrupalOverrideServerVariablesProvidedURL() {
     $tests = array(
only in patch2:
unchanged:
--- a/core/modules/system/tests/cache.test
+++ b/core/modules/system/tests/cache.test
@@ -1,12 +1,20 @@
 <?php
 
+/**
+ * @file
+ * Tests saved and clears caches.
+ */
+
+/**
+ * Tests the temporary cache.
+ */
 class CacheTestCase extends DrupalWebTestCase {
   protected $default_bin = 'page';
   protected $default_cid = 'test_temporary';
   protected $default_value = 'CacheTest';
 
   /**
-   * Check whether or not a cache entry exists.
+   * Checks whether or not a cache entry exists.
    *
    * @param $cid
    *   The cache id.
@@ -76,7 +84,7 @@ class CacheTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Perform the general wipe.
+   * Performs the general wipe.
    * @param $bin
    *   The bin to perform the wipe on.
    */
@@ -89,7 +97,7 @@ class CacheTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Setup the lifetime settings for caching.
+   * Sets up the lifetime settings for caching.
    *
    * @param $time
    *   The time in seconds the cache should minimal live.
@@ -102,6 +110,9 @@ class CacheTestCase extends DrupalWebTestCase {
   }
 }
 
+/**
+ * Checks that the cache variables are saved.
+ */
 class CacheSavingCase extends CacheTestCase {
   public static function getInfo() {
     return array(
@@ -112,35 +123,35 @@ class CacheSavingCase extends CacheTestCase {
   }
 
   /**
-   * Test the saving and restoring of a string.
+   * Tests the saving and restoring of a string.
    */
   function testString() {
     $this->checkVariable($this->randomName(100));
   }
 
   /**
-   * Test the saving and restoring of an integer.
+   * Tests the saving and restoring of an integer.
    */
   function testInteger() {
     $this->checkVariable(100);
   }
 
   /**
-   * Test the saving and restoring of a double.
+   * Tests the saving and restoring of a double.
    */
   function testDouble() {
     $this->checkVariable(1.29);
   }
 
   /**
-   * Test the saving and restoring of an array.
+   * Tests the saving and restoring of an array.
    */
   function testArray() {
     $this->checkVariable(array('drupal1', 'drupal2' => 'drupal3', 'drupal4' => array('drupal5', 'drupal6')));
   }
 
   /**
-   * Test the saving and restoring of an object.
+   * Tests the saving and restoring of an object.
    */
   function testObject() {
     $test_object = new stdClass();
@@ -155,7 +166,7 @@ class CacheSavingCase extends CacheTestCase {
   }
 
   /**
-   * Check or a variable is stored and restored properly.
+   * Checks that a variable is stored and restored properly.
    */
   function checkVariable($var) {
     cache()->set('test_var', $var);
@@ -164,7 +175,7 @@ class CacheSavingCase extends CacheTestCase {
   }
 
   /**
-   * Test no empty cids are written in cache table.
+   * Tests no empty cids are written in cache table.
    */
   function testNoEmptyCids() {
     $this->drupalGet('user/register');
@@ -173,7 +184,7 @@ class CacheSavingCase extends CacheTestCase {
 }
 
 /**
- * Test getMultiple().
+ * Tests getMultiple().
  */
 class CacheGetMultipleUnitTest extends CacheTestCase {
 
@@ -191,7 +202,7 @@ class CacheGetMultipleUnitTest extends CacheTestCase {
   }
 
   /**
-   * Test getMultiple().
+   * Tests getMultiple().
    */
   function testCacheMultiple() {
     $item1 = $this->randomName(10);
@@ -221,7 +232,7 @@ class CacheGetMultipleUnitTest extends CacheTestCase {
 }
 
 /**
- * Test cache clearing methods.
+ * Tests cache clearing methods.
  */
 class CacheClearCase extends CacheTestCase {
   public static function getInfo() {
@@ -240,7 +251,7 @@ class CacheClearCase extends CacheTestCase {
   }
 
   /**
-   * Test clearing using a cid.
+   * Tests clearing using a cid.
    */
   function testClearCid() {
     $cache = cache($this->default_bin);
@@ -253,7 +264,7 @@ class CacheClearCase extends CacheTestCase {
   }
 
   /**
-   * Test clearing using wildcard.
+   * Tests clearing using wildcard.
    */
   function testClearWildcard() {
     $cache = cache($this->default_bin);
@@ -279,7 +290,7 @@ class CacheClearCase extends CacheTestCase {
   }
 
   /**
-   * Test clearing using an array.
+   * Tests clearing using an array.
    */
   function testClearArray() {
     // Create three cache entries.
@@ -317,7 +328,7 @@ class CacheClearCase extends CacheTestCase {
   }
 
   /**
-   * Test drupal_flush_all_caches().
+   * Tests drupal_flush_all_caches().
    */
   function testFlushAllCaches() {
     // Create cache entries for each flushed cache bin.
@@ -338,7 +349,7 @@ class CacheClearCase extends CacheTestCase {
   }
 
   /**
-   * Test minimum cache lifetime.
+   * Tests minimum cache lifetime.
    */
   function testMinimumCacheLifetime() {
     // Set a minimum/maximum cache lifetime.
@@ -418,7 +429,7 @@ class CacheClearCase extends CacheTestCase {
 }
 
 /**
- * Test isEmpty() method.
+ * Tests isEmpty() method.
  */
 class CacheIsEmptyCase extends CacheTestCase {
   public static function getInfo() {
@@ -437,7 +448,7 @@ class CacheIsEmptyCase extends CacheTestCase {
   }
 
   /**
-   * Test clearing using a cid.
+   * Tests clearing using a cid.
    */
   function testIsEmpty() {
     // Clear the cache bin.
only in patch2:
unchanged:
--- a/core/modules/system/tests/common.test
+++ b/core/modules/system/tests/common.test
@@ -21,6 +21,12 @@ class CommonDrupalAlterTestCase extends DrupalWebTestCase {
     parent::setUp(array('block', 'common_test'));
   }
 
+  /**
+   * Tests if the theme has been altered.
+   *
+   * @global string $theme
+   * @global array $base_theme_info
+   */
   function testDrupalAlter() {
     // This test depends on Bartik, so make sure that it is always the current
     // active theme.
@@ -83,7 +89,7 @@ class CommonURLUnitTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Confirm that invalid text given as $path is filtered.
+   * Confirms that invalid text given as $path is filtered.
    */
   function testLXSS() {
     $text = $this->randomName();
@@ -116,7 +122,7 @@ class CommonURLUnitTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test drupal_get_query_parameters().
+   * Tests drupal_get_query_parameters().
    */
   function testDrupalGetQueryParameters() {
     $original = array(
@@ -163,7 +169,7 @@ class CommonURLUnitTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test drupal_http_build_query().
+   * Tests drupal_http_build_query().
    */
   function testDrupalHttpBuildQuery() {
     $this->assertEqual(drupal_http_build_query(array('a' => ' &#//+%20@۞')), 'a=%20%26%23//%2B%2520%40%DB%9E', t('Value was properly encoded.'));
@@ -173,7 +179,7 @@ class CommonURLUnitTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test drupal_parse_url().
+   * Tests drupal_parse_url().
    */
   function testDrupalParseUrl() {
     // Relative URL.
@@ -241,7 +247,9 @@ class CommonURLUnitTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test url() with/without query, with/without fragment, absolute on/off and
+   * Tests url() functionality.
+   *
+   * Tests url() with/without query, with/without fragment, absolute on/off and
    * assert all that works when clean URLs are on and off.
    */
   function testUrl() {
@@ -317,7 +325,7 @@ class CommonURLUnitTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test external URL handling.
+   * Tests external URL handling.
    */
   function testExternalUrls() {
     $test_url = 'http://drupal.org/';
@@ -366,7 +374,7 @@ class CommonXssUnitTestCase extends DrupalUnitTestCase {
   }
 
   /**
-   * Check that invalid multi-byte sequences are rejected.
+   * Checks that invalid multi-byte sequences are rejected.
    */
   function testInvalidMultiByte() {
      // Ignore PHP 5.3+ invalid multibyte sequence warning.
@@ -384,7 +392,7 @@ class CommonXssUnitTestCase extends DrupalUnitTestCase {
   }
 
   /**
-   * Check that special characters are escaped.
+   * Checks that special characters are escaped.
    */
   function testEscaping() {
      $text = check_plain("<script>");
@@ -394,7 +402,7 @@ class CommonXssUnitTestCase extends DrupalUnitTestCase {
   }
 
   /**
-   * Test t() and format_string() replacement functionality.
+   * Tests t() and format_string() replacement functionality.
    */
   function testFormatStringAndT() {
     foreach (array('format_string', 't') as $function) {
@@ -410,7 +418,7 @@ class CommonXssUnitTestCase extends DrupalUnitTestCase {
   }
 
   /**
-   * Check that harmful protocols are stripped.
+   * Checks that harmful protocols are stripped.
    */
   function testBadProtocolStripping() {
     // Ensure that check_url() strips out harmful protocols, and encodes for
@@ -463,7 +471,7 @@ class CommonSizeUnitTestCase extends DrupalUnitTestCase {
   }
 
   /**
-   * Check that format_size() returns the expected string.
+   * Checks that format_size() returns the expected string.
    */
   function testCommonFormatSize() {
     foreach (array($this->exact_test_cases, $this->rounded_test_cases) as $test_cases) {
@@ -478,7 +486,7 @@ class CommonSizeUnitTestCase extends DrupalUnitTestCase {
   }
 
   /**
-   * Check that parse_size() returns the proper byte sizes.
+   * Checks that parse_size() returns the proper byte sizes.
    */
   function testCommonParseSize() {
     foreach ($this->exact_test_cases as $string => $size) {
@@ -511,7 +519,7 @@ class CommonSizeUnitTestCase extends DrupalUnitTestCase {
   }
 
   /**
-   * Cross-test parse_size() and format_size().
+   * Cross-tests parse_size() and format_size().
    */
   function testCommonParseSizeFormatSize() {
     foreach ($this->exact_test_cases as $size) {
@@ -525,7 +533,7 @@ class CommonSizeUnitTestCase extends DrupalUnitTestCase {
 }
 
 /**
- * Test drupal_explode_tags() and drupal_implode_tags().
+ * Tests drupal_explode_tags() and drupal_implode_tags().
  */
 class CommonAutocompleteTagsTestCase extends DrupalUnitTestCase {
   var $validTags = array(
@@ -544,7 +552,7 @@ class CommonAutocompleteTagsTestCase extends DrupalUnitTestCase {
   }
 
   /**
-   * Explode a series of tags.
+   * Explodes a series of tags.
    */
   function testDrupalExplodeTags() {
     $string = implode(', ', array_keys($this->validTags));
@@ -553,7 +561,7 @@ class CommonAutocompleteTagsTestCase extends DrupalUnitTestCase {
   }
 
   /**
-   * Implode a series of tags.
+   * Implodes a series of tags.
    */
   function testDrupalImplodeTags() {
     $tags = array_values($this->validTags);
@@ -582,7 +590,7 @@ class CommonAutocompleteTagsTestCase extends DrupalUnitTestCase {
 }
 
 /**
- * Test the Drupal CSS system.
+ * Tests the Drupal CSS system.
  */
 class CommonCascadingStylesheetsTestCase extends DrupalWebTestCase {
   public static function getInfo() {
@@ -600,14 +608,14 @@ class CommonCascadingStylesheetsTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Check default stylesheets as empty.
+   * Checks default stylesheets as empty.
    */
   function testDefault() {
     $this->assertEqual(array(), drupal_add_css(), t('Default CSS is empty.'));
   }
 
   /**
-   * Test that stylesheets in module .info files are loaded.
+   * Tests that stylesheets in module .info files are loaded.
    */
   function testModuleInfo() {
     $this->drupalGet('');
@@ -732,7 +740,7 @@ class CommonCascadingStylesheetsTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test CSS ordering.
+   * Tests CSS ordering.
    */
   function testRenderOrder() {
     // A module CSS file.
@@ -763,7 +771,7 @@ class CommonCascadingStylesheetsTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test CSS override.
+   * Tests CSS override.
    */
   function testRenderOverride() {
     $system = drupal_get_path('module', 'system');
@@ -804,8 +812,7 @@ class CommonCascadingStylesheetsTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Tests that the query string remains intact when adding CSS files that have
-   * query string parameters.
+   * Tests that CSS query string remains intact when added to file.
    */
   function testAddCssFileWithQueryString() {
     $this->drupalGet('common-test/query-string');
@@ -876,7 +883,7 @@ class CommonHTMLIdentifierTestCase extends DrupalUnitTestCase {
 }
 
 /**
- * CSS Unit Tests.
+ * Tests CSS functions.
  */
 class CommonCascadingStylesheetsUnitTestCase extends DrupalUnitTestCase {
   public static function getInfo() {
@@ -888,8 +895,9 @@ class CommonCascadingStylesheetsUnitTestCase extends DrupalUnitTestCase {
   }
 
   /**
-   * Tests basic CSS loading with and without optimization via drupal_load_stylesheet().
+   * Tests CSS loading via drupal_load_stylesheet().
    *
+   * This test loads CSS files with and without CSS optimization.
    * Known tests:
    * - Retain white-space in selectors. (http://drupal.org/node/472820)
    * - Proper URLs in imported files. (http://drupal.org/node/265719)
@@ -928,7 +936,7 @@ class CommonCascadingStylesheetsUnitTestCase extends DrupalUnitTestCase {
 }
 
 /**
- * Test drupal_http_request().
+ * Tests drupal_http_request().
  */
 class CommonDrupalHTTPRequestTestCase extends DrupalWebTestCase {
   public static function getInfo() {
@@ -943,6 +951,11 @@ class CommonDrupalHTTPRequestTestCase extends DrupalWebTestCase {
     parent::setUp('system_test', 'locale');
   }
 
+  /**
+   * Checks HTTP requests.
+   *
+   * @global type $is_https
+   */
   function testDrupalHTTPRequest() {
     global $is_https;
 
@@ -986,6 +999,9 @@ class CommonDrupalHTTPRequestTestCase extends DrupalWebTestCase {
     }
   }
 
+  /**
+   * Tests HTTP basic authorization.
+   */
   function testDrupalHTTPRequestBasicAuth() {
     $username = $this->randomName();
     $password = $this->randomName();
@@ -999,6 +1015,9 @@ class CommonDrupalHTTPRequestTestCase extends DrupalWebTestCase {
     $this->assertRaw($password, t('$_SERVER["PHP_AUTH_PW"] is passed correctly.'));
   }
 
+  /**
+   * Tests HTTP redirect requests.
+   */
   function testDrupalHTTPRequestRedirect() {
     $redirect_301 = drupal_http_request(url('system-test/redirect/301', array('absolute' => TRUE)), array('max_redirects' => 1));
     $this->assertEqual($redirect_301->redirect_code, 301, t('drupal_http_request follows the 301 redirect.'));
@@ -1072,7 +1091,7 @@ class CommonRegionContentTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test setting and retrieving content for theme regions.
+   * Tests setting and retrieving content for theme regions.
    */
   function testRegions() {
     global $theme_key;
@@ -1121,7 +1140,7 @@ class CommonDrupalGotoTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test drupal_goto().
+   * Tests drupal_goto().
    */
   function testDrupalGoto() {
     $this->drupalGet('common-test/drupal_goto/redirect');
@@ -1147,7 +1166,7 @@ class CommonDrupalGotoTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test hook_drupal_goto_alter().
+   * Tests hook_drupal_goto_alter().
    */
   function testDrupalGotoAlter() {
     $this->drupalGet('common-test/drupal_goto/redirect_fail');
@@ -1157,7 +1176,7 @@ class CommonDrupalGotoTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test drupal_get_destination().
+   * Tests drupal_get_destination().
    */
   function testDrupalGetDestination() {
     $query = $this->randomName(10);
@@ -1178,7 +1197,7 @@ class CommonDrupalGotoTestCase extends DrupalWebTestCase {
  */
 class CommonJavaScriptTestCase extends DrupalWebTestCase {
   /**
-   * Store configured value for JavaScript preprocessing.
+   * Stores configured value for JavaScript preprocessing.
    */
   protected $preprocess_js = NULL;
 
@@ -1214,14 +1233,14 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test default JavaScript is empty.
+   * Tests default JavaScript is empty.
    */
   function testDefault() {
     $this->assertEqual(array(), drupal_add_js(), t('Default JavaScript is empty.'));
   }
 
   /**
-   * Test adding a JavaScript file.
+   * Tests adding a JavaScript file.
    */
   function testAddFile() {
     $javascript = drupal_add_js('core/misc/collapse.js');
@@ -1235,7 +1254,7 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test adding settings.
+   * Tests adding settings.
    */
   function testAddSetting() {
     $javascript = drupal_add_js(array('drupal' => 'rocks', 'dries' => 280342800), 'setting');
@@ -1253,7 +1272,7 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test drupal_get_js() for JavaScript settings.
+   * Tests drupal_get_js() for JavaScript settings.
    */
   function testHeaderSetting() {
     // Only the second of these two entries should appear in Drupal.settings.
@@ -1288,7 +1307,7 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test to see if resetting the JavaScript empties the cache.
+   * Tests to see if resetting the JavaScript empties the cache.
    */
   function testReset() {
     drupal_add_js('core/misc/collapse.js');
@@ -1297,7 +1316,7 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test adding inline scripts.
+   * Tests adding inline scripts.
    */
   function testAddInline() {
     $inline = 'jQuery(function () { });';
@@ -1308,7 +1327,7 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test rendering an external JavaScript file.
+   * Tests rendering an external JavaScript file.
    */
   function testRenderExternal() {
     $external = 'http://example.com/example.js';
@@ -1319,7 +1338,7 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test drupal_get_js() with a footer scope.
+   * Tests drupal_get_js() with a footer scope.
    */
   function testFooterHTML() {
     $inline = 'jQuery(function () { });';
@@ -1329,7 +1348,7 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test drupal_add_js() sets preproccess to false when cache is set to false.
+   * Tests drupal_add_js() sets preproccess to false when cache is set to false.
    */
   function testNoCache() {
     $javascript = drupal_add_js('core/misc/collapse.js', array('cache' => FALSE));
@@ -1337,7 +1356,7 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test adding a JavaScript file with a different group.
+   * Tests adding a JavaScript file with a different group.
    */
   function testDifferentGroup() {
     $javascript = drupal_add_js('core/misc/collapse.js', array('group' => JS_THEME));
@@ -1345,7 +1364,7 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test adding a JavaScript file with a different weight.
+   * Tests adding a JavaScript file with a different weight.
    */
   function testDifferentWeight() {
     $javascript = drupal_add_js('core/misc/collapse.js', array('weight' => 2));
@@ -1353,7 +1372,7 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test adding JavaScript within conditional comments.
+   * Tests adding JavaScript within conditional comments.
    *
    * @see drupal_pre_render_conditional_comments()
    */
@@ -1372,7 +1391,7 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test JavaScript versioning.
+   * Tests JavaScript versioning.
    */
   function testVersionQueryString() {
     drupal_add_js('core/misc/collapse.js', array('version' => 'foo'));
@@ -1382,7 +1401,7 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test JavaScript grouping and aggregation.
+   * Tests JavaScript grouping and aggregation.
    */
   function testAggregation() {
     $default_query_string = variable_get('css_js_query_string', '0');
@@ -1424,7 +1443,7 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test JavaScript ordering.
+   * Tests JavaScript ordering.
    */
   function testRenderOrder() {
     // Add a bunch of JavaScript in strange ordering.
@@ -1466,7 +1485,7 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test rendering the JavaScript with a file's weight above jQuery's.
+   * Tests rendering the JavaScript with a file's weight above jQuery's.
    */
   function testRenderDifferentWeight() {
     // JavaScript files are sorted first by group, then by the 'every_page'
@@ -1478,7 +1497,7 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test altering a JavaScript's weight via hook_js_alter().
+   * Tests altering a JavaScript's weight via hook_js_alter().
    *
    * @see simpletest_js_alter()
    */
@@ -1577,8 +1596,7 @@ class CommonJavaScriptTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Tests that the query string remains intact when adding JavaScript files
-   *  that have query string parameters.
+   * Tests JavaScript files that have query strings attached get added right.
    */
   function testAddJsFileWithQueryString() {
     $this->drupalGet('common-test/query-string');
@@ -1604,7 +1622,7 @@ class CommonDrupalRenderTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test sorting by weight.
+   * Tests sorting by weight.
    */
   function testDrupalRenderSorting() {
     $first = $this->randomName();
@@ -1655,7 +1673,7 @@ class CommonDrupalRenderTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test #attached functionality in children elements.
+   * Tests #attached functionality in children elements.
    */
   function testDrupalRenderChildrenAttached() {
     // The cache system is turned off for POST requests.
@@ -1705,7 +1723,7 @@ class CommonDrupalRenderTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test passing arguments to the theme function.
+   * Tests passing arguments to the theme function.
    */
   function testDrupalRenderThemeArguments() {
     $element = array(
@@ -1718,12 +1736,12 @@ class CommonDrupalRenderTestCase extends DrupalWebTestCase {
       '#foo' => $this->randomName(),
       '#bar' => $this->randomName(),
     );
-    // Test that passing arguments to the theme function works.
+    // Tests that passing arguments to the theme function works.
     $this->assertEqual(drupal_render($element), $element['#foo'] . $element['#bar'], 'Passing arguments to theme functions works');
   }
 
   /**
-   * Test rendering form elements without passing through form_builder().
+   * Tests rendering form elements without passing through form_builder().
    */
   function testDrupalRenderFormElements() {
     // Define a series of form elements.
@@ -1833,7 +1851,7 @@ class CommonDrupalRenderTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test rendering elements with invalid keys.
+   * Tests rendering elements with invalid keys.
    */
   function testDrupalRenderInvalidKeys() {
     $error = array(
@@ -1849,6 +1867,9 @@ class CommonDrupalRenderTestCase extends DrupalWebTestCase {
     $this->assertRaw($message, t('Found error message: !message.', array('!message' => $message)));
   }
 
+  /**
+   * Asserts rendered elements.
+   */
   protected function assertRenderedElement(array $element, $xpath, array $xpath_args = array()) {
     $original_element = $element;
     $this->drupalSetContent(drupal_render($element));
@@ -1945,7 +1966,7 @@ class CommonValidUrlUnitTestCase extends DrupalUnitTestCase {
   }
 
   /**
-   * Test invalid absolute urls.
+   * Tests invalid absolute urls.
    */
   function testInvalidAbsolute() {
     $url_schemes = array('http', 'https', 'ftp');
@@ -1965,7 +1986,7 @@ class CommonValidUrlUnitTestCase extends DrupalUnitTestCase {
   }
 
   /**
-   * Test valid relative urls.
+   * Tests valid relative urls.
    */
   function testValidRelative() {
     $valid_relative_urls = array(
@@ -1986,7 +2007,7 @@ class CommonValidUrlUnitTestCase extends DrupalUnitTestCase {
   }
 
   /**
-   * Test invalid relative urls.
+   * Tests invalid relative urls.
    */
   function testInvalidRelative() {
     $invalid_relative_urls = array(
@@ -2089,7 +2110,7 @@ class CommonDrupalWriteRecordTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test the drupal_write_record() API function.
+   * Tests the drupal_write_record() API function.
    */
   function testDrupalWriteRecord() {
     // Insert a record with no columns populated.
@@ -2236,7 +2257,7 @@ class CommonSimpleTestErrorCollectorTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test that simpletest collects errors from the tested site.
+   * Tests that simpletest collects errors from the tested site.
    */
   function testErrorCollect() {
     $this->collectedErrors = array();
@@ -2287,7 +2308,7 @@ class CommonSimpleTestErrorCollectorTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Assert that a collected error matches what we are expecting.
+   * Asserts that a collected error matches what we are expecting.
    */
   function assertError($error, $group, $function, $file, $message = NULL) {
     $this->assertEqual($error['group'], $group, t("Group was %group", array('%group' => $group)));
@@ -2312,7 +2333,7 @@ class CommonDrupalParseInfoFileTestCase extends DrupalUnitTestCase {
   }
 
   /**
-   * Parse an example .info file an verify the results.
+   * Parses an example .info file an verify the results.
    */
   function testParseInfoFile() {
     $info_values = drupal_parse_info_file(drupal_get_path('module', 'system') . '/tests/common_test_info.txt');
@@ -2335,7 +2356,7 @@ class CommonDrupalSystemListingTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test that files in different directories take precedence as expected.
+   * Tests that files in different directories take precedence as expected.
    */
   function testDirectoryPrecedence() {
     // Define the module files we will search for, and the directory precedence
@@ -2409,7 +2430,7 @@ class CommonFormatDateTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test admin-defined formats in format_date().
+   * Tests admin-defined formats in format_date().
    */
   function testAdminDefinedFormatDate() {
     // Create an admin user.
@@ -2723,7 +2744,7 @@ class CommonJSONUnitTestCase extends DrupalUnitTestCase {
 }
 
 /**
- * Basic tests for drupal_add_feed().
+ * Tests for drupal_add_feed().
  */
 class CommonDrupalAddFeedTestCase extends DrupalWebTestCase {
   public static function getInfo() {
@@ -2735,7 +2756,7 @@ class CommonDrupalAddFeedTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test drupal_add_feed() with paths, URLs, and titles.
+   * Tests drupal_add_feed() with paths, URLs, and titles.
    */
   function testBasicFeedAddNoTitle() {
     $path = $this->randomName(12);
@@ -2794,7 +2815,7 @@ class CommonDrupalAddFeedTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Create a pattern representing the RSS feed in the page.
+   * Creates a pattern representing the RSS feed in the page.
    */
   function urlToRSSLinkPattern($url, $title = '') {
     // Escape any regular expression characters in the url ('?' is the worst).
only in patch2:
unchanged:
--- a/core/modules/system/tests/modules/actions_loop_test/actions_loop_test.install
+++ b/core/modules/system/tests/modules/actions_loop_test/actions_loop_test.install
@@ -1,6 +1,11 @@
 <?php
 
 /**
+ * @file
+ * Install, update and uninstall functions for the actions_loop_test module.
+ */
+
+/**
  * Implements hook_install().
  */
 function actions_loop_test_install() {
only in patch2:
unchanged:
--- a/core/modules/system/tests/modules/actions_loop_test/actions_loop_test.module
+++ b/core/modules/system/tests/modules/actions_loop_test/actions_loop_test.module
@@ -1,6 +1,11 @@
 <?php
 
 /**
+ * @file
+ * Actions loop test module file.
+ */
+
+/**
  * Implements hook_watchdog().
  */
 function actions_loop_test_watchdog(array $log_entry) {
@@ -43,7 +48,7 @@ function actions_loop_test_action_info() {
 }
 
 /**
- * Write a message to the log.
+ * Writes a message to the log.
  */
 function actions_loop_test_log() {
   $count = &drupal_static(__FUNCTION__, 0);
@@ -52,8 +57,11 @@ function actions_loop_test_log() {
 }
 
 /**
- * Replacement of the watchdog() function that eliminates the use of semaphores
- * so that we can test the abortion of an action loop.
+ * Uses a watchdog replacement to test the abortion of an action loop.
+ *
+ * Replaces the watchdog() function so that we can test the abortion of an
+ * action loop.  This function is like the watchdog() function except that it
+ * does not use semaphores.
  */
 function watchdog_skip_semaphore($type, $message, $variables = array(), $severity = WATCHDOG_NOTICE, $link = NULL) {
   global $user, $base_root;
@@ -73,7 +81,7 @@ function watchdog_skip_semaphore($type, $message, $variables = array(), $severit
     'timestamp'   => REQUEST_TIME,
   );
 
-  // Call the logging hooks to log/process the message
+  // Calls the logging hooks to log/process the message
   foreach (module_implements('watchdog') as $module) {
     module_invoke($module, 'watchdog', $log_entry);
   }
only in patch2:
unchanged:
--- a/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module
+++ b/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module
@@ -38,9 +38,8 @@ function ajax_forms_test_menu() {
   return $items;
 }
 
-
 /**
- * A basic form used to test form_state['values'] during callback.
+ * Tests form_state['values'] during callback.
  */
 function ajax_forms_test_simple_form($form, &$form_state) {
   $form = array();
@@ -72,7 +71,7 @@ function ajax_forms_test_simple_form($form, &$form_state) {
 }
 
 /**
- * Ajax callback triggered by select.
+ * Ajax form callback: Selects color.
  */
 function ajax_forms_test_simple_form_select_callback($form, $form_state) {
   $commands = array();
@@ -82,7 +81,7 @@ function ajax_forms_test_simple_form_select_callback($form, $form_state) {
 }
 
 /**
- * Ajax callback triggered by checkbox.
+ * Ajax form callback: Selects checkbox value.
  */
 function ajax_forms_test_simple_form_checkbox_callback($form, $form_state) {
   $commands = array();
@@ -91,9 +90,8 @@ function ajax_forms_test_simple_form_checkbox_callback($form, $form_state) {
   return array('#type' => 'ajax', '#commands' => $commands);
 }
 
-
 /**
- * Form to display the Ajax Commands.
+ * Forms to display the Ajax Commands.
  * @param $form
  * @param $form_state
  * @return unknown_type
@@ -267,7 +265,7 @@ function ajax_forms_test_ajax_commands_form($form, &$form_state) {
 }
 
 /**
- * Ajax callback for 'after'.
+ * Ajax form callback: Selects 'after'.
  */
 function ajax_forms_test_advanced_commands_after_callback($form, $form_state) {
   $selector = '#after_div';
@@ -278,7 +276,7 @@ function ajax_forms_test_advanced_commands_after_callback($form, $form_state) {
 }
 
 /**
- * Ajax callback for 'alert'.
+ * Ajax form callback: Selects 'alert'.
  */
 function ajax_forms_test_advanced_commands_alert_callback($form, $form_state) {
   $commands = array();
@@ -287,7 +285,7 @@ function ajax_forms_test_advanced_commands_alert_callback($form, $form_state) {
 }
 
 /**
- * Ajax callback for 'append'.
+ * Ajax form callback: Selects 'append'.
  */
 function ajax_forms_test_advanced_commands_append_callback($form, $form_state) {
   $selector = '#append_div';
@@ -297,7 +295,7 @@ function ajax_forms_test_advanced_commands_append_callback($form, $form_state) {
 }
 
 /**
- * Ajax callback for 'before'.
+ * Ajax form callback: Selects 'before'.
  */
 function ajax_forms_test_advanced_commands_before_callback($form, $form_state) {
   $selector = '#before_div';
@@ -308,14 +306,15 @@ function ajax_forms_test_advanced_commands_before_callback($form, $form_state) {
 }
 
 /**
- * Ajax callback for 'changed'.
+ * Ajax form callback: Selects 'changed'.
  */
 function ajax_forms_test_advanced_commands_changed_callback($form, $form_state) {
   $commands[] = ajax_command_changed('#changed_div');
   return array('#type' => 'ajax', '#commands' => $commands);
 }
+
 /**
- * Ajax callback for 'changed' with asterisk marking inner div.
+ * Ajax form callback: Selects 'changed' with asterisk marking inner div.
  */
 function ajax_forms_test_advanced_commands_changed_asterisk_callback($form, $form_state) {
   $commands = array();
@@ -324,7 +323,7 @@ function ajax_forms_test_advanced_commands_changed_asterisk_callback($form, $for
 }
 
 /**
- * Ajax callback for 'css'.
+ * Ajax form callback: Selects 'css'.
  */
 function ajax_forms_test_advanced_commands_css_callback($form, $form_state) {
   $selector = '#css_div';
@@ -336,7 +335,7 @@ function ajax_forms_test_advanced_commands_css_callback($form, $form_state) {
 }
 
 /**
- * Ajax callback for 'data'.
+ * Ajax form callback: Selects 'data'.
  */
 function ajax_forms_test_advanced_commands_data_callback($form, $form_state) {
   $selector = '#data_div';
@@ -347,7 +346,7 @@ function ajax_forms_test_advanced_commands_data_callback($form, $form_state) {
 }
 
 /**
- * Ajax callback for 'invoke'.
+ * Ajax form callback: Selects 'invoke'.
  */
 function ajax_forms_test_advanced_commands_invoke_callback($form, $form_state) {
   $commands = array();
@@ -356,7 +355,7 @@ function ajax_forms_test_advanced_commands_invoke_callback($form, $form_state) {
 }
 
 /**
- * Ajax callback for 'html'.
+ * Ajax form callback: Selects 'html'.
  */
 function ajax_forms_test_advanced_commands_html_callback($form, $form_state) {
   $commands = array();
@@ -365,7 +364,7 @@ function ajax_forms_test_advanced_commands_html_callback($form, $form_state) {
 }
 
 /**
- * Ajax callback for 'insert'.
+ * Ajax form callback: Selects 'insert'.
  */
 function ajax_forms_test_advanced_commands_insert_callback($form, $form_state) {
   $commands = array();
@@ -374,7 +373,7 @@ function ajax_forms_test_advanced_commands_insert_callback($form, $form_state) {
 }
 
 /**
- * Ajax callback for 'prepend'.
+ * Ajax form callback: Selects 'prepend'.
  */
 function ajax_forms_test_advanced_commands_prepend_callback($form, $form_state) {
   $commands = array();
@@ -383,7 +382,7 @@ function ajax_forms_test_advanced_commands_prepend_callback($form, $form_state)
 }
 
 /**
- * Ajax callback for 'remove'.
+ * Ajax form callback: Selects 'remove'.
  */
 function ajax_forms_test_advanced_commands_remove_callback($form, $form_state) {
   $commands = array();
@@ -392,7 +391,7 @@ function ajax_forms_test_advanced_commands_remove_callback($form, $form_state) {
 }
 
 /**
- * Ajax callback for 'restripe'.
+ * Ajax form callback: Selects 'restripe'.
  */
 function ajax_forms_test_advanced_commands_restripe_callback($form, $form_state) {
   $commands = array();
@@ -401,7 +400,7 @@ function ajax_forms_test_advanced_commands_restripe_callback($form, $form_state)
 }
 
 /**
- * Ajax callback for 'settings'.
+ * Ajax form callback: Selects 'settings'.
  */
 function ajax_forms_test_advanced_commands_settings_callback($form, $form_state) {
   $commands = array();
@@ -411,6 +410,8 @@ function ajax_forms_test_advanced_commands_settings_callback($form, $form_state)
 }
 
 /**
+ * Builds AJAX validation form.
+ *
  * This form and its related submit and callback functions demonstrate
  * not validating another form element when a single Ajax element is triggered.
  *
@@ -448,15 +449,16 @@ function ajax_forms_test_validation_form($form, &$form_state) {
 
   return $form;
 }
+
 /**
- * Submit handler for the validation form.
+ * Submits handler for the validation form.
  */
 function ajax_forms_test_validation_form_submit($form, $form_state) {
   drupal_set_message(t("Validation form submitted"));
 }
 
 /**
- * Ajax callback for the 'drivertext' element of the validation form.
+ * Ajax form callback: Selects the 'drivertext' element of the validation form.
  */
 function ajax_forms_test_validation_form_callback($form, $form_state) {
   drupal_set_message("ajax_forms_test_validation_form_callback invoked");
@@ -495,7 +497,7 @@ function ajax_forms_test_lazy_load_form_submit($form, &$form_state) {
 }
 
 /**
- * AJAX callback for the ajax_forms_test_lazy_load_form() form.
+ * AJAX form callback: Selects for the ajax_forms_test_lazy_load_form() form.
  *
  * This function returns nothing, because all we're interested in testing is
  * ajax_render() adding commands for JavaScript and CSS added during the page
only in patch2:
unchanged:
--- a/core/modules/system/tests/modules/ajax_test/ajax_test.module
+++ b/core/modules/system/tests/modules/ajax_test/ajax_test.module
@@ -40,7 +40,7 @@ function ajax_test_system_theme_info() {
 }
 
 /**
- * Menu callback; Return an element suitable for use by ajax_deliver().
+ * Menu callback: Returns an element suitable for use by ajax_deliver().
  *
  * Additionally ensures that ajax_render() incorporates JavaScript settings
  * generated during the page request by invoking drupal_add_js() with a dummy
@@ -52,7 +52,7 @@ function ajax_test_render() {
 }
 
 /**
- * Menu callback; Returns Ajax element with #error property set.
+ * Menu callback: Returns Ajax element with #error property set.
  */
 function ajax_test_error() {
   $message = '';
@@ -63,7 +63,7 @@ function ajax_test_error() {
 }
 
 /**
- * Menu callback; Renders a #type link with #ajax.
+ * Menu callback: Renders a #type link with #ajax.
  */
 function ajax_test_link() {
   $build['link'] = array(
@@ -76,4 +76,3 @@ function ajax_test_link() {
   );
   return $build;
 }
-
only in patch2:
unchanged:
--- a/core/modules/system/tests/modules/batch_test/batch_test.callbacks.inc
+++ b/core/modules/system/tests/modules/batch_test/batch_test.callbacks.inc
@@ -1,13 +1,12 @@
 <?php
 
-
 /**
  * @file
  * Batch callbacks for the Batch API tests.
  */
 
 /**
- * Simple batch operation.
+ * Preforms a simple batch operation.
  */
 function _batch_test_callback_1($id, $sleep, &$context) {
   // No-op, but ensure the batch take a couple iterations.
@@ -20,7 +19,7 @@ function _batch_test_callback_1($id, $sleep, &$context) {
 }
 
 /**
- * Multistep batch operation.
+ * Preforms a multistep batch operation.
  */
 function _batch_test_callback_2($start, $total, $sleep, &$context) {
   // Initialize context with progress information.
@@ -53,7 +52,7 @@ function _batch_test_callback_2($start, $total, $sleep, &$context) {
 }
 
 /**
- * Simple batch operation.
+ * Preforms a simple batch operation.
  */
 function _batch_test_callback_5($id, $sleep, &$context) {
   // No-op, but ensure the batch take a couple iterations.
@@ -68,7 +67,7 @@ function _batch_test_callback_5($id, $sleep, &$context) {
 }
 
 /**
- * Batch operation setting up its own batch.
+ * Preforms a batch operation setting up its own batch.
  */
 function _batch_test_nested_batch_callback() {
   batch_test_stack('setting up batch 2');
@@ -76,7 +75,7 @@ function _batch_test_nested_batch_callback() {
 }
 
 /**
- * Common 'finished' callbacks for batches 1 to 4.
+ * Preforms a common 'finished' callbacks for batches 1 to 4.
  */
 function _batch_test_finished_helper($batch_id, $success, $results, $operations) {
   $messages = array("results for batch $batch_id");
@@ -99,42 +98,42 @@ function _batch_test_finished_helper($batch_id, $success, $results, $operations)
 }
 
 /**
- * 'finished' callback for batch 0.
+ * Triggers 'finished' callback for batch 0.
  */
 function _batch_test_finished_0($success, $results, $operations) {
   _batch_test_finished_helper(0, $success, $results, $operations);
 }
 
 /**
- * 'finished' callback for batch 1.
+ * Triggers 'finished' callback for batch 1.
  */
 function _batch_test_finished_1($success, $results, $operations) {
   _batch_test_finished_helper(1, $success, $results, $operations);
 }
 
 /**
- * 'finished' callback for batch 2.
+ * Triggers 'finished' callback for batch 2.
  */
 function _batch_test_finished_2($success, $results, $operations) {
   _batch_test_finished_helper(2, $success, $results, $operations);
 }
 
 /**
- * 'finished' callback for batch 3.
+ * Triggers 'finished' callback for batch 3.
  */
 function _batch_test_finished_3($success, $results, $operations) {
   _batch_test_finished_helper(3, $success, $results, $operations);
 }
 
 /**
- * 'finished' callback for batch 4.
+ * Triggers 'finished' callback for batch 4.
  */
 function _batch_test_finished_4($success, $results, $operations) {
   _batch_test_finished_helper(4, $success, $results, $operations);
 }
 
 /**
- * 'finished' callback for batch 5.
+ * Triggers 'finished' callback for batch 5.
  */
 function _batch_test_finished_5($success, $results, $operations) {
   _batch_test_finished_helper(5, $success, $results, $operations);
only in patch2:
unchanged:
--- a/core/modules/system/tests/modules/batch_test/batch_test.module
+++ b/core/modules/system/tests/modules/batch_test/batch_test.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implement hook_menu().
+ * Implements hook_menu().
  */
 function batch_test_menu() {
   $items = array();
@@ -93,7 +93,7 @@ function batch_test_menu() {
 }
 
 /**
- * Simple form.
+ * Preforms a simple form.
  */
 function batch_test_simple_form() {
   $form['batch'] = array(
@@ -116,7 +116,7 @@ function batch_test_simple_form() {
 }
 
 /**
- * Submit handler for the simple form.
+ * Triggers submit handler for the simple form.
  */
 function batch_test_simple_form_submit($form, &$form_state) {
   batch_test_stack(NULL, TRUE);
@@ -129,7 +129,7 @@ function batch_test_simple_form_submit($form, &$form_state) {
 
 
 /**
- * Multistep form.
+ * Preforms a multistep form.
  */
 function batch_test_multistep_form($form, &$form_state) {
   if (empty($form_state['storage']['step'])) {
@@ -148,7 +148,7 @@ function batch_test_multistep_form($form, &$form_state) {
 }
 
 /**
- * Submit handler for the multistep form.
+ * Submits handler for the multistep form.
  */
 function batch_test_multistep_form_submit($form, &$form_state) {
   batch_test_stack(NULL, TRUE);
@@ -172,7 +172,7 @@ function batch_test_multistep_form_submit($form, &$form_state) {
 }
 
 /**
- * Form with chained submit callbacks.
+ * Tests a form with chained submit callbacks.
  */
 function batch_test_chained_form() {
   // This value is used to test that $form_state persists through batched
@@ -197,7 +197,7 @@ function batch_test_chained_form() {
 }
 
 /**
- * Submit handler #1 for the chained form.
+ * Triggers submit handler #1 for the chained form.
  */
 function batch_test_chained_form_submit_1($form, &$form_state) {
   batch_test_stack(NULL, TRUE);
@@ -213,7 +213,7 @@ function batch_test_chained_form_submit_1($form, &$form_state) {
 }
 
 /**
- * Submit handler #2 for the chained form.
+ * Triggers submit handler #2 for the chained form.
  */
 function batch_test_chained_form_submit_2($form, &$form_state) {
   batch_test_stack('submit handler 2');
@@ -227,7 +227,7 @@ function batch_test_chained_form_submit_2($form, &$form_state) {
 }
 
 /**
- * Submit handler #3 for the chained form.
+ * Triggers submit handler #3 for the chained form.
  */
 function batch_test_chained_form_submit_3($form, &$form_state) {
   batch_test_stack('submit handler 3');
@@ -240,7 +240,7 @@ function batch_test_chained_form_submit_3($form, &$form_state) {
 }
 
 /**
- * Submit handler #4 for the chained form.
+ * Triggers submit handler #4 for the chained form.
  */
 function batch_test_chained_form_submit_4($form, &$form_state) {
   batch_test_stack('submit handler 4');
@@ -254,7 +254,7 @@ function batch_test_chained_form_submit_4($form, &$form_state) {
 }
 
 /**
- * Menu callback: programmatically submits the 'Chained' form.
+ * Menu callback: Submits the 'Chained' form programmatically.
  */
 function batch_test_programmatic($value = 1) {
   $form_state = array(
@@ -265,7 +265,7 @@ function batch_test_programmatic($value = 1) {
 }
 
 /**
- * Menu callback: programmatically submits a form within a batch.
+ * Menu callback: Submits a form within a batch programmatically.
  */
 function batch_test_nested_drupal_form_submit($value = 1) {
   // Set the batch and process it.
@@ -277,7 +277,7 @@ function batch_test_nested_drupal_form_submit($value = 1) {
 }
 
 /**
- * Batch operation: submits form_test_mock_form using drupal_form_submit().
+ * Batch operation: Submits form_test_mock_form using drupal_form_submit().
  */
 function _batch_test_nested_drupal_form_submit_callback($value) {
   $state['values']['test_value'] = $value;
@@ -285,7 +285,7 @@ function _batch_test_nested_drupal_form_submit_callback($value) {
 }
 
 /**
- * A simple form with a textfield and submit button.
+ * Returns a simple form with a textfield and submit button.
  */
 function batch_test_mock_form($form, $form_state) {
   $form['test_value'] = array(
@@ -300,14 +300,14 @@ function batch_test_mock_form($form, $form_state) {
 }
 
 /**
- * Submit handler for the batch_test_mock form.
+ * Triggers submit handler for the batch_test_mock form.
  */
 function batch_test_mock_form_submit($form, &$form_state) {
   batch_test_stack('mock form submitted with value = ' . $form_state['values']['test_value']);
 }
 
 /**
- * Menu callback: fire a batch process without a form submission.
+ * Menu callback: Fires a batch process without a form submission.
  */
 function batch_test_no_form() {
   batch_test_stack(NULL, TRUE);
@@ -317,7 +317,7 @@ function batch_test_no_form() {
 }
 
 /**
- * Menu callback: fire a batch process without a form submission.
+ * Menu callback: Fires a batch process without a form submission.
  */
 function batch_test_large_percentage() {
   batch_test_stack(NULL, TRUE);
@@ -327,14 +327,14 @@ function batch_test_large_percentage() {
 }
 
 /**
- * Menu callback: successful redirection.
+ * Menu callback: Redirects successfuly.
  */
 function batch_test_redirect_page() {
   return 'Redirection successful.';
 }
 
 /**
- * Batch 0: no operation.
+ * Batch 0: Operates nothing.
  */
 function _batch_test_batch_0() {
   $batch = array(
@@ -346,7 +346,7 @@ function _batch_test_batch_0() {
 }
 
 /**
- * Batch 1: repeats a simple operation.
+ * Batch 1: Repeats a simple operation.
  *
  * Operations: op 1 from 1 to 10.
  */
@@ -368,7 +368,7 @@ function _batch_test_batch_1() {
 }
 
 /**
- * Batch 2: single multistep operation.
+ * Batch 2: Preforms a single multistep operation.
  *
  * Operations: op 2 from 1 to 10.
  */
@@ -389,7 +389,7 @@ function _batch_test_batch_2() {
 }
 
 /**
- * Batch 3: both single and multistep operations.
+ * Batch 3: Preforms both single and multistep operations.
  *
  * Operations:
  * - op 1 from 1 to 5,
@@ -420,7 +420,7 @@ function _batch_test_batch_3() {
 }
 
 /**
- * Batch 4: batch within a batch.
+ * Batch 4: Preforms a batch within a batch.
  *
  * Operations:
  * - op 1 from 1 to 5,
@@ -449,7 +449,7 @@ function _batch_test_batch_4() {
 }
 
 /**
- * Batch 5: repeats a simple operation.
+ * Batch 5: Repeats a simple operation.
  *
  * Operations: op 1 from 1 to 10.
  */
@@ -471,7 +471,7 @@ function _batch_test_batch_5() {
 }
 
 /**
- * Menu callback: run a batch for testing theme used on the progress page.
+ * Menu callback: Runs a batch for testing theme used on the progress page.
  */
 function batch_test_theme_batch() {
   batch_test_stack(NULL, TRUE);
@@ -485,7 +485,7 @@ function batch_test_theme_batch() {
 }
 
 /**
- * Batch callback function for testing the theme used on the progress page.
+ * Tests the progress page theme by performing a batch callback.
  */
 function _batch_test_theme_callback() {
   // Because drupalGet() steps through the full progressive batch before
@@ -498,7 +498,7 @@ function _batch_test_theme_callback() {
 }
 
 /**
- * Helper function: store or retrieve traced execution data.
+ * Helper function: Stores or retrieve traced execution data.
  */
 function batch_test_stack($data = NULL, $reset = FALSE) {
   if ($reset) {
only in patch2:
unchanged:
--- a/core/modules/system/tests/modules/common_test/common_test.module
+++ b/core/modules/system/tests/modules/common_test/common_test.module
@@ -62,28 +62,28 @@ function common_test_menu() {
 }
 
 /**
- * Redirect using drupal_goto().
+ * Redirects using drupal_goto().
  */
 function common_test_drupal_goto_redirect() {
   drupal_goto('common-test/drupal_goto');
 }
 
 /**
- * Redirect using drupal_goto().
+ * Redirects using drupal_goto().
  */
 function common_test_drupal_goto_redirect_advanced() {
   drupal_goto('common-test/drupal_goto', array('query' => array('foo' => '123')), 301);
 }
 
 /**
- * Landing page for drupal_goto().
+ * This is a landing a page for drupal_goto().
  */
 function common_test_drupal_goto_land() {
   print "drupal_goto";
 }
 
 /**
- * Fail landing page for drupal_goto().
+ * This is a failure landing page for drupal_goto().
  */
 function common_test_drupal_goto_land_fail() {
   print "drupal_goto_fail";
@@ -99,7 +99,7 @@ function common_test_drupal_goto_alter(&$path, &$options, &$http_response_code)
 }
 
 /**
- * Print destination query parameter.
+ * Prints a destination query parameter.
  */
 function common_test_destination() {
   $destination = drupal_get_destination();
@@ -107,7 +107,7 @@ function common_test_destination() {
 }
 
 /**
- * Render an element with an invalid render array key.
+ * Renders an element with an invalid render array key.
  */
 function common_test_drupal_render_invalid_keys() {
   define('SIMPLETEST_COLLECT_ERRORS', FALSE);
@@ -227,7 +227,7 @@ function common_test_theme() {
 }
 
 /**
- * Theme function for testing drupal_render() theming.
+ * Testing a theme function for drupal_render() theming.
  */
 function theme_common_test_foo($variables) {
   return $variables['foo'] . $variables['bar'];
only in patch2:
unchanged:
--- a/core/modules/system/tests/modules/common_test_cron_helper/common_test_cron_helper.module
+++ b/core/modules/system/tests/modules/common_test_cron_helper/common_test_cron_helper.module
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Helper module for the testCronExceptions in addition to common_test module.
only in patch2:
unchanged:
--- a/core/modules/system/tests/modules/database_test/database_test.module
+++ b/core/modules/system/tests/modules/database_test/database_test.module
@@ -76,7 +76,7 @@ function database_test_menu() {
 }
 
 /**
- * Run a db_query_temporary and output the table name and its number of rows.
+ * Runs a db_query_temporary and output the table name and its number of rows.
  *
  * We need to test that the table created is temporary, so we run it here, in a
  * separate menu callback request; After this request is done, the temporary
@@ -92,7 +92,7 @@ function database_test_db_query_temporary() {
 }
 
 /**
- * Run a pager query and return the results.
+ * Runs a pager query and return the results.
  *
  * This function does care about the page GET parameter, as set by the
  * simpletest HTTP call.
@@ -116,7 +116,7 @@ function database_test_even_pager_query($limit) {
 }
 
 /**
- * Run a pager query and return the results.
+ * Runs a pager query and return the results.
  *
  * This function does care about the page GET parameter, as set by the
  * simpletest HTTP call.
@@ -140,7 +140,7 @@ function database_test_odd_pager_query($limit) {
 }
 
 /**
- * Run a tablesort query and return the results.
+ * Runs a tablesort query and return the results.
  *
  * This function does care about the page GET parameter, as set by the
  * simpletest HTTP call.
@@ -169,7 +169,7 @@ function database_test_tablesort() {
 }
 
 /**
- * Run a tablesort query with a second order_by after and return the results.
+ * Runs a tablesort query with a second order_by after and return the results.
  *
  * This function does care about the page GET parameter, as set by the
  * simpletest HTTP call.
@@ -198,7 +198,7 @@ function database_test_tablesort_first() {
 }
 
 /**
- * Output a form without setting a header sort.
+ * Outputs a form without setting a header sort.
  */
 function database_test_theme_tablesort($form, &$form_state) {
   $header = array(
only in patch2:
unchanged:
--- a/core/modules/system/tests/modules/database_test/database_test.test
+++ b/core/modules/system/tests/modules/database_test/database_test.test
@@ -10,7 +10,7 @@ use Drupal\Core\Database\Query\InvalidMergeQueryException;
 use Drupal\Core\Database\Query\NoFieldsException;
 
 /**
- * Dummy class for fetching into a class.
+ * Fetches into a class.
  *
  * PDO supports using a new instance of an arbitrary class for records
  * rather than just a stdClass or array. This class is for testing that
@@ -19,7 +19,7 @@ use Drupal\Core\Database\Query\NoFieldsException;
 class FakeRecord { }
 
 /**
- * Base test class for databases.
+ * Tests class for databases.
  *
  * Because all database tests share the same test data, we can centralize that
  * here.
@@ -45,7 +45,7 @@ class DatabaseTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Set up several tables needed by a certain test.
+   * Sets up several tables needed by a certain test.
    *
    * @param $schema
    *   An array of table definitions to install.
@@ -65,7 +65,7 @@ class DatabaseTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Set up tables for NULL handling.
+   * Sets up tables for NULL handling.
    */
   function ensureSampleDataNull() {
     $schema['test_null'] = drupal_get_schema('test_null');
@@ -89,7 +89,7 @@ class DatabaseTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Setup our sample data.
+   * Sets up our sample data.
    *
    * These are added using db_query(), since we're not trying to test the
    * INSERT operations here, just populate.
@@ -178,7 +178,7 @@ class DatabaseTestCase extends DrupalWebTestCase {
 }
 
 /**
- * Test connection management.
+ * Tests connection management.
  */
 class DatabaseConnectionTestCase extends DatabaseTestCase {
 
@@ -191,7 +191,7 @@ class DatabaseConnectionTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that connections return appropriate connection objects.
+   * Tests that connections return appropriate connection objects.
    */
   function testConnectionRouting() {
     // Clone the master credentials to a slave connection.
@@ -225,7 +225,7 @@ class DatabaseConnectionTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that connections return appropriate connection objects.
+   * Tests that connections return appropriate connection objects.
    */
   function testConnectionRoutingOverride() {
     // Clone the master credentials to a slave connection.
@@ -294,7 +294,7 @@ class DatabaseConnectionTestCase extends DatabaseTestCase {
 }
 
 /**
- * Test fetch actions, part 1.
+ * Tests fetch actions, part 1.
  *
  * We get timeout errors if we try to run too many tests at once.
  */
@@ -309,7 +309,7 @@ class DatabaseFetchTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that we can fetch a record properly in default object mode.
+   * Confirms that we can fetch a record properly in default object mode.
    */
   function testQueryFetchDefault() {
     $records = array();
@@ -325,7 +325,7 @@ class DatabaseFetchTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that we can fetch a record to an object explicitly.
+   * Confirms that we can fetch a record to an object explicitly.
    */
   function testQueryFetchObject() {
     $records = array();
@@ -340,7 +340,7 @@ class DatabaseFetchTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that we can fetch a record to an array associative explicitly.
+   * Confirms that we can fetch a record to an array associative explicitly.
    */
   function testQueryFetchArray() {
     $records = array();
@@ -356,7 +356,7 @@ class DatabaseFetchTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that we can fetch a record into a new instance of a custom class.
+   * Confirms that we can fetch a record into a new instance of a custom class.
    *
    * @see FakeRecord
    */
@@ -375,7 +375,7 @@ class DatabaseFetchTestCase extends DatabaseTestCase {
 }
 
 /**
- * Test fetch actions, part 2.
+ * Tests fetch actions, part 2.
  *
  * We get timeout errors if we try to run too many tests at once.
  */
@@ -389,7 +389,7 @@ class DatabaseFetch2TestCase extends DatabaseTestCase {
     );
   }
 
-  // Confirm that we can fetch a record into an indexed array explicitly.
+  // Confirms that we can fetch a record into an indexed array explicitly.
   function testQueryFetchNum() {
     $records = array();
     $result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25), array('fetch' => PDO::FETCH_NUM));
@@ -404,7 +404,7 @@ class DatabaseFetch2TestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that we can fetch a record into a doubly-keyed array explicitly.
+   * Confirms that we can fetch a record into a doubly-keyed array explicitly.
    */
   function testQueryFetchBoth() {
     $records = array();
@@ -421,7 +421,7 @@ class DatabaseFetch2TestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that we can fetch an entire column of a result set at once.
+   * Confirms that we can fetch an entire column of a result set at once.
    */
   function testQueryFetchCol() {
     $records = array();
@@ -438,7 +438,7 @@ class DatabaseFetch2TestCase extends DatabaseTestCase {
 }
 
 /**
- * Test the insert builder.
+ * Tests the insert builder.
  */
 class DatabaseInsertTestCase extends DatabaseTestCase {
 
@@ -451,7 +451,7 @@ class DatabaseInsertTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test the very basic insert functionality.
+   * Tests the very basic insert functionality.
    */
   function testSimpleInsert() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
@@ -470,7 +470,7 @@ class DatabaseInsertTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can insert multiple records in one query object.
+   * Tests that we can insert multiple records in one query object.
    */
   function testMultiInsert() {
     $num_records_before = (int) db_query('SELECT COUNT(*) FROM {test}')->fetchField();
@@ -503,7 +503,7 @@ class DatabaseInsertTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that an insert object can be reused with new data after it executes.
+   * Tests that an insert object can be reused with new data after it executes.
    */
   function testRepeatedInsert() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
@@ -538,7 +538,7 @@ class DatabaseInsertTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can specify fields without values and specify values later.
+   * Tests that we can specify fields without values and specify values later.
    */
   function testInsertFieldOnlyDefinintion() {
     // This is useful for importers, when we want to create a query and define
@@ -572,7 +572,7 @@ class DatabaseInsertTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that the INSERT INTO ... SELECT ... syntax works.
+   * Tests that the INSERT INTO ... SELECT ... syntax works.
    */
   function testInsertSelect() {
     $query = db_select('test_people', 'tp');
@@ -599,7 +599,7 @@ class DatabaseInsertTestCase extends DatabaseTestCase {
 }
 
 /**
- * Insert tests using LOB fields, which are weird on some databases.
+ * Inserts tests using LOB fields, which are weird on some databases.
  */
 class DatabaseInsertLOBTestCase extends DatabaseTestCase {
 
@@ -612,7 +612,7 @@ class DatabaseInsertLOBTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can insert a single blob field successfully.
+   * Tests that we can insert a single blob field successfully.
    */
   function testInsertOneBlob() {
     $data = "This is\000a test.";
@@ -625,7 +625,7 @@ class DatabaseInsertLOBTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can insert multiple blob fields in the same query.
+   * Tests that we can insert multiple blob fields in the same query.
    */
   function testInsertMultipleBlob() {
     $id = db_insert('test_two_blobs')
@@ -640,7 +640,7 @@ class DatabaseInsertLOBTestCase extends DatabaseTestCase {
 }
 
 /**
- * Insert tests for "database default" values.
+ * Inserts tests for "database default" values.
  */
 class DatabaseInsertDefaultsTestCase extends DatabaseTestCase {
 
@@ -653,7 +653,7 @@ class DatabaseInsertDefaultsTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can run a query that is "default values for everything".
+   * Tests that we can run a query that is "default values for everything".
    */
   function testDefaultInsert() {
     $query = db_insert('test')->useDefaults(array('job'));
@@ -666,7 +666,7 @@ class DatabaseInsertDefaultsTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that no action will be preformed if no fields are specified.
+   * Tests that no action will be preformed if no fields are specified.
    */
   function testDefaultEmptyInsert() {
     $num_records_before = (int) db_query('SELECT COUNT(*) FROM {test}')->fetchField();
@@ -684,7 +684,7 @@ class DatabaseInsertDefaultsTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can insert fields with values and defaults in the same query.
+   * Tests that we can insert fields with values and defaults in the same query.
    */
   function testDefaultInsertWithFields() {
     $query = db_insert('test')
@@ -700,7 +700,7 @@ class DatabaseInsertDefaultsTestCase extends DatabaseTestCase {
 }
 
 /**
- * Update builder tests.
+ * Updates builder tests.
  */
 class DatabaseUpdateTestCase extends DatabaseTestCase {
 
@@ -713,7 +713,7 @@ class DatabaseUpdateTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that we can update a single record successfully.
+   * Confirms that we can update a single record successfully.
    */
   function testSimpleUpdate() {
     $num_updated = db_update('test')
@@ -727,7 +727,7 @@ class DatabaseUpdateTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm updating to NULL.
+   * Confirms updating to NULL.
    */
   function testSimpleNullUpdate() {
     $this->ensureSampleDataNull();
@@ -742,7 +742,7 @@ class DatabaseUpdateTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that we can update a multiple records successfully.
+   * Confirms that we can update a multiple records successfully.
    */
   function testMultiUpdate() {
     $num_updated = db_update('test')
@@ -756,7 +756,7 @@ class DatabaseUpdateTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that we can update a multiple records with a non-equality condition.
+   * Confirms that we can update a multiple records with a non-equality condition.
    */
   function testMultiGTUpdate() {
     $num_updated = db_update('test')
@@ -770,7 +770,7 @@ class DatabaseUpdateTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that we can update a multiple records with a where call.
+   * Confirms that we can update a multiple records with a where call.
    */
   function testWhereUpdate() {
     $num_updated = db_update('test')
@@ -784,7 +784,7 @@ class DatabaseUpdateTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that we can stack condition and where calls.
+   * Confirms that we can stack condition and where calls.
    */
   function testWhereAndConditionUpdate() {
     $update = db_update('test')
@@ -799,7 +799,7 @@ class DatabaseUpdateTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test updating with expressions.
+   * Tests updating with expressions.
    */
   function testExpressionUpdate() {
     // Set age = 1 for a single row for this test to work.
@@ -833,7 +833,7 @@ class DatabaseUpdateComplexTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test updates with OR conditionals.
+   * Tests updates with OR conditionals.
    */
   function testOrConditionUpdate() {
     $update = db_update('test')
@@ -850,7 +850,7 @@ class DatabaseUpdateComplexTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test WHERE IN clauses.
+   * Tests WHERE IN clauses.
    */
   function testInConditionUpdate() {
     $num_updated = db_update('test')
@@ -864,7 +864,7 @@ class DatabaseUpdateComplexTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test WHERE NOT IN clauses.
+   * Tests WHERE NOT IN clauses.
    */
   function testNotInConditionUpdate() {
     // The o is lowercase in the 'NoT IN' operator, to make sure the operators
@@ -880,7 +880,7 @@ class DatabaseUpdateComplexTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test BETWEEN conditional clauses.
+   * Tests BETWEEN conditional clauses.
    */
   function testBetweenConditionUpdate() {
     $num_updated = db_update('test')
@@ -894,7 +894,7 @@ class DatabaseUpdateComplexTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test LIKE conditionals.
+   * Tests LIKE conditionals.
    */
   function testLikeConditionUpdate() {
     $num_updated = db_update('test')
@@ -908,7 +908,7 @@ class DatabaseUpdateComplexTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test update with expression values.
+   * Tests update with expression values.
    */
   function testUpdateExpression() {
     $before_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetchField();
@@ -931,7 +931,7 @@ class DatabaseUpdateComplexTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test update with only expression values.
+   * Tests update with only expression values.
    */
   function testUpdateOnlyExpression() {
     $before_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetchField();
@@ -947,7 +947,7 @@ class DatabaseUpdateComplexTestCase extends DatabaseTestCase {
 }
 
 /**
- * Test update queries involving LOB values.
+ * Tests update queries involving LOB values.
  */
 class DatabaseUpdateLOBTestCase extends DatabaseTestCase {
 
@@ -960,7 +960,7 @@ class DatabaseUpdateLOBTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that we can update a blob column.
+   * Confirms that we can update a blob column.
    */
   function testUpdateOneBlob() {
     $data = "This is\000a test.";
@@ -980,7 +980,7 @@ class DatabaseUpdateLOBTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that we can update two blob columns in the same table.
+   * Confirms that we can update two blob columns in the same table.
    */
   function testUpdateMultipleBlob() {
     $id = db_insert('test_two_blobs')
@@ -1001,7 +1001,7 @@ class DatabaseUpdateLOBTestCase extends DatabaseTestCase {
 }
 
 /**
- * Delete/Truncate tests.
+ * Deletes/Truncates tests.
  *
  * The DELETE tests are not as extensive, as all of the interesting code for
  * DELETE queries is in the conditional which is identical to the UPDATE and
@@ -1022,7 +1022,7 @@ class DatabaseDeleteTruncateTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that we can use a subselect in a delete successfully.
+   * Confirms that we can use a subselect in a delete successfully.
    */
   function testSubselectDelete() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_task}')->fetchField();
@@ -1043,7 +1043,7 @@ class DatabaseDeleteTruncateTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that we can delete a single record successfully.
+   * Confirms that we can delete a single record successfully.
    */
   function testSimpleDelete() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
@@ -1058,7 +1058,7 @@ class DatabaseDeleteTruncateTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that we can truncate a whole table successfully.
+   * Confirms that we can truncate a whole table successfully.
    */
   function testTruncate() {
     $num_records_before = db_query("SELECT COUNT(*) FROM {test}")->fetchField();
@@ -1071,7 +1071,7 @@ class DatabaseDeleteTruncateTestCase extends DatabaseTestCase {
 }
 
 /**
- * Test the MERGE query builder.
+ * Tests the MERGE query builder.
  */
 class DatabaseMergeTestCase extends DatabaseTestCase {
 
@@ -1084,7 +1084,7 @@ class DatabaseMergeTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that we can merge-insert a record successfully.
+   * Confirms that we can merge-insert a record successfully.
    */
   function testMergeInsert() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
@@ -1109,7 +1109,7 @@ class DatabaseMergeTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that we can merge-update a record successfully.
+   * Confirms that we can merge-update a record successfully.
    */
   function testMergeUpdate() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
@@ -1134,7 +1134,7 @@ class DatabaseMergeTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that we can merge-update a record successfully, with different insert and update.
+   * Confirms that we can merge-update a record successfully, with different insert and update.
    */
   function testMergeUpdateExcept() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
@@ -1155,7 +1155,7 @@ class DatabaseMergeTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that we can merge-update a record successfully, with alternate replacement.
+   * Confirms that we can merge-update a record successfully, with alternate replacement.
    */
   function testMergeUpdateExplicit() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
@@ -1181,7 +1181,7 @@ class DatabaseMergeTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that we can merge-update a record successfully, with expressions.
+   * Confirms that we can merge-update a record successfully, with expressions.
    */
   function testMergeUpdateExpression() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
@@ -1210,7 +1210,7 @@ class DatabaseMergeTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can merge-insert without any update fields.
+   * Tests that we can merge-insert without any update fields.
    */
   function testMergeInsertWithoutUpdate() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
@@ -1229,7 +1229,7 @@ class DatabaseMergeTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that we can merge-update without any update fields.
+   * Confirms that we can merge-update without any update fields.
    */
   function testMergeUpdateWithoutUpdate() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
@@ -1261,7 +1261,7 @@ class DatabaseMergeTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that an invalid merge query throws an exception like it is supposed to.
+   * Tests that an invalid merge query throws an exception like it is supposed to.
    */
   function testInvalidMerge() {
     try {
@@ -1282,7 +1282,7 @@ class DatabaseMergeTestCase extends DatabaseTestCase {
 }
 
 /**
- * Test the SELECT builder.
+ * Tests the SELECT builder.
  */
 class DatabaseSelectTestCase extends DatabaseTestCase {
 
@@ -1295,7 +1295,7 @@ class DatabaseSelectTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test rudimentary SELECT statements.
+   * Tests rudimentary SELECT statements.
    */
   function testSimpleSelect() {
     $query = db_select('test');
@@ -1312,7 +1312,7 @@ class DatabaseSelectTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test rudimentary SELECT statement with a COMMENT.
+   * Tests rudimentary SELECT statement with a COMMENT.
    */
   function testSimpleComment() {
     $query = db_select('test')->comment('Testing query comments');
@@ -1333,7 +1333,7 @@ class DatabaseSelectTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test query COMMENT system against vulnerabilities.
+   * Tests query COMMENT system against vulnerabilities.
    */
   function testVulnerableComment() {
     $query = db_select('test')->comment('Testing query comments */ SELECT nid FROM {node}; --');
@@ -1354,7 +1354,7 @@ class DatabaseSelectTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test basic conditionals on SELECT statements.
+   * Tests basic conditionals on SELECT statements.
    */
   function testSimpleSelectConditional() {
     $query = db_select('test');
@@ -1374,7 +1374,7 @@ class DatabaseSelectTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test SELECT statements with expressions.
+   * Tests SELECT statements with expressions.
    */
   function testSimpleSelectExpression() {
     $query = db_select('test');
@@ -1394,7 +1394,7 @@ class DatabaseSelectTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test SELECT statements with multiple expressions.
+   * Tests SELECT statements with multiple expressions.
    */
   function testSimpleSelectExpressionMultiple() {
     $query = db_select('test');
@@ -1416,7 +1416,7 @@ class DatabaseSelectTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test adding multiple fields to a select statement at the same time.
+   * Tests adding multiple fields to a select statement at the same time.
    */
   function testSimpleSelectMultipleFields() {
     $record = db_select('test')
@@ -1439,7 +1439,7 @@ class DatabaseSelectTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test adding all fields from a given table to a select statement.
+   * Tests adding all fields from a given table to a select statement.
    */
   function testSimpleSelectAllFields() {
     $record = db_select('test')
@@ -1462,7 +1462,7 @@ class DatabaseSelectTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that a comparison with NULL is always FALSE.
+   * Tests that a comparison with NULL is always FALSE.
    */
   function testNullCondition() {
     $this->ensureSampleDataNull();
@@ -1476,7 +1476,7 @@ class DatabaseSelectTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can find a record with a NULL value.
+   * Tests that we can find a record with a NULL value.
    */
   function testIsNullCondition() {
     $this->ensureSampleDataNull();
@@ -1491,7 +1491,7 @@ class DatabaseSelectTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can find a record without a NULL value.
+   * Tests that we can find a record without a NULL value.
    */
   function testIsNotNullCondition() {
     $this->ensureSampleDataNull();
@@ -1508,7 +1508,7 @@ class DatabaseSelectTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can UNION multiple Select queries together. This is
+   * Tests that we can UNION multiple Select queries together. This is
    * semantically equal to UNION DISTINCT, so we don't explicity test that.
    */
   function testUnion() {
@@ -1532,7 +1532,7 @@ class DatabaseSelectTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can UNION ALL multiple Select queries together.
+   * Tests that we can UNION ALL multiple Select queries together.
    */
   function testUnionAll() {
     $query_1 = db_select('test', 't')
@@ -1556,7 +1556,7 @@ class DatabaseSelectTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that random ordering of queries works.
+   * Tests that random ordering of queries works.
    *
    * We take the approach of testing the Drupal layer only, rather than trying
    * to test that the database's random number generator actually produces
@@ -1618,7 +1618,7 @@ class DatabaseSelectTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that aliases are renamed when duplicates.
+   * Tests that aliases are renamed when duplicates.
    */
   function testSelectDuplicateAlias() {
     $query = db_select('test', 't');
@@ -1629,7 +1629,7 @@ class DatabaseSelectTestCase extends DatabaseTestCase {
 }
 
 /**
- * Test case for subselects in a dynamic SELECT query.
+ * Tests case for subselects in a dynamic SELECT query.
  */
 class DatabaseSelectSubqueryTestCase extends DatabaseTestCase {
 
@@ -1642,7 +1642,7 @@ class DatabaseSelectSubqueryTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can use a subquery in a FROM clause.
+   * Tests that we can use a subquery in a FROM clause.
    */
   function testFromSubquerySelect() {
     // Create a subquery, which is just a normal query object.
@@ -1676,7 +1676,7 @@ class DatabaseSelectSubqueryTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can use a subquery in a FROM clause with a limit.
+   * Tests that we can use a subquery in a FROM clause with a limit.
    */
   function testFromSubquerySelectWithLimit() {
     // Create a subquery, which is just a normal query object.
@@ -1702,7 +1702,7 @@ class DatabaseSelectSubqueryTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can use a subquery in a WHERE clause.
+   * Tests that we can use a subquery in a WHERE clause.
    */
   function testConditionSubquerySelect() {
     // Create a subquery, which is just a normal query object.
@@ -1725,7 +1725,7 @@ class DatabaseSelectSubqueryTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can use a subquery in a JOIN clause.
+   * Tests that we can use a subquery in a JOIN clause.
    */
   function testJoinSubquerySelect() {
     // Create a subquery, which is just a normal query object.
@@ -1749,7 +1749,7 @@ class DatabaseSelectSubqueryTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test EXISTS subquery conditionals on SELECT statements.
+   * Tests EXISTS subquery conditionals on SELECT statements.
    *
    * We essentially select all rows from the {test} table that have matching
    * rows in the {test_people} table based on the shared name column.
@@ -1779,7 +1779,7 @@ class DatabaseSelectSubqueryTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test NOT EXISTS subquery conditionals on SELECT statements.
+   * Tests NOT EXISTS subquery conditionals on SELECT statements.
    *
    * We essentially select all rows from the {test} table that don't have
    * matching rows in the {test_people} table based on the shared name column.
@@ -1810,7 +1810,7 @@ class DatabaseSelectSubqueryTestCase extends DatabaseTestCase {
 }
 
 /**
- * Test select with order by clauses.
+ * Tests select with order by clauses.
  */
 class DatabaseSelectOrderedTestCase extends DatabaseTestCase {
 
@@ -1823,7 +1823,7 @@ class DatabaseSelectOrderedTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test basic order by.
+   * Tests basic order by.
    */
   function testSimpleSelectOrdered() {
     $query = db_select('test');
@@ -1844,7 +1844,7 @@ class DatabaseSelectOrderedTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test multiple order by.
+   * Tests multiple order by.
    */
   function testSimpleSelectMultiOrdered() {
     $query = db_select('test');
@@ -1875,7 +1875,7 @@ class DatabaseSelectOrderedTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test order by descending.
+   * Tests order by descending.
    */
   function testSimpleSelectOrderedDesc() {
     $query = db_select('test');
@@ -1897,7 +1897,7 @@ class DatabaseSelectOrderedTestCase extends DatabaseTestCase {
 }
 
 /**
- * Test more complex select statements.
+ * Tests more complex select statements.
  */
 class DatabaseSelectComplexTestCase extends DatabaseTestCase {
 
@@ -1910,7 +1910,7 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test simple JOIN statements.
+   * Tests simple JOIN statements.
    */
   function testDefaultJoin() {
     $query = db_select('test_task', 't');
@@ -1935,7 +1935,7 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test LEFT OUTER joins.
+   * Tests LEFT OUTER joins.
    */
   function testLeftOuterJoin() {
     $query = db_select('test', 'p');
@@ -1960,7 +1960,7 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test GROUP BY clauses.
+   * Tests GROUP BY clauses.
    */
   function testGroupBy() {
     $query = db_select('test_task', 't');
@@ -1996,7 +1996,7 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test GROUP BY and HAVING clauses together.
+   * Tests GROUP BY and HAVING clauses together.
    */
   function testGroupByAndHaving() {
     $query = db_select('test_task', 't');
@@ -2030,7 +2030,7 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test range queries. The SQL clause varies with the database.
+   * Tests range queries. The SQL clause varies with the database.
    */
   function testRange() {
     $query = db_select('test');
@@ -2048,7 +2048,7 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test distinct queries.
+   * Tests distinct queries.
    */
   function testDistinct() {
     $query = db_select('test_task');
@@ -2065,7 +2065,7 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can generate a count query from a built query.
+   * Tests that we can generate a count query from a built query.
    */
   function testCountQuery() {
     $query = db_select('test');
@@ -2096,7 +2096,7 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that countQuery properly removes 'all_fields' statements and
+   * Tests that countQuery properly removes 'all_fields' statements and
    * ordering clauses.
    */
   function testCountQueryRemovals() {
@@ -2125,7 +2125,7 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase {
 
 
   /**
-   * Test that countQuery properly removes fields and expressions.
+   * Tests that countQuery properly removes fields and expressions.
    */
   function testCountQueryFieldRemovals() {
     // countQuery should remove all fields and expressions, so this can be
@@ -2143,7 +2143,7 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can generate a count query from a query with distinct.
+   * Tests that we can generate a count query from a query with distinct.
    */
   function testCountQueryDistinct() {
     $query = db_select('test_task');
@@ -2156,7 +2156,7 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can generate a count query from a query with GROUP BY.
+   * Tests that we can generate a count query from a query with GROUP BY.
    */
   function testCountQueryGroupBy() {
     $query = db_select('test_task');
@@ -2181,7 +2181,7 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that we can properly nest conditional clauses.
+   * Confirms that we can properly nest conditional clauses.
    */
   function testNestedConditions() {
     // This query should translate to:
@@ -2198,7 +2198,7 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm we can join on a single table twice with a dynamic alias.
+   * Confirms we can join on a single table twice with a dynamic alias.
    */
   function testJoinTwice() {
     $query = db_select('test')->fields('test');
@@ -2214,7 +2214,7 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase {
 }
 
 /**
- * Test more complex select statements, part 2.
+ * Tests more complex select statements, part 2.
  */
 class DatabaseSelectComplexTestCase2 extends DatabaseTestCase {
 
@@ -2231,7 +2231,7 @@ class DatabaseSelectComplexTestCase2 extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can join on a query.
+   * Tests that we can join on a query.
    */
   function testJoinSubquery() {
     $acct = $this->drupalCreateUser();
@@ -2267,6 +2267,9 @@ class DatabaseSelectComplexTestCase2 extends DatabaseTestCase {
   }
 }
 
+/**
+ * Selects the database pager.
+ */
 class DatabaseSelectPagerDefaultTestCase extends DatabaseTestCase {
 
   public static function getInfo() {
@@ -2278,7 +2281,7 @@ class DatabaseSelectPagerDefaultTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that a pager query returns the correct results.
+   * Confirms that a pager query returns the correct results.
    *
    * Note that we have to make an HTTP request to a test page handler
    * because the pager depends on GET parameters.
@@ -2312,7 +2315,7 @@ class DatabaseSelectPagerDefaultTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that a pager query returns the correct results.
+   * Confirms that a pager query returns the correct results.
    *
    * Note that we have to make an HTTP request to a test page handler
    * because the pager depends on GET parameters.
@@ -2346,7 +2349,7 @@ class DatabaseSelectPagerDefaultTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that a pager query with inner pager query returns valid results.
+   * Confirms that a pager query with inner pager query returns valid results.
    *
    * This is a regression test for #467984.
    */
@@ -2367,7 +2370,7 @@ class DatabaseSelectPagerDefaultTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that a paging query with a having expression returns valid results.
+   * Confirms that a paging query with a having expression returns valid results.
    *
    * This is a regression test for #467984.
    */
@@ -2387,7 +2390,7 @@ class DatabaseSelectPagerDefaultTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that every pager gets a valid non-overlaping element ID.
+   * Confirms that every pager gets a valid non-overlaping element ID.
    */
   function testElementNumbers() {
     $_GET['page'] = '3, 2, 1, 0';
@@ -2424,7 +2427,9 @@ class DatabaseSelectPagerDefaultTestCase extends DatabaseTestCase {
   }
 }
 
-
+/**
+ * Tests the table sort query.
+ */
 class DatabaseSelectTableSortDefaultTestCase extends DatabaseTestCase {
 
   public static function getInfo() {
@@ -2436,7 +2441,7 @@ class DatabaseSelectTableSortDefaultTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that a tablesort query returns the correct results.
+   * Confirms that a tablesort query returns the correct results.
    *
    * Note that we have to make an HTTP request to a test page handler
    * because the pager depends on GET parameters.
@@ -2464,8 +2469,8 @@ class DatabaseSelectTableSortDefaultTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that if a tablesort's orderByHeader is called before another orderBy, that the header happens first.
-   *
+   * Confirms that if a tablesort's orderByHeader is called before another
+   * orderBy, that the header happens first.
    */
   function testTableSortQueryFirst() {
     $sorts = array(
@@ -2490,7 +2495,8 @@ class DatabaseSelectTableSortDefaultTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that if a sort is not set in a tableselect form there is no error thrown when using the default.
+   * Confirms that if a sort is not set in a tableselect form there is no error
+   * thrown when using the default.
    */
   function testTableSortDefaultSort() {
     $this->drupalGet('database_test/tablesort_default_sort');
@@ -2500,7 +2506,7 @@ class DatabaseSelectTableSortDefaultTestCase extends DatabaseTestCase {
 }
 
 /**
- * Select tagging tests.
+ * Selects tagging tests.
  *
  * Tags are a way to flag queries for alter hooks so they know
  * what type of query it is, such as "node_access".
@@ -2516,7 +2522,7 @@ class DatabaseTaggingTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that a query has a "tag" added to it.
+   * Confirms that a query has a "tag" added to it.
    */
   function testHasTag() {
     $query = db_select('test');
@@ -2530,7 +2536,7 @@ class DatabaseTaggingTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test query tagging "has all of these tags" functionality.
+   * Tests query tagging "has all of these tags" functionality.
    */
   function testHasAllTags() {
     $query = db_select('test');
@@ -2545,7 +2551,7 @@ class DatabaseTaggingTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test query tagging "has at least one of these tags" functionality.
+   * Tests query tagging "has at least one of these tags" functionality.
    */
   function testHasAnyTag() {
     $query = db_select('test');
@@ -2559,7 +2565,7 @@ class DatabaseTaggingTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can attach meta data to a query object.
+   * Tests that we can attach meta data to a query object.
    *
    * This is how we pass additional context to alter hooks.
    */
@@ -2584,7 +2590,7 @@ class DatabaseTaggingTestCase extends DatabaseTestCase {
 }
 
 /**
- * Select alter tests.
+ * Selects alter tests.
  *
  * @see database_test_query_alter()
  */
@@ -2599,7 +2605,7 @@ class DatabaseAlterTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can do basic alters.
+   * Tests that we can do basic alters.
    */
   function testSimpleAlter() {
     $query = db_select('test');
@@ -2618,7 +2624,7 @@ class DatabaseAlterTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can alter the joins on a query.
+   * Tests that we can alter the joins on a query.
    */
   function testAlterWithJoin() {
     $query = db_select('test_task');
@@ -2642,7 +2648,7 @@ class DatabaseAlterTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can alter a query's conditionals.
+   * Tests that we can alter a query's conditionals.
    */
   function testAlterChangeConditional() {
     $query = db_select('test_task');
@@ -2667,7 +2673,7 @@ class DatabaseAlterTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can alter the fields of a query.
+   * Tests that we can alter the fields of a query.
    */
   function testAlterChangeFields() {
     $query = db_select('test');
@@ -2682,7 +2688,7 @@ class DatabaseAlterTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can alter expressions in the query.
+   * Tests that we can alter expressions in the query.
    */
   function testAlterExpression() {
     $query = db_select('test');
@@ -2700,7 +2706,7 @@ class DatabaseAlterTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can remove a range() value from a query. This also tests hook_query_TAG_alter().
+   * Tests that we can remove a range() value from a query. This also tests hook_query_TAG_alter().
    */
   function testAlterRemoveRange() {
     $query = db_select('test');
@@ -2715,7 +2721,7 @@ class DatabaseAlterTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can do basic alters on subqueries.
+   * Tests that we can do basic alters on subqueries.
    */
   function testSimpleAlterSubquery() {
     // Create a sub-query with an alter tag.
@@ -2741,7 +2747,7 @@ class DatabaseAlterTestCase extends DatabaseTestCase {
 }
 
 /**
- * Regression tests.
+ * Tests regressions.
  */
 class DatabaseRegressionTestCase extends DatabaseTestCase {
 
@@ -2758,7 +2764,7 @@ class DatabaseRegressionTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Regression test for #310447.
+   * Tests regression for #310447.
    *
    * Tries to insert non-ascii UTF-8 data in a database column and checks
    * if its stored properly.
@@ -2778,7 +2784,7 @@ class DatabaseRegressionTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test the db_table_exists() function.
+   * Tests the db_table_exists() function.
    */
   function testDBTableExists() {
     $this->assertIdentical(TRUE, db_table_exists('node'), t('Returns true for existent table.'));
@@ -2786,7 +2792,7 @@ class DatabaseRegressionTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test the db_field_exists() function.
+   * Tests the db_field_exists() function.
    */
   function testDBFieldExists() {
     $this->assertIdentical(TRUE, db_field_exists('node', 'nid'), t('Returns true for existent column.'));
@@ -2794,7 +2800,7 @@ class DatabaseRegressionTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test the db_index_exists() function.
+   * Tests the db_index_exists() function.
    */
   function testDBIndexExists() {
     $this->assertIdentical(TRUE, db_index_exists('node', 'node_created'), t('Returns true for existent index.'));
@@ -2803,7 +2809,7 @@ class DatabaseRegressionTestCase extends DatabaseTestCase {
 }
 
 /**
- * Query logging tests.
+ * Tests query logging.
  */
 class DatabaseLoggingTestCase extends DatabaseTestCase {
 
@@ -2816,7 +2822,7 @@ class DatabaseLoggingTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can log the existence of a query.
+   * Tests that we can log the existence of a query.
    */
   function testEnableLogging() {
     Database::startLog('testing');
@@ -2834,7 +2840,7 @@ class DatabaseLoggingTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can run two logs in parallel.
+   * Tests that we can run two logs in parallel.
    */
   function testEnableMultiLogging() {
     Database::startLog('testing1');
@@ -2853,7 +2859,7 @@ class DatabaseLoggingTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can log queries against multiple targets on the same connection.
+   * Tests that we can log queries against multiple targets on the same connection.
    */
   function testEnableTargetLogging() {
     // Clone the master credentials to a slave connection and to another fake
@@ -2875,7 +2881,7 @@ class DatabaseLoggingTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that logs to separate targets collapse to the same connection properly.
+   * Tests that logs to separate targets collapse to the same connection properly.
    *
    * This test is identical to the one above, except that it doesn't create
    * a fake target so the query should fall back to running on the default
@@ -2901,7 +2907,7 @@ class DatabaseLoggingTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can log queries separately on different connections.
+   * Tests that we can log queries separately on different connections.
    */
   function testEnableMultiConnectionLogging() {
     // Clone the master credentials to a fake connection.
@@ -2929,7 +2935,7 @@ class DatabaseLoggingTestCase extends DatabaseTestCase {
 }
 
 /**
- * Query serialization tests.
+ * Querys serialization tests.
  */
 class DatabaseSerializeQueryTestCase extends DatabaseTestCase {
   public static function getInfo() {
@@ -2941,7 +2947,7 @@ class DatabaseSerializeQueryTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Confirm that a query can be serialized and unserialized.
+   * Confirms that a query can be serialized and unserialized.
    */
   function testSerializeQuery() {
     $query = db_select('test');
@@ -2956,7 +2962,7 @@ class DatabaseSerializeQueryTestCase extends DatabaseTestCase {
 }
 
 /**
- * Range query tests.
+ * Ranges query tests.
  */
 class DatabaseRangeQueryTestCase extends DrupalWebTestCase {
   public static function getInfo() {
@@ -2972,7 +2978,7 @@ class DatabaseRangeQueryTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Confirm that range query work and return correct result.
+   * Confirms that range query work and return correct result.
    */
   function testRangeQuery() {
     // Test if return correct number of rows.
@@ -2987,7 +2993,7 @@ class DatabaseRangeQueryTestCase extends DrupalWebTestCase {
 }
 
 /**
- * Temporary query tests.
+ * Tests temporary queries.
  */
 class DatabaseTemporaryQueryTestCase extends DrupalWebTestCase {
   public static function getInfo() {
@@ -3003,14 +3009,14 @@ class DatabaseTemporaryQueryTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Return the number of rows of a table.
+   * Returns the number of rows of a table.
    */
   function countTableRows($table_name) {
     return db_select($table_name)->countQuery()->execute()->fetchField();
   }
 
   /**
-   * Confirm that temporary tables work and are limited to one request.
+   * Confirms that temporary tables work and are limited to one request.
    */
   function testTemporaryQuery() {
     $this->drupalGet('database_test/db_query_temporary');
@@ -3033,7 +3039,7 @@ class DatabaseTemporaryQueryTestCase extends DrupalWebTestCase {
 }
 
 /**
- * Test how the current database driver interprets the SQL syntax.
+ * Tests how the current database driver interprets the SQL syntax.
  *
  * In order to ensure consistent SQL handling throughout Drupal
  * across multiple kinds of database systems, we test that the
@@ -3049,7 +3055,7 @@ class DatabaseBasicSyntaxTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test for string concatenation.
+   * Tests for string concatenation.
    */
   function testBasicConcat() {
     $result = db_query('SELECT CONCAT(:a1, CONCAT(:a2, CONCAT(:a3, CONCAT(:a4, :a5))))', array(
@@ -3063,7 +3069,7 @@ class DatabaseBasicSyntaxTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test for string concatenation with field values.
+   * Tests for string concatenation with field values.
    */
   function testFieldConcat() {
     $result = db_query('SELECT CONCAT(:a1, CONCAT(name, CONCAT(:a2, CONCAT(age, :a3)))) FROM {test} WHERE age = :age', array(
@@ -3076,7 +3082,7 @@ class DatabaseBasicSyntaxTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test escaping of LIKE wildcards.
+   * Tests escaping of LIKE wildcards.
    */
   function testLikeEscape() {
     db_insert('test')
@@ -3102,7 +3108,7 @@ class DatabaseBasicSyntaxTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test LIKE query containing a backslash.
+   * Tests LIKE query containing a backslash.
    */
   function testLikeBackslash() {
     db_insert('test')
@@ -3134,7 +3140,7 @@ class DatabaseBasicSyntaxTestCase extends DatabaseTestCase {
 }
 
 /**
- * Test case sensitivity handling.
+ * Tests case sensitivity handling.
  */
 class DatabaseCaseSensitivityTestCase extends DatabaseTestCase {
   public static function getInfo() {
@@ -3146,7 +3152,7 @@ class DatabaseCaseSensitivityTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test BINARY collation in MySQL.
+   * Tests BINARY collation in MySQL.
    */
   function testCaseSensitiveInsert() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
@@ -3167,7 +3173,7 @@ class DatabaseCaseSensitivityTestCase extends DatabaseTestCase {
 }
 
 /**
- * Test invalid data handling.
+ * Tests invalid data handling.
  */
 class DatabaseInvalidDataTestCase extends DatabaseTestCase {
   public static function getInfo() {
@@ -3179,7 +3185,8 @@ class DatabaseInvalidDataTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Traditional SQL database systems abort inserts when invalid data is encountered.
+   * Traditional SQL database systems abort inserts when invalid data is
+   * encountered.
    */
   function testInsertDuplicateData() {
     // Try to insert multiple records where at least one has bad data.
@@ -3236,7 +3243,7 @@ class DatabaseInvalidDataTestCase extends DatabaseTestCase {
 }
 
 /**
- * Drupal-specific SQL syntax tests.
+ * Tests Drupal-specific SQL syntax.
  */
 class DatabaseQueryTestCase extends DatabaseTestCase {
   public static function getInfo() {
@@ -3248,7 +3255,7 @@ class DatabaseQueryTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test that we can specify an array of values in the query by simply passing in an array.
+   * Tests that we can specify an array of values in the query by simply passing in an array.
    */
   function testArraySubstitution() {
     $names = db_query('SELECT name FROM {test} WHERE age IN (:ages) ORDER BY age', array(':ages' => array(25, 26, 27)))->fetchAll();
@@ -3258,7 +3265,7 @@ class DatabaseQueryTestCase extends DatabaseTestCase {
 }
 
 /**
- * Test transaction support, particularly nesting.
+ * Tests transaction support, particularly nesting.
  *
  * We test nesting by having two transaction layers, an outer and inner. The
  * outer layer encapsulates the inner layer. Our transaction nesting abstraction
@@ -3288,12 +3295,12 @@ class DatabaseTransactionTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Helper method for transaction unit test. This "outer layer" transaction
-   * starts and then encapsulates the "inner layer" transaction. This nesting
-   * is used to evaluate whether the the database transaction API properly
-   * supports nesting. By "properly supports," we mean the outer transaction
-   * continues to exist regardless of what functions are called and whether
-   * those functions start their own transactions.
+   * This is a helper method for transaction unit tests. This "outer layer"
+   * transaction starts and then encapsulates the "inner layer" transaction.
+   * This nesting is used to evaluate whether the the database transaction API
+   * properly supports nesting. By "properly supports," we mean the outer
+   * transaction continues to exist regardless of what functions are called
+   * and whether those functions start their own transactions.
    *
    * In contrast, a typical database would commit the outer transaction, start
    * a new transaction for the inner layer, commit the inner layer transaction,
@@ -3396,7 +3403,7 @@ class DatabaseTransactionTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test transaction rollback on a database that supports transactions.
+   * Tests transaction rollback on a database that supports transactions.
    *
    * If the active connection does not support transactions, this test does nothing.
    */
@@ -3422,7 +3429,7 @@ class DatabaseTransactionTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test transaction rollback on a database that does not support transactions.
+   * Tests transaction rollback on a database that does not support transactions.
    *
    * If the active driver supports transactions, this test does nothing.
    */
@@ -3448,7 +3455,7 @@ class DatabaseTransactionTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test committed transaction.
+   * Tests committed transaction.
    *
    * The behavior of this test should be identical for connections that support
    * transactions and those that do not.
@@ -3470,7 +3477,7 @@ class DatabaseTransactionTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test the compatibility of transactions with DDL statements.
+   * Tests the compatibility of transactions with DDL statements.
    */
   function testTransactionWithDdlStatement() {
     // First, test that a commit works normally, even with DDL statements.
@@ -3561,7 +3568,7 @@ class DatabaseTransactionTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Insert a single row into the testing table.
+   * Inserts a single row into the testing table.
    */
   protected function insertRow($name) {
     db_insert('test')
@@ -3572,7 +3579,7 @@ class DatabaseTransactionTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Execute a DDL statement.
+   * Executes a DDL statement.
    */
   protected function executeDDLStatement() {
     static $count = 0;
@@ -3590,7 +3597,7 @@ class DatabaseTransactionTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Start over for a new test.
+   * Starts over for a new test.
    */
   protected function cleanUp() {
     db_truncate('test')
@@ -3598,7 +3605,7 @@ class DatabaseTransactionTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Assert that a given row is present in the test table.
+   * Asserts that a given row is present in the test table.
    *
    * @param $name
    *   The name of the row.
@@ -3614,7 +3621,7 @@ class DatabaseTransactionTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Assert that a given row is absent from the test table.
+   * Asserts that a given row is absent from the test table.
    *
    * @param $name
    *   The name of the row.
@@ -3630,7 +3637,7 @@ class DatabaseTransactionTestCase extends DatabaseTestCase {
   }
 
   /**
-   * Test transaction stacking and commit / rollback.
+   * Tests transaction stacking and commit / rollback.
    */
   function testTransactionStacking() {
     // This test won't work right if transactions are not supported.
@@ -3745,7 +3752,7 @@ class DatabaseTransactionTestCase extends DatabaseTestCase {
 
 
 /**
- * Check the sequences API.
+ * Checks the sequences API.
  */
 class DatabaseNextIdCase extends DrupalWebTestCase {
   public static function getInfo() {
@@ -3757,7 +3764,7 @@ class DatabaseNextIdCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test that the sequences API work.
+   * Tests that the sequences API work.
    */
   function testDbNextId() {
     $first = db_next_id();
@@ -3784,7 +3791,7 @@ class DatabaseEmptyStatementTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test that the empty result set behaves as empty.
+   * Tests that the empty result set behaves as empty.
    */
   function testEmpty() {
     $result = new StatementEmpty();
@@ -3794,7 +3801,7 @@ class DatabaseEmptyStatementTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test that the empty result set iterates safely.
+   * Tests that the empty result set iterates safely.
    */
   function testEmptyIteration() {
     $result = new StatementEmpty();
@@ -3808,7 +3815,7 @@ class DatabaseEmptyStatementTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test that the empty result set mass-fetches in an expected way.
+   * Tests that the empty result set mass-fetches in an expected way.
    */
   function testEmptyFetchAll() {
     $result = new StatementEmpty();