diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module
index 1144e9d..462e9ec 100644
--- a/core/modules/simpletest/simpletest.module
+++ b/core/modules/simpletest/simpletest.module
@@ -612,21 +612,17 @@ function simpletest_clean_results_table($test_id = NULL) {
   if (\Drupal::config('simpletest.settings')->get('clear_results')) {
     $connection = TestBase::getDatabaseConnection();
     if ($test_id) {
-      $count = $connection->query('SELECT COUNT(test_id) FROM {simpletest_test_id} WHERE test_id = :test_id', array(':test_id' => $test_id))->fetchField();
-
       $connection->delete('simpletest')
         ->condition('test_id', $test_id)
         ->execute();
-      $connection->delete('simpletest_test_id')
+      $count = $connection->delete('simpletest_test_id', array('return' => Database::RETURN_AFFECTED))
         ->condition('test_id', $test_id)
         ->execute();
     }
     else {
-      $count = $connection->query('SELECT COUNT(test_id) FROM {simpletest_test_id}')->fetchField();
-
       // Clear test results.
       $connection->delete('simpletest')->execute();
-      $connection->delete('simpletest_test_id')->execute();
+      $count = $connection->delete('simpletest_test_id', array('return' => Database::RETURN_AFFECTED))->execute();
     }
 
     return $count;
diff --git a/core/modules/simpletest/src/Form/SimpletestResultsForm.php b/core/modules/simpletest/src/Form/SimpletestResultsForm.php
index eae90d0..2d0e0fe 100644
--- a/core/modules/simpletest/src/Form/SimpletestResultsForm.php
+++ b/core/modules/simpletest/src/Form/SimpletestResultsForm.php
@@ -118,7 +118,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $test_id
       $test_id = explode('+', $test_id);
     }
 
-    if ((is_numeric($test_id) || is_array($test_id)) && !$results = $this->getResults($test_id)) {
+    if ((!is_numeric($test_id) && !is_array($test_id)) || !$results = $this->getResults($test_id)) {
       drupal_set_message($this->t('No test results to display.'), 'error');
       return new RedirectResponse(url('admin/config/development/testing', array('absolute' => TRUE)));
     }
@@ -248,9 +248,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $test_id
       '#href' => 'admin/config/development/testing',
     );
 
-    if (is_numeric($test_id)) {
-      simpletest_clean_results_table($test_id);
-    }
+    simpletest_clean_results_table($test_id);
 
     return $form;
   }
diff --git a/core/modules/simpletest/src/TestBase.php b/core/modules/simpletest/src/TestBase.php
index afe1feb..b2e6315 100644
--- a/core/modules/simpletest/src/TestBase.php
+++ b/core/modules/simpletest/src/TestBase.php
@@ -741,10 +741,10 @@ protected function verbose($message) {
       return;
     }
 
-    $message = '<hr />ID #' . $this->verboseId . ' (<a href="' . $this->verboseClassName . '-' . ($this->verboseId - 1) . '.html">Previous</a> | <a href="' . $this->verboseClassName . '-' . ($this->verboseId + 1) . '.html">Next</a>)<hr />' . $message;
-    $verbose_filename = $this->verboseDirectory . '/' . $this->verboseClassName . '-' . $this->verboseId . '.html';
-    if (file_put_contents($verbose_filename, $message, FILE_APPEND)) {
-      $url = $this->verboseDirectoryUrl . '/' . $this->verboseClassName . '-' . $this->verboseId . '.html';
+    $message = '<hr />ID #' . $this->verboseId . ' (<a href="' . $this->verboseClassName . '-' . ($this->verboseId - 1) . '-' . $this->testId . '.html">Previous</a> | <a href="' . $this->verboseClassName . '-' . ($this->verboseId + 1) . '-' . $this->testId . '.html">Next</a>)<hr />' . $message;
+    $verbose_filename =  $this->verboseClassName . '-' . $this->verboseId . '-' . $this->testId . '.html';
+    if (file_put_contents($this->verboseDirectory . '/' . $verbose_filename, $message, FILE_APPEND)) {
+      $url = $this->verboseDirectoryUrl . '/' . $verbose_filename;
       // Not using l() to avoid invoking the theme system, so that unit tests
       // can use verbose() as well.
       $url = '<a href="' . $url . '" target="_blank">Verbose message</a>';