diff --git a/core/modules/book/book.module b/core/modules/book/book.module
index 7c43e28..eff0411 100644
--- a/core/modules/book/book.module
+++ b/core/modules/book/book.module
@@ -289,7 +289,9 @@ function book_block_view($delta = '') {
     $block['subject'] = t('Book navigation');
     $book_menus = array();
     $pseudo_tree = array(0 => array('below' => FALSE));
+    $list_for_book_titles = array();
     foreach (book_get_books() as $book_id => $book) {
+      $list_for_book_titles[] = l($book['title'], $book['href']);
       if ($book['bid'] == $current_bid) {
         // If the current page is a node associated with a book, the menu
         // needs to be retrieved.
@@ -306,9 +308,14 @@ function book_block_view($delta = '') {
         $book_menus[$book_id] = menu_tree_output($pseudo_tree);
       }
     }
-    if ($block['content'] = $book_menus) {
-      $book_menus['#theme'] = 'book_all_books_block';
-    }
+    $book_menus['#theme'] = 'book_all_books_block';
+    $block['content'] = array(
+      'list' => array(
+        '#theme' => 'item_list',
+        '#type' => 'ol',
+        '#items' => $list_for_book_titles,
+      ),
+    );
   }
   elseif ($current_bid) {
     // Only display this block when the user is browsing a book.
@@ -322,8 +329,20 @@ function book_block_view($delta = '') {
       $tree = menu_tree_all_data($node->book['menu_name'], $node->book);
       // There should only be one element at the top level.
       $data = array_shift($tree);
+      $list_for_book_titles = array();
+      if ($data['below']) {
+        foreach($data['below'] as $book_data) {
+          $list_for_book_titles[] = l($book_data['link']['link_title'], $book_data['link']['link_path']);
+        }
+      }
       $block['subject'] = theme('book_title_link', array('link' => $data['link']));
-      $block['content'] = ($data['below']) ? menu_tree_output($data['below']) : '';
+      $block['content'] = array(
+        'list' => array(
+          '#theme' => 'item_list',
+          '#type' => 'ol',
+          '#items' => $list_for_book_titles,
+        ),
+      );
     }
   }
 
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
index 916cb0d..c28e5b4 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
@@ -163,9 +163,14 @@ protected function checkRequirements() {
    *   Can be 'pass', 'fail', 'exception'.
    *   TRUE is a synonym for 'pass', FALSE for 'fail'.
    * @param $message
-   *   The message string.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   Which group this assert belongs to.
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @param $caller
    *   By default, the assert comes from a function whose name starts with
    *   'test'. Instead, you can specify where this assert originates from
@@ -323,9 +328,14 @@ protected function getAssertionCall() {
    * @param $value
    *   The value on which the assertion is to be done.
    * @param $message
-   *   The message to display along with the assertion.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The type of assertion - examples are "Browser", "PHP".
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @return
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
@@ -339,9 +349,14 @@ protected function assertTrue($value, $message = '', $group = 'Other') {
    * @param $value
    *   The value on which the assertion is to be done.
    * @param $message
-   *   The message to display along with the assertion.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The type of assertion - examples are "Browser", "PHP".
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @return
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
@@ -355,9 +370,14 @@ protected function assertFalse($value, $message = '', $group = 'Other') {
    * @param $value
    *   The value on which the assertion is to be done.
    * @param $message
-   *   The message to display along with the assertion.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The type of assertion - examples are "Browser", "PHP".
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @return
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
@@ -371,9 +391,14 @@ protected function assertNull($value, $message = '', $group = 'Other') {
    * @param $value
    *   The value on which the assertion is to be done.
    * @param $message
-   *   The message to display along with the assertion.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The type of assertion - examples are "Browser", "PHP".
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @return
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
@@ -389,9 +414,14 @@ protected function assertNotNull($value, $message = '', $group = 'Other') {
    * @param $second
    *   The second value to check.
    * @param $message
-   *   The message to display along with the assertion.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The type of assertion - examples are "Browser", "PHP".
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @return
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
@@ -407,9 +437,14 @@ protected function assertEqual($first, $second, $message = '', $group = 'Other')
    * @param $second
    *   The second value to check.
    * @param $message
-   *   The message to display along with the assertion.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The type of assertion - examples are "Browser", "PHP".
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @return
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
@@ -425,9 +460,14 @@ protected function assertNotEqual($first, $second, $message = '', $group = 'Othe
    * @param $second
    *   The second value to check.
    * @param $message
-   *   The message to display along with the assertion.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The type of assertion - examples are "Browser", "PHP".
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @return
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
@@ -443,9 +483,14 @@ protected function assertIdentical($first, $second, $message = '', $group = 'Oth
    * @param $second
    *   The second value to check.
    * @param $message
-   *   The message to display along with the assertion.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The type of assertion - examples are "Browser", "PHP".
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @return
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
@@ -461,9 +506,14 @@ protected function assertNotIdentical($first, $second, $message = '', $group = '
    * @param object $object2
    *   The second object to check.
    * @param $message
-   *   The message to display along with the assertion.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The type of assertion - examples are "Browser", "PHP".
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    *
    * @return
    *   TRUE if the assertion succeeded, FALSE otherwise.
@@ -486,9 +536,14 @@ protected function assertIdenticalObject($object1, $object2, $message = '', $gro
    * Fire an assertion that is always positive.
    *
    * @param $message
-   *   The message to display along with the assertion.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The type of assertion - examples are "Browser", "PHP".
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @return
    *   TRUE.
    */
@@ -500,9 +555,14 @@ protected function pass($message = NULL, $group = 'Other') {
    * Fire an assertion that is always negative.
    *
    * @param $message
-   *   The message to display along with the assertion.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The type of assertion - examples are "Browser", "PHP".
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @return
    *   FALSE.
    */
@@ -514,9 +574,14 @@ protected function fail($message = NULL, $group = 'Other') {
    * Fire an error assertion.
    *
    * @param $message
-   *   The message to display along with the assertion.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The type of assertion - examples are "Browser", "PHP".
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @param $caller
    *   The caller of the error.
    * @return
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
index 9c43818..d7e911c 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
@@ -1695,9 +1695,14 @@ protected function getAllOptions(SimpleXMLElement $element) {
    * @param $index
    *   Link position counting from zero.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The group this message belongs to, defaults to 'Other'.
+   *   (optional) The gorup this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @return
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
@@ -1715,9 +1720,14 @@ protected function assertLink($label, $index = 0, $message = '', $group = 'Other
    * @param $index
    *   Link position counting from zero.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The group this message belongs to, defaults to 'Other'.
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @return
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
@@ -1735,9 +1745,14 @@ protected function assertNoLink($label, $message = '', $group = 'Other') {
    * @param $index
    *   Link position counting from zero.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The group this message belongs to, defaults to 'Other'.
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    *
    * @return
    *   TRUE if the assertion succeeded, FALSE otherwise.
@@ -1754,9 +1769,14 @@ protected function assertLinkByHref($href, $index = 0, $message = '', $group = '
    * @param $href
    *   The full or partial value of the 'href' attribute of the anchor tag.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The group this message belongs to, defaults to 'Other'.
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    *
    * @return
    *   TRUE if the assertion succeeded, FALSE otherwise.
@@ -2016,9 +2036,14 @@ protected function createTypedData($definition, $value = NULL, $context = array(
    * @param $options
    *   (optional) Any additional options to pass for $path to url().
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The group this message belongs to, defaults to 'Other'.
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    *
    * @return
    *   TRUE on pass, FALSE on fail.
@@ -2040,9 +2065,14 @@ protected function assertUrl($path, array $options = array(), $message = '', $gr
    * @param $raw
    *   Raw (HTML) string to look for.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The group this message belongs to, defaults to 'Other'.
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @return
    *   TRUE on pass, FALSE on fail.
    */
@@ -2060,9 +2090,14 @@ protected function assertRaw($raw, $message = '', $group = 'Other') {
    * @param $raw
    *   Raw (HTML) string to look for.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The group this message belongs to, defaults to 'Other'.
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @return
    *   TRUE on pass, FALSE on fail.
    */
@@ -2081,9 +2116,14 @@ protected function assertNoRaw($raw, $message = '', $group = 'Other') {
    * @param $text
    *   Plain text to look for.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The group this message belongs to, defaults to 'Other'.
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @return
    *   TRUE on pass, FALSE on fail.
    */
@@ -2099,9 +2139,14 @@ protected function assertText($text, $message = '', $group = 'Other') {
    * @param $text
    *   Plain text to look for.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The group this message belongs to, defaults to 'Other'.
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @return
    *   TRUE on pass, FALSE on fail.
    */
@@ -2117,9 +2162,14 @@ protected function assertNoText($text, $message = '', $group = 'Other') {
    * @param $text
    *   Plain text to look for.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The group this message belongs to.
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @param $not_exists
    *   TRUE if this text should not exist, FALSE if it should.
    * @return
@@ -2145,9 +2195,14 @@ protected function assertTextHelper($text, $message = '', $group, $not_exists) {
    * @param $text
    *   Plain text to look for.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The group this message belongs to, defaults to 'Other'.
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @return
    *   TRUE on pass, FALSE on fail.
    */
@@ -2165,9 +2220,14 @@ protected function assertUniqueText($text, $message = '', $group = 'Other') {
    * @param $text
    *   Plain text to look for.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The group this message belongs to, defaults to 'Other'.
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @return
    *   TRUE on pass, FALSE on fail.
    */
@@ -2183,9 +2243,14 @@ protected function assertNoUniqueText($text, $message = '', $group = 'Other') {
    * @param $text
    *   Plain text to look for.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The group this message belongs to.
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @param $be_unique
    *   TRUE if this text should be found only once, FALSE if it should be found more than once.
    * @return
@@ -2213,9 +2278,14 @@ protected function assertUniqueTextHelper($text, $message = '', $group, $be_uniq
    * @param $pattern
    *   Perl regex to look for including the regex delimiters.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The group this message belongs to.
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @return
    *   TRUE on pass, FALSE on fail.
    */
@@ -2232,9 +2302,14 @@ protected function assertPattern($pattern, $message = '', $group = 'Other') {
    * @param $pattern
    *   Perl regex to look for including the regex delimiters.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The group this message belongs to.
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @return
    *   TRUE on pass, FALSE on fail.
    */
@@ -2251,9 +2326,14 @@ protected function assertNoPattern($pattern, $message = '', $group = 'Other') {
    * @param $title
    *   The string the title should be.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The group this message belongs to.
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @return
    *   TRUE on pass, FALSE on fail.
    */
@@ -2274,9 +2354,14 @@ protected function assertTitle($title, $message = '', $group = 'Other') {
    * @param $title
    *   The string the title should not be.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The group this message belongs to.
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @return
    *   TRUE on pass, FALSE on fail.
    */
@@ -2301,7 +2386,9 @@ protected function assertNoTitle($title, $message = '', $group = 'Other') {
    * @param $expected
    *   The expected themed output string.
    * @param $message
-   *   (optional) An assertion message.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    *
    * @return
    *   TRUE on pass, FALSE on fail.
@@ -2328,9 +2415,14 @@ protected function assertThemeOutput($callback, array $variables = array(), $exp
    * @param $value
    *   (optional) Value of the field to assert.
    * @param $message
-   *   (optional) Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   (optional) The group this message belongs to.
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    *
    * @return
    *   TRUE on pass, FALSE on fail.
@@ -2401,9 +2493,14 @@ protected function getSelectedItem(SimpleXMLElement $element) {
    * @param $value
    *   (optional) Value of the field to assert.
    * @param $message
-   *   (optional) Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   (optional) The group this message belongs to.
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    *
    * @return
    *   TRUE on pass, FALSE on fail.
@@ -2434,9 +2531,14 @@ protected function assertNoFieldByXPath($xpath, $value = NULL, $message = '', $g
    * @param $value
    *   Value of the field to assert.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The group this message belongs to.
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @return
    *   TRUE on pass, FALSE on fail.
    */
@@ -2465,9 +2567,14 @@ protected function assertFieldByName($name, $value = NULL, $message = NULL) {
    * @param $value
    *   Value of the field to assert.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The group this message belongs to.
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @return
    *   TRUE on pass, FALSE on fail.
    */
@@ -2483,9 +2590,14 @@ protected function assertNoFieldByName($name, $value = '', $message = '') {
    * @param $value
    *   Value of the field to assert.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The group this message belongs to.
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @return
    *   TRUE on pass, FALSE on fail.
    */
@@ -2501,9 +2613,14 @@ protected function assertFieldById($id, $value = '', $message = '') {
    * @param $value
    *   Value of the field to assert.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The group this message belongs to.
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @return
    *   TRUE on pass, FALSE on fail.
    */
@@ -2517,7 +2634,9 @@ protected function assertNoFieldById($id, $value = '', $message = '') {
    * @param $id
    *   Id of field to assert.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @return
    *   TRUE on pass, FALSE on fail.
    */
@@ -2532,7 +2651,9 @@ protected function assertFieldChecked($id, $message = '') {
    * @param $id
    *   Id of field to assert.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @return
    *   TRUE on pass, FALSE on fail.
    */
@@ -2549,7 +2670,9 @@ protected function assertNoFieldChecked($id, $message = '') {
    * @param $option
    *   Option to assert.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @return
    *   TRUE on pass, FALSE on fail.
    */
@@ -2566,7 +2689,9 @@ protected function assertOption($id, $option, $message = '') {
    * @param $option
    *   Option to assert.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @return
    *   TRUE on pass, FALSE on fail.
    */
@@ -2584,7 +2709,9 @@ protected function assertNoOption($id, $option, $message = '') {
    * @param $option
    *   Option to assert.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @return
    *   TRUE on pass, FALSE on fail.
    *
@@ -2603,7 +2730,9 @@ protected function assertOptionSelected($id, $option, $message = '') {
    * @param $option
    *   Option to assert.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @return
    *   TRUE on pass, FALSE on fail.
    */
@@ -2618,9 +2747,14 @@ protected function assertNoOptionSelected($id, $option, $message = '') {
    * @param $field
    *   Name or id of field to assert.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The group this message belongs to.
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @return
    *   TRUE on pass, FALSE on fail.
    */
@@ -2634,9 +2768,14 @@ protected function assertField($field, $message = '', $group = 'Other') {
    * @param $field
    *   Name or id of field to assert.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The group this message belongs to.
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @return
    *   TRUE on pass, FALSE on fail.
    */
@@ -2648,9 +2787,14 @@ protected function assertNoField($field, $message = '', $group = 'Other') {
    * Asserts that each HTML ID is used for just a single element.
    *
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @param $group
-   *   The group this message belongs to.
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; more tests do not override
+   *   this default.
    * @param $ids_to_skip
    *   An optional array of ids to skip when checking for duplicates. It is
    *   always a bug to have duplicate HTML IDs, so this parameter is to enable
@@ -2696,7 +2840,9 @@ protected function constructFieldXpath($attribute, $value) {
    *   Response code. For example 200 is a successful page request. For a list
    *   of all codes see http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    * @return
    *   Assertion result.
    */
@@ -2713,7 +2859,9 @@ protected function assertResponse($code, $message = '') {
    *   Response code. For example 200 is a successful page request. For a list
    *   of all codes see http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    *
    * @return
    *   Assertion result.
@@ -2734,7 +2882,9 @@ protected function assertNoResponse($code, $message = '') {
    * @param $value
    *   Value of the field to assert.
    * @param $message
-   *   Message to display.
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
    *
    * @return
    *   TRUE on pass, FALSE on fail.