diff --git a/core/modules/menu/lib/Drupal/menu/MenuFormController.php b/core/modules/menu/lib/Drupal/menu/MenuFormController.php
index 6ca9cdf..9772672 100644
--- a/core/modules/menu/lib/Drupal/menu/MenuFormController.php
+++ b/core/modules/menu/lib/Drupal/menu/MenuFormController.php
@@ -89,7 +89,7 @@ public function form(array $form, array &$form_state) {
       );
     }
 
-    dpm($form);
+    //dpm($form);
     return parent::form($form, $form_state);
   }
 
diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuLanguageTest.php b/core/modules/menu/lib/Drupal/menu/Tests/MenuLanguageTest.php
index da6c1e9..f31b53a 100644
--- a/core/modules/menu/lib/Drupal/menu/Tests/MenuLanguageTest.php
+++ b/core/modules/menu/lib/Drupal/menu/Tests/MenuLanguageTest.php
@@ -38,11 +38,13 @@ function setUp() {
     $this->drupalLogin($this->admin_user);
 
     // Add some custom languages.
-    $language = new Language(array(
-      'langcode' => 'aa',
-      'name' => $this->randomName(),
-    ));
-    language_save($language);
+    foreach (array('aa', 'bb', 'cc') as $language_code) {
+      $language = new Language(array(
+        'langcode' => $language_code,
+        'name' => $this->randomName(),
+      ));
+      language_save($language);
+    }
   }
 
   /**
@@ -60,65 +62,82 @@ function testMenuLanguage() {
       'id' => $menu_name,
       'description' => '',
       'label' =>  $label,
+      'langcode' => 'aa',
+      'default_language[langcode]' => 'bb',
+      'default_language[language_show]' => TRUE,
     );
+    $this->drupalPost('admin/structure/menu/add', $edit, t('Save'));
+    $this->drupalGet('admin/structure/menu/manage/' . $menu_name);
     // Assert the new menu is in that language and the default menu link info.
-    //$this->assertRaw($label, 'Custom menu was added.');
-    // Assert menu langcode aa.
-    // Assert default_menu_links_language langcode bb.
-    // Assert default_menu_links_language language_show TRUE.
+    $this->assertOptionSelected('edit-langcode', $edit['langcode'], 'The menu language was correctly selected.');
+    $this->assertOptionSelected('edit-default-language-langcode', $edit['default_language[langcode]'], 'The menu link default language was correctly selected.');
+    $this->assertFieldChecked('edit-default-language-language-show');
 
-    // Edit menu link.
-    // Assert language select is there with default bb.
-    // $this->assertMenuLink($menu_link->id(), array('menu_name' => $menu_name, 'link_path' => $link, 'has_children' => 0, 'plid' => $plid));
+    // Start testing menu link things.
+    // Just link to front page.
+    $sample_link_path='<front>';
 
-/*
-    // Edit menu to change default menu link item language.
-    $menu = entity_edit('menu', array(
-      'langcode' => 'cc',
-    ));
+    // Add a menu link.
+    $this->drupalGet('admin/structure/menu/manage/' . $menu_name . '/add');
+    $title = $this->randomName(16);
     $edit = array(
-      'link_path' => '<front>',
       'link_title' => $title,
-      'description' => '',
-      'parent' =>  $menu_name . ':' . 0,
+      'link_path' => $sample_link_path,
     );
-    // Add menu link.
-    $this->drupalPost(NULL, $edit, t('Save'));
-
-    $menu_links = entity_load_multiple_by_properties('menu_link', array('link_title' => $title));
-    $menu_link = reset($menu_links);
-    $menu->save();
+    $this->drupalPost('admin/structure/menu/manage/' . $menu_name . '/add', $edit, t('Save'));
+    // Check the link is added.
     $this->drupalGet('admin/structure/menu/manage/' . $menu_name);
 
-    // Edit menu link.
-    // Assert language select is there with default cc.
+    // Check the link has the correct language.
+    // admin/structure/menu/item/329/edit
+    // How to get the item number. Might need to:
+    // $item1 = $this->addMenuLink(0, 'node/' . $node1->nid, $menu_name);
     // $this->assertMenuLink($menu_link->id(), array('menu_name' => $menu_name, 'link_path' => $link, 'has_children' => 0, 'plid' => $plid));
 
-    // Edit menu to change hide language select on menu link item add.
+    // Edit menu link default, changing it to cc.
     $edit = array(
-      'link_path' => '<front>',
-      'link_title' => $title,
-      'description' => '',
-      'parent' =>  $menu_name . ':' . 0,
+      'default_language[langcode]' => 'cc',
     );
-    // Add menu link.
-    $this->drupalPost(NULL, $edit, t('Save'));
-
-    $menu_links = entity_load_multiple_by_properties('menu_link', array('link_title' => $title));
-    $menu_link = reset($menu_links);
+    $this->drupalPost('admin/structure/menu/manage/' . $menu_name, $edit, t('Save'));
     $this->drupalGet('admin/structure/menu/manage/' . $menu_name);
 
-    // Edit menu link.
-    $this->drupalGet("admin/structure/menu/manage/$menu_name/edit");
+    // Check cc is the menu link default.
+    $this->assertOptionSelected('edit-default-language-langcode', $edit['default_language[langcode]'], 'The menu link default language was correctly selected.');
 
-    $title = '!link_' . $this->randomName(16);
-*/
-    // Assert language select not present.
+    // Add a menu link.
+    $this->drupalGet('admin/structure/menu/manage/' . $menu_name . '/add');
+    $title = $this->randomName(16);
+    $edit = array(
+      'link_title' => $title,
+      'link_path' => $sample_link_path,
+    );
+    $this->drupalPost('admin/structure/menu/manage/' . $menu_name . '/add', $edit, t('Save'));
+    // Check the link is added.
+    $this->drupalGet('admin/structure/menu/manage/' . $menu_name);
+    // Check the link has the correct language.
+    // admin/structure/menu/item/329/edit
+    // How to get the item number. Might need to:
+    // $item1 = $this->addMenuLink(0, 'node/' . $node1->nid, $menu_name);
     // $this->assertMenuLink($menu_link->id(), array('menu_name' => $menu_name, 'link_path' => $link, 'has_children' => 0, 'plid' => $plid));
 
+    // Edit menu to change hide language select on menu link item add.
+    $edit = array(
+      'default_language[language_show]' => FALSE,
+    );
+    $this->drupalPost('admin/structure/menu/manage/' . $menu_name, $edit, t('Save'));
+    $this->drupalGet('admin/structure/menu/manage/' . $menu_name);
+    $this->assertNoFieldChecked('edit-default-language-language-show');
+
+    $this->drupalGet('admin/structure/menu/manage/' . $menu_name . '/add');
+    // Check that the language selector is not available.
+    $this->assertNoField('edit-langcode', 'The language selector field was hidden the page');
+
     // Delete custom menu.
     // @todo Make an issue to add tests for deleting, and verifying config is
     //   also removed.
+    // Check that the language settings are not still there.
+    // $language_settings = language_get_default_configuration('taxonomy_term', $edit['vid']);
+    // $this->assertEqual($language_settings['langcode'], 'bb');
   }
 
 }
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyFormController.php b/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyFormController.php
index 4dc3774..f6d7f42 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyFormController.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyFormController.php
@@ -78,7 +78,6 @@ public function form(array $form, array &$form_state) {
       '#value' => '0',
     );
 
-    dpm($form);
     return parent::form($form, $form_state, $vocabulary);
   }