diff --git a/core/lib/Drupal/Core/StreamWrapper/PublicStream.php b/core/lib/Drupal/Core/StreamWrapper/PublicStream.php
index f278353095..403263e301 100644
--- a/core/lib/Drupal/Core/StreamWrapper/PublicStream.php
+++ b/core/lib/Drupal/Core/StreamWrapper/PublicStream.php
@@ -89,7 +89,7 @@ public static function baseUrl() {
    * $base_path = PublicStream::basePath(\Drupal::service('site.path'));
    * @endcode
    *
-   * @param \SplString $site_path
+   * @param string $site_path
    *   (optional) The site.path service parameter, which is typically the path
    *   to sites/ in a Drupal installation. This allows you to inject the site
    *   path using services from the caller. If omitted, this method will use the
@@ -99,7 +99,7 @@ public static function baseUrl() {
    * @return string
    *   The base path for public:// typically sites/default/files.
    */
-  public static function basePath(\SplString $site_path = NULL) {
+  public static function basePath($site_path = NULL) {
     if ($site_path === NULL) {
       // Find the site path. Kernel service is not always available at this
       // point, but is preferred, when available.
diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module
index cf35b7f98e..1d0e7b2cb7 100644
--- a/core/modules/simpletest/simpletest.module
+++ b/core/modules/simpletest/simpletest.module
@@ -138,8 +138,6 @@ function simpletest_run_tests($test_list) {
     unset($test_list['phpunit']);
   }
 
-  // Use the database service so that we can inject a database for testing this
-  // function.
   $test_id = \Drupal::database()->insert('simpletest_test_id')
     ->useDefaults(['test_id'])
     ->execute();