diff --git a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
index 2f38929..1fb9c06 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
@@ -2166,8 +2166,8 @@ protected function assertNoText($text, $message = '', $group = 'Other') {
    *   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 is in, which is displayed in a column
-   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   The group this message is in, which is displayed in a colum in test
+   *   output. Use 'Debug' to indicate this is debugging output. Do not
    *   translate this string.
    * @param $not_exists
    *   TRUE if this text should not exist, FALSE if it should.
@@ -2246,11 +2246,12 @@ protected function assertNoUniqueText($text, $message = '', $group = 'Other') {
    *   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 is in, which is displayed in a column
-   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   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.
    * @param $be_unique
-   *   TRUE if this text should be found only once, FALSE if it should be found more than once.
+   *   TRUE if this text should be found only once, FALSE if it should be found
+   *   more than once.
    * @return
    *   TRUE on pass, FALSE on fail.
    */
@@ -2387,15 +2388,11 @@ protected function assertNoTitle($title, $message = '', $group = 'Other') {
    *   (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 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'; most tests do not override
-   *   this default.
+   *
    * @return
    *   TRUE on pass, FALSE on fail.
    */
-  protected function assertThemeOutput($callback, array $variables = array(), $expected, $message = '', $group = 'Other') {
+  protected function assertThemeOutput($callback, array $variables = array(), $expected, $message = '') {
     $output = theme($callback, $variables);
     $this->verbose('Variables:' . '<pre>' .  check_plain(var_export($variables, TRUE)) . '</pre>'
       . '<hr />' . 'Result:' . '<pre>' .  check_plain(var_export($output, TRUE)) . '</pre>'
@@ -2406,7 +2403,7 @@ protected function assertThemeOutput($callback, array $variables = array(), $exp
       $message = '%callback rendered correctly.';
     }
     $message = format_string($message, array('%callback' => 'theme_' . $callback . '()'));
-    return $this->assertIdentical($output, $expected, $message, $group);
+    return $this->assertIdentical($output, $expected, $message);
   }
 
   /**
@@ -2572,11 +2569,6 @@ protected function assertFieldByName($name, $value = NULL, $message = NULL) {
    *   (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 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'; most tests do not override
-   *   this default.
    * @return
    *   TRUE on pass, FALSE on fail.
    */
@@ -2595,11 +2587,6 @@ protected function assertNoFieldByName($name, $value = '', $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.
-   * @param $group
-   *   (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'; most tests do not override
-   *   this default.
    * @return
    *   TRUE on pass, FALSE on fail.
    */
@@ -2618,11 +2605,6 @@ protected function assertFieldById($id, $value = '', $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.
-   * @param $group
-   *   (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'; most tests do not override
-   *   this default.
    * @return
    *   TRUE on pass, FALSE on fail.
    */
@@ -2935,21 +2917,18 @@ protected function assertMailString($field_name, $string, $email_depth) {
    * @param $regex
    *   Pattern to search for.
    * @param $message
-   *   (optional) A message to display with the assertion. Do not translate
+   *   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.
-   *
+   *   t().
+   *   *
    * @return
    *   TRUE on pass, FALSE on fail.
    */
-  protected function assertMailPattern($field_name, $regex, $message = '') {
+  protected function assertMailPattern($field_name, $regex, $message) {
     $mails = $this->drupalGetMails();
     $mail = end($mails);
     $regex_found = preg_match("/$regex/", $mail[$field_name]);
-    if (!$message) {
-      $message = format_string('Expected text found in @field of email message: "@expected".', array('@field' => $field_name, '@expected' => $regex));
-    }
-    return $this->assertTrue($regex_found, $message);
+    return $this->assertTrue($regex_found, t('Expected text found in @field of email message: "@expected".', array('@field' => $field_name, '@expected' => $regex)));
   }
 
   /**