diff --git a/core/modules/contextual/contextual.module b/core/modules/contextual/contextual.module
index 5396504..873fa77 100644
--- a/core/modules/contextual/contextual.module
+++ b/core/modules/contextual/contextual.module
@@ -352,9 +352,9 @@ function _contextual_id_to_links($id) {
   $contextual_links = array();
   $contexts = explode('|', $id);
   foreach ($contexts as $context) {
-    list($module, $parent_path, $raw_args, $metadata_raw) = explode(':', $context);
+    list($module, $parent_path, $args_raw, $metadata_raw) = explode(':', $context);
     $path_args = array();
-    parse_str($raw_args, $path_args);
+    parse_str($args_raw, $path_args);
     $metadata = array();
     parse_str($metadata_raw, $metadata);
     $contextual_links[$module] = array($parent_path, $path_args, $metadata);
diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php b/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
index d0c2c7d..0e9fa9a 100644
--- a/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
+++ b/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
@@ -45,7 +45,7 @@ function setUp() {
   /**
    * Login users, add menus and menu links, and test menu functionality through the admin and user interfaces.
    */
-  function ptestMenu() {
+  function testMenu() {
     // Login the user.
     $this->drupalLogin($this->big_user);
     $this->items = array();
@@ -366,7 +366,7 @@ function doMenuTests($menu_name) {
   /**
    * Add and remove a menu link with a query string and fragment.
    */
-  function ptestMenuQueryAndFragment() {
+  function testMenuQueryAndFragment() {
     $this->drupalLogin($this->big_user);
 
     // Make a path with query and fragment on.
@@ -386,7 +386,7 @@ function ptestMenuQueryAndFragment() {
   /**
    * Test renaming built-in menu.
    */
-  function ptestSystemMenuRename() {
+  function testSystemMenuRename() {
     $this->drupalLogin($this->big_user);
     $edit = array(
       'label' => $this->randomName(16),
@@ -424,7 +424,7 @@ public function testBlockContextualLinks() {
   /**
    * Tests menu link bundles.
    */
-  public function ptestMenuBundles() {
+  public function testMenuBundles() {
     $this->drupalLogin($this->big_user);
     $menu = $this->addCustomMenu();
     // Clear the entity info cache to ensure the static caches are rebuilt.
@@ -676,7 +676,7 @@ function enableMenuLink($item) {
   /**
    * Test administrative users other than user 1 can access the menu parents AJAX callback.
    */
-  public function ptestMenuParentsJsAccess() {
+  public function testMenuParentsJsAccess() {
 
     $admin = $this->drupalCreateUser(array('administer menu'));
     $this->drupalLogin($admin);