diff --git a/lib/Drupal/tour_ui/Tests/TourUITest.php b/lib/Drupal/tour_ui/Tests/TourUITest.php
index 91d41ea..9e9da15 100644
--- a/lib/Drupal/tour_ui/Tests/TourUITest.php
+++ b/lib/Drupal/tour_ui/Tests/TourUITest.php
@@ -48,15 +48,19 @@ class TourUITest extends WebTestBase {
     $elements = $this->xpath('//table/tbody/tr');
     $this->assertEqual(count($elements), 2);
 
-    // The first column contains the title.
+    // The first column contains the id.
     $elements = $this->xpath('//table/tbody/tr[contains(@class, :class)]/td[1]', array(':class' => 'tour-test'));
+    $this->assertIdentical((string) $elements[0], 'tour-test-2');
+    // The second column contains the title.
+    $elements = $this->xpath('//table/tbody/tr[contains(@class, :class)]/td[2]', array(':class' => 'tour-test'));
     $this->assertIdentical((string) $elements[0], t('Tour test english'));
-    // The second column contains the paths.
+    // The third column contains the paths.
     $elements = $this->xpath('//table/tbody/tr[contains(@class, :class)]/td/a[contains(@href, :href)]', array(':class' => 'tour-test', ':href' => 'tour-test-1'));
     $this->assertIdentical((string) $elements[0], '/tour-test-1');
-    // The third column contains the number of tips.
-    $elements = $this->xpath('//table/tbody/tr[contains(@class, :class)]/td[3]', array(':class' => 'tour-test'));
-    $this->assertIdentical((string) $elements[0], '2');
+    // The fourth column contains the number of tips.
+    $elements = $this->xpath('//table/tbody/tr[contains(@class, :class)]/td[4]', array(':class' => 'tour-test'));
+    $this->assertIdentical((string) $elements[0], '1', 'Core tour_test/config/tour-test-2 has 1 tip');
+    $this->assertIdentical((string) $elements[1], '3', 'Core tour_test/config/tour-test-1 has 3 tips');
   }
 
   /**
@@ -67,6 +71,7 @@ class TourUITest extends WebTestBase {
     $edit = array(
       'label' => 'a' . $this->randomString(),
       'id' => strtolower($this->randomName()),
+      'module' => strtolower($this->randomName()),
     );
     $this->drupalPost('admin/config/user-interface/tour/add', $edit, t('Save'));
     $this->assertRaw(t('The %tour tour has been created.', array('%tour' => $edit['label'])));
@@ -79,13 +84,13 @@ class TourUITest extends WebTestBase {
     $this->assertRaw(t('Updated the %tour tour', array('%tour' => $edit['label'])));
 
     // Reorder the tour tips.
-    $this->drupalGet('admin/config/user-interface/tour/manage/tour-test/edit');
+    $this->drupalGet('admin/config/user-interface/tour/manage/tour-test');
     $weights = array(
       'tips[tour-test-1][weight]' => '2',
       'tips[tour-test-3][weight]' => '1',
     );
     $this->drupalPost(NULL, $weights, t('Save'));
-    $this->drupalGet('admin/config/user-interface/tour/manage/tour-test/edit');
+    $this->drupalGet('admin/config/user-interface/tour/manage/tour-test');
     $elements = $this->xpath('//tr[@class=:class and ./td[contains(., :text)]]', array(
       ':class' => 'draggable odd',
       ':text' => 'The awesome image',
@@ -101,7 +106,7 @@ class TourUITest extends WebTestBase {
       'tips[tour-test-3][weight]' => '2',
     );
     $this->drupalPost(NULL, $weights, t('Save'));
-    $this->drupalGet('admin/config/user-interface/tour/manage/tour-test/edit');
+    $this->drupalGet('admin/config/user-interface/tour/manage/tour-test');
     $elements = $this->xpath('//tr[@class=:class and ./td[contains(., :text)]]', array(
       ':class' => 'draggable odd',
       ':text' => 'The first tip',
@@ -118,7 +123,7 @@ class TourUITest extends WebTestBase {
     $this->assertRaw(t('The machine-readable name is already in use. It must be unique.'));
 
     // Delete a tour.
-    $this->drupalGet('admin/config/user-interface/tour/manage/' . $edit['id'] . '/edit');
+    $this->drupalGet('admin/config/user-interface/tour/manage/' . $edit['id']);
     $this->drupalPost(NULL, NULL, t('Delete'));
     $this->assertRaw(t('Are you sure you want to delete the %tour tour?', array('%tour' => $edit['label'])));
     $this->clickLink(t('Cancel'));
@@ -137,6 +142,7 @@ class TourUITest extends WebTestBase {
     $edit = array(
       'label' => 'a' . $this->randomString(),
       'id' => strtolower($this->randomName()),
+      'module' => $this->randomString(),
       'paths' => '',
     );
     $this->drupalPost('admin/config/user-interface/tour/add', $edit, t('Save'));
@@ -146,7 +152,7 @@ class TourUITest extends WebTestBase {
     $tip = array(
       'new' => 'image',
     );
-    $this->drupalPost('admin/config/user-interface/tour/manage/' . $edit['id'] . '/edit', $tip, t('Add'));
+    $this->drupalPost('admin/config/user-interface/tour/manage/' . $edit['id'], $tip, t('Add'));
     $tip = array(
       'label' => 'a' . $this->randomString(),
       'id' => 'tour-ui-test-image-tip',