diff --git a/core/lib/Drupal/Core/Url.php b/core/lib/Drupal/Core/Url.php
index 194121f..a6f0220 100644
--- a/core/lib/Drupal/Core/Url.php
+++ b/core/lib/Drupal/Core/Url.php
@@ -203,7 +203,7 @@ public static function fromRoute($route_name, $route_parameters = array(), $opti
    */
   public static function fromUri($uri, $options = array()) {
     if (!parse_url($uri, PHP_URL_SCHEME)) {
-      throw new \InvalidArgumentException('You must use a valid URI scheme. Use base:// for a path, e.g., to a Drupal file that needs the base path. Do not use this for internal paths controller by Drupal.');
+      throw new \InvalidArgumentException('You must use a valid URI scheme. Use base:// for a path, e.g., to a Drupal file that needs the base path. Do not use this for internal paths controlled by Drupal.');
     }
 
     $url = new static($uri, array(), $options);
diff --git a/core/tests/Drupal/Tests/Core/UnroutedUrlTest.php b/core/tests/Drupal/Tests/Core/UnroutedUrlTest.php
index a59120e..9d6ea00 100644
--- a/core/tests/Drupal/Tests/Core/UnroutedUrlTest.php
+++ b/core/tests/Drupal/Tests/Core/UnroutedUrlTest.php
@@ -34,14 +34,14 @@ class UnroutedUrlTest extends UnitTestCase {
   protected $router;
 
   /**
-   * An fromUri, external URL to test.
+   * An unrouted, external URL to test.
    *
    * @var string
    */
   protected $unroutedExternal = 'http://drupal.org';
 
   /**
-   * An fromUri, internal URL to test.
+   * An unrouted, internal URL to test.
    *
    * @var string
    */
diff --git a/core/tests/Drupal/Tests/Core/UrlTest.php b/core/tests/Drupal/Tests/Core/UrlTest.php
index c7103e7..cf0496f 100644
--- a/core/tests/Drupal/Tests/Core/UrlTest.php
+++ b/core/tests/Drupal/Tests/Core/UrlTest.php
@@ -200,7 +200,7 @@ public function testIsExternal($urls) {
    *
    * @covers ::getUri
    */
-  public function _testGetUriForInternalUrl($urls) {
+  public function testGetUriForInternalUrl($urls) {
     foreach ($urls as $url) {
       $url->getUri();
     }