diff -u modules/shortcut/shortcut.test modules/shortcut/shortcut.test
--- modules/shortcut/shortcut.test	4 Mar 2010 14:33:55 -0000
+++ modules/shortcut/shortcut.test	5 Mar 2010 05:46:46 -0000
@@ -32,7 +32,7 @@
   protected $set;
 
   function setUp() {
-    parent::setUp('menu', 'toolbar', 'shortcut');
+    parent::setUp('toolbar', 'shortcut');
     // Create users.
     $this->admin_user = $this->drupalCreateUser(array('access toolbar', 'administer shortcuts', 'create article content', 'create page content', 'access content overview'));
     $this->shortcut_user = $this->drupalCreateUser(array('customize shortcut links', 'switch shortcut sets'));
@@ -153,7 +153,7 @@
     // Attempt to rename shortcut link.
     $new_link_name = $this->randomName(10);
 
-    $this->drupalPost('admin/config/user-interface/shortcut/link/'. $set->links[0]['mlid'], array('shortcut_link[link_title]' => $new_link_name, 'shortcut_link[link_path]' => $set->links[0]['link_path']), t('Save'));
+    $this->drupalPost('admin/config/user-interface/shortcut/link/' . $set->links[0]['mlid'], array('shortcut_link[link_title]' => $new_link_name, 'shortcut_link[link_path]' => $set->links[0]['link_path']), t('Save'));
     $saved_set = shortcut_set_load($set->set_name);
     $titles = $this->getShortcutInformation($saved_set, 'link_title');
     $this->assertTrue(in_array($new_link_name, $titles), 'Shortcut renamed: ' . $new_link_name);
@@ -161,7 +161,7 @@
   }
 
   /**
-   * Tests that changing path of shortcut link works.
+   * Tests that changing the path of a shortcut link works.
    */
   function testShortcutLinkChangePath() {
     $set = $this->set;
@@ -209,7 +209,7 @@
     $new_set = $this->generateShortcutSet($this->randomName(10));
     $sets = shortcut_sets();
     $this->assertTrue(isset($sets[$new_set->set_name]), 'Successfully created a shortcut set.');
-    $this->drupalGet('user/'. $this->admin_user->uid . '/shortcuts');
+    $this->drupalGet('user/' . $this->admin_user->uid . '/shortcuts');
     $this->assertText($new_set->title, 'Generated shortcut set was listed as a choice on the user account page.');
   }
 
@@ -219,7 +219,8 @@
   function testShortcutSetSwitchOwn() {
     $new_set = $this->generateShortcutSet($this->randomName(10));
 
-    // Attempt to switch the default shortcut set to the newly created shortcut set.
+    // Attempt to switch the default shortcut set to the newly created shortcut
+    // set.
     $this->drupalPost('user/' . $this->admin_user->uid . '/shortcuts', array('set' => $new_set->set_name), t('Change set'));
     $this->assertResponse(200);
     $current_set = shortcut_current_displayed_set($this->admin_user);