diff --git a/tests/flag.test b/tests/flag.test
index 461650e..bcacc9a 100644
--- a/tests/flag.test
+++ b/tests/flag.test
@@ -33,15 +33,15 @@ class FlagTestCase extends DrupalWebTestCase {
     $edit = array(
       'name' => strtolower($this->randomName()),
       'title' => $this->randomName(),
-      'flag_short'          => 'flag short [nid]',
-      'flag_long'           => 'flag long [nid]',
-      'flag_message'        => 'flag message [nid]',
-      'unflag_short'        => 'unflag short [nid]',
-      'unflag_long'         => 'unflag long [nid]',
-      'unflag_message'      => 'unflag message [nid]',
+      'flag_short'          => 'flag short [node:nid]',
+      'flag_long'           => 'flag long [node:nid]',
+      'flag_message'        => 'flag message [node:nid]',
+      'unflag_short'        => 'unflag short [node:nid]',
+      'unflag_long'         => 'unflag long [node:nid]',
+      'unflag_message'      => 'unflag message [node:nid]',
       'roles[flag][2]' => TRUE,
       'roles[unflag][2]' => TRUE,
-      'types[story]' => FALSE,
+      'types[article]' => FALSE,
       'types[page]' => TRUE,
       'show_on_teaser' => FALSE,
       'show_on_page' => FALSE,
@@ -51,10 +51,11 @@ class FlagTestCase extends DrupalWebTestCase {
     $saved = $edit;
     $saved['roles'] = array('flag' => array(2), 'unflag' => array(2));
     $saved['types'] = array('page');
-    unset($saved['roles[flag][2]'], $saved['roles[unflag][2]'], $saved['types[story]'], $saved['types[page]']);
+    unset($saved['roles[flag][2]'], $saved['roles[unflag][2]'], $saved['types[article]'], $saved['types[page]']);
 
     $this->drupalPost(FLAG_ADMIN_PATH . '/add/node/' . $edit['name'], $edit, t('Submit'));
 
+    flag_get_flags(NULL, NULL, NULL, TRUE);
     $flag = flag_get_flag($edit['name']);
 
     // Check that the flag object is in the database.
@@ -69,15 +70,15 @@ class FlagTestCase extends DrupalWebTestCase {
     $edit = array(
       'name' => strtolower($this->randomName()),
       'title' => $this->randomName(),
-      'flag_short'          => 'flag 2 short [nid]',
-      'flag_long'           => 'flag 2 long [nid]',
-      'flag_message'        => 'flag 2 message [nid]',
-      'unflag_short'        => 'unflag 2 short [nid]',
-      'unflag_long'         => 'unflag 2 long [nid]',
-      'unflag_message'      => 'unflag 2 message [nid]',
+      'flag_short'          => 'flag 2 short [node:nid]',
+      'flag_long'           => 'flag 2 long [node:nid]',
+      'flag_message'        => 'flag 2 message [node:nid]',
+      'unflag_short'        => 'unflag 2 short [node:nid]',
+      'unflag_long'         => 'unflag 2 long [node:nid]',
+      'unflag_message'      => 'unflag 2 message [node:nid]',
       'roles[flag][2]' => TRUE,
       'roles[unflag][2]' => TRUE,
-      'types[story]' => TRUE,
+      'types[article]' => TRUE,
       'types[page]' => FALSE,
       'show_on_teaser' => TRUE,
       'show_on_page' => TRUE,
@@ -86,10 +87,10 @@ class FlagTestCase extends DrupalWebTestCase {
     );
     $saved = $edit;
     $saved['roles'] = array('flag' => array(2), 'unflag' => array(2));
-    $saved['types'] = array('story');
-    unset($saved['roles[flag][2]'], $saved['roles[unflag][2]'], $saved['types[story]'], $saved['types[page]']);
+    $saved['types'] = array('article');
+    unset($saved['roles[flag][2]'], $saved['roles[unflag][2]'], $saved['types[article]'], $saved['types[page]']);
 
-    $this->drupalPost(FLAG_ADMIN_PATH . '/edit/' . $flag->name, $edit, t('Submit'));
+    $this->drupalPost(FLAG_ADMIN_PATH . '/manage/' . $flag->name, $edit, t('Submit'));
 
     flag_get_flags(NULL, NULL, NULL, TRUE);
     $flag = flag_get_flag($edit['name']);
@@ -103,7 +104,7 @@ class FlagTestCase extends DrupalWebTestCase {
     }
 
     // Delete the flag through the UI.
-    $this->drupalPost(FLAG_ADMIN_PATH . '/delete/' . $flag->name, array(), t('Delete'));
+    $this->drupalPost(FLAG_ADMIN_PATH . '/manage/' . $flag->name . '/delete', array(), t('Delete'));
     flag_get_flags(NULL, NULL, NULL, TRUE);
     $this->assertFalse(flag_get_flag($flag->name), t('Flag successfully deleted.'));
   }