diff --git a/tests/link.attribute.test b/tests/link.attribute.test
index 4765814..36e6be5 100644
--- a/tests/link.attribute.test
+++ b/tests/link.attribute.test
@@ -31,10 +31,8 @@ class LinkAttributeCrudTest extends DrupalWebTestCase {
     parent::setup('field_ui', 'link');
     $this->zebra = 0;
     // Create and login user.
-    $perms = user_role_permissions(array(array_search('administrator', user_roles()) => 'administrator'));
-    $perms = array_keys($perms[array_search('administrator', user_roles())]);
-    $admin = $this->drupalCreateUser($perms);
-    $this->drupalLogin($admin);
+    $this->web_user = $this->drupalCreateUser(array('administer content types'));
+    $this->drupalLogin($this->web_user);
   }
 
   protected function createLink($url, $title, $attributes = array()) {
diff --git a/tests/link.crud.test b/tests/link.crud.test
index 5f12840..e9b7db4 100644
--- a/tests/link.crud.test
+++ b/tests/link.crud.test
@@ -29,10 +29,8 @@ class LinkContentCrudTest extends DrupalWebTestCase {
     $title = $this->randomName(20);
 
     // Create and login user.
-    $perms = user_role_permissions(array(array_search('administrator', user_roles()) => 'administrator'));
-    $perms = array_keys($perms[array_search('administrator', user_roles())]);
-    $admin = $this->drupalCreateUser($perms);
-    $this->drupalLogin($admin);
+    $this->web_user = $this->drupalCreateUser(array('administer content types'));
+    $this->drupalLogin($this->web_user);
 
     $this->drupalGet('admin/structure/types');
 
diff --git a/tests/link.crud_browser.test b/tests/link.crud_browser.test
index 803169b..be04260 100644
--- a/tests/link.crud_browser.test
+++ b/tests/link.crud_browser.test
@@ -42,11 +42,15 @@ class LinkUITest extends DrupalWebTestcase {
    */
   function testLinkCreate() {
     //libxml_use_internal_errors(true);
-    $perms = user_role_permissions(array(array_search('administrator', user_roles()) => 'administrator'));
-    $perms = array_keys($perms[array_search('administrator', user_roles())]);
-    $admin = $this->drupalCreateUser($perms);
-    $this->drupalLogin($admin);
-
+    $this->web_user = $this->drupalCreateUser(array(
+      'administer content types',
+      'administer nodes',
+      'administer filters',
+      'access content',
+      'create page content',
+      'access administration pages'
+    ));
+    $this->drupalLogin($this->web_user);
 
     // create field
     $name = strtolower($this->randomName());
@@ -129,7 +133,7 @@ class LinkUITest extends DrupalWebTestcase {
     $input_test_cases[] = $test_case;
 
     foreach ($input_test_cases as $input) {
-      $this->drupalLogin($admin);
+      $this->drupalLogin($this->web_user);
       $this->drupalGet('node/add/page');
 
       $edit = array(
@@ -175,10 +179,8 @@ class LinkUITest extends DrupalWebTestcase {
    * title actually displays <strong>.
    */
   function testStaticLinkCreate() {
-    $perms = user_role_permissions(array(array_search('administrator', user_roles()) => 'administrator'));
-    $perms = array_keys($perms[array_search('administrator', user_roles())]);
-    $admin = $this->drupalCreateUser($perms);
-    $this->drupalLogin($admin);
+    $this->web_user = $this->drupalCreateUser(array('administer content types', 'access content', 'create page content'));
+    $this->drupalLogin($this->web_user);
 
     // create field
     $name = strtolower($this->randomName());
@@ -225,10 +227,8 @@ class LinkUITest extends DrupalWebTestcase {
    * Testing that if you have the title but no url, the title is not sanitized twice.
    */
   function testCRUDTitleOnlyTitleNoLink() {
-    $perms = user_role_permissions(array(array_search('administrator', user_roles()) => 'administrator'));
-    $perms = array_keys($perms[array_search('administrator', user_roles())]);
-    $admin = $this->drupalCreateUser($perms);
-    $this->drupalLogin($admin);
+    $this->web_user = $this->drupalCreateUser(array('administer content types', 'access content', 'create page content'));
+    $this->drupalLogin($this->web_user);
 
     // create field
     $name = strtolower($this->randomName());
@@ -278,10 +278,8 @@ class LinkUITest extends DrupalWebTestcase {
    * sure they are set to the expected results.
    */
   function testCRUDCreateFieldDefaults() {
-    $perms = user_role_permissions(array(array_search('administrator', user_roles()) => 'administrator'));
-    $perms = array_keys($perms[array_search('administrator', user_roles())]);
-    $admin = $this->drupalCreateUser($perms);
-    $this->drupalLogin($admin);
+    $this->web_user = $this->drupalCreateUser(array('administer content types', 'access content', 'create page content'));
+    $this->drupalLogin($this->web_user);
 
     // create field
     $name = strtolower($this->randomName());
@@ -320,10 +318,8 @@ class LinkUITest extends DrupalWebTestcase {
    * sure they are set to the expected results.
    */
   function testCRUDCreateFieldWithClass() {
-    $perms = user_role_permissions(array(array_search('administrator', user_roles()) => 'administrator'));
-    $perms = array_keys($perms[array_search('administrator', user_roles())]);
-    $admin = $this->drupalCreateUser($perms);
-    $this->drupalLogin($admin);
+    $this->web_user = $this->drupalCreateUser(array('administer content types', 'access content', 'create page content'));
+    $this->drupalLogin($this->web_user);
 
     // create field
     $name = strtolower($this->randomName());
@@ -394,10 +390,8 @@ class LinkUITest extends DrupalWebTestcase {
    * sure they are set to the expected results.
    */
   function testCRUDCreateFieldWithTwoClasses() {
-    $perms = user_role_permissions(array(array_search('administrator', user_roles()) => 'administrator'));
-    $perms = array_keys($perms[array_search('administrator', user_roles())]);
-    $admin = $this->drupalCreateUser($perms);
-    $this->drupalLogin($admin);
+    $this->web_user = $this->drupalCreateUser(array('administer content types', 'access content', 'create page content'));
+    $this->drupalLogin($this->web_user);
 
     // create field
     $name = strtolower($this->randomName());
diff --git a/tests/link.test b/tests/link.test
index b030153..962197f 100644
--- a/tests/link.test
+++ b/tests/link.test
@@ -23,11 +23,9 @@ class LinkBaseTestClass extends DrupalWebTestCase {
     $modules[] = 'field_ui';
     $modules[] = 'link';
     parent::setUp($modules);
-
-    $perms = user_role_permissions(array(array_search('administrator', user_roles()) => 'administrator'));
-    $perms = array_keys($perms[array_search('administrator', user_roles())]);
-    $admin = $this->drupalCreateUser($perms);
-    $this->drupalLogin($admin);
+    
+    $this->web_user = $this->drupalCreateUser($this->permissions);
+    $this->drupalLogin($this->web_user);
   }
 
   protected function createLinkField($node_type = 'page', $settings = array()) {
diff --git a/tests/link.validate.test b/tests/link.validate.test
index f03a64c..a9ac116 100644
--- a/tests/link.validate.test
+++ b/tests/link.validate.test
@@ -61,10 +61,13 @@ class LinkValidateTest extends LinkValidateTestCase {
    * Test if we're stopped from posting a bad url on default validation.
    */
   function test_link_validate_bad_url_validate_default() {
-    $perms = user_role_permissions(array(array_search('administrator', user_roles()) => 'administrator'));
-    $perms = array_keys($perms[array_search('administrator', user_roles())]);
-    $admin = $this->drupalCreateUser($perms);
-    $this->drupalLogin($admin);
+    $this->web_user = $this->drupalCreateUser(array('administer content types',
+                                             'administer nodes',
+                                             'administer filters',
+                                             'access content',
+                                             'create page content',
+                                             'access administration pages'));
+    $this->drupalLogin($this->web_user);
 
     // create field
     $name = strtolower($this->randomName());
@@ -103,10 +106,13 @@ class LinkValidateTest extends LinkValidateTestCase {
    * Test if we're stopped from posting a bad url with validation on.
    */
   function test_link_validate_bad_url_validate_on() {
-    $perms = user_role_permissions(array(array_search('administrator', user_roles()) => 'administrator'));
-    $perms = array_keys($perms[array_search('administrator', user_roles())]);
-    $admin = $this->drupalCreateUser($perms);
-    $this->drupalLogin($admin);
+    $this->web_user = $this->drupalCreateUser(array('administer content types',
+                                             'administer nodes',
+                                             'administer filters',
+                                             'access content',
+                                             'create page content',
+                                             'access administration pages'));
+    $this->drupalLogin($this->web_user);
 
     // create field
     $name = strtolower($this->randomName());
@@ -146,10 +152,13 @@ class LinkValidateTest extends LinkValidateTestCase {
    * Test if we can post a bad url if the validation is expressly turned off.
    */
   function test_link_validate_bad_url_validate_off() {
-    $perms = user_role_permissions(array(array_search('administrator', user_roles()) => 'administrator'));
-    $perms = array_keys($perms[array_search('administrator', user_roles())]);
-    $admin = $this->drupalCreateUser($perms);
-    $this->drupalLogin($admin);
+    $this->web_user = $this->drupalCreateUser(array('administer content types',
+                                             'administer nodes',
+                                             'administer filters',
+                                             'access content',
+                                             'create page content',
+                                             'access administration pages'));
+    $this->drupalLogin($this->web_user);
 
     // create field
     $name = strtolower($this->randomName());
@@ -193,10 +202,13 @@ class LinkValidateTest extends LinkValidateTestCase {
    */
   function x_test_link_validate_switching_between_validation_status() {
     $this->acquireContentTypes(1);
-    $perms = user_role_permissions(array(array_search('administrator', user_roles()) => 'administrator'));
-    $perms = array_keys($perms[array_search('administrator', user_roles())]);
-    $admin = $this->drupalCreateUser($perms);
-    $this->drupalLogin($admin);
+    $this->web_user = $this->drupalCreateUser(array('administer content types',
+                                             'administer nodes',
+                                             'access administration pages',
+                                             'access content',
+                                             'create ' . $this->content_types[0]->type . ' content',
+                                             'edit any ' . $this->content_types[0]->type . ' content'));
+    $this->drupalLogin($this->web_user);
     variable_set('node_options_' . $this->content_types[0]->name, array('status', 'promote'));
     $field_settings = array(
       'type' => 'link',
@@ -356,7 +368,7 @@ class LinkValidateUrlLight extends DrupalWebTestCase {
       'group' => 'Link',
     );
   }
-
+  
   function setUp() {
     parent::setUp('link');
   }
@@ -417,10 +429,11 @@ class LinkValidateUrlLight extends DrupalWebTestCase {
   function testValidateInternalLinks() {
     $tempfile = drupal_tempnam('public://files', 'test');
     $links = array(
+      'rss.xml',
       file_uri_target($tempfile),
       drupal_realpath($tempfile),
     );
-
+    
     foreach ($links as $link) {
       $type = link_url_type($link);
       $this->assertEqual(LINK_INTERNAL, $type, 'Test ' . $link . ' is an internal link.');
@@ -469,8 +482,8 @@ class LinkValidateUrlLight extends DrupalWebTestCase {
       //$valid2 = valid_url($link, TRUE);
       //$this->assertEqual(TRUE, $valid2, "Using valid_url() on $link.");
     }
-    // Test if we can make a tld allowable:
-    variable_set('link_allowed_domains', array('frog'));
+    // Test if we can make a tld valid:
+    variable_set('link_extra_domains', array('frog'));
     $valid = link_validate_url('http://www.example.frog');
     $this->assertEqual(LINK_EXTERNAL, $valid, "Testing that http://www.example.frog is a valid external link if we've added 'frog' to the list of valid domains.");
   }
@@ -482,6 +495,7 @@ class LinkValidateUrlLight extends DrupalWebTestCase {
       'http://4827.0.0.2/',
       '//www.example.com/',
       'http://www.testß.com/', // ß not allowed in domain names!
+      'http://www.example.frog/', // Bad TLD
       //'http://www.-fudge.com/', // domains can't have sections starting with a dash.
       'http://example.com/index.php?page=this\that',
       'example@example.com',
@@ -490,9 +504,5 @@ class LinkValidateUrlLight extends DrupalWebTestCase {
       $valid = link_validate_url($link);
       $this->assertEqual(FALSE, $valid, 'Testing that ' . $link . ' is not a valid link.');
     }
-    // Test if we can make a tld disallowed:
-    variable_set('link_allowed_domains', array('toad'));
-    $valid = link_validate_url('http://www.example.frog');
-    $this->assertEqual(FALSE, $valid, "Testing that http://www.example.frog is an invalid external link if we've not added 'frog' to the list of valid domains.");
   }
 }