diff --git a/tests/phone.au.test b/tests/phone.au.test
index 67e9c9d..9fedd7c 100644
--- a/tests/phone.au.test
+++ b/tests/phone.au.test
@@ -1,18 +1,23 @@
 <?php
 
-class AUPhoneNumberTestCase extends DrupalWebTestCase {
+class AUPhoneNumberTestCase extends DrupalUnitTestCase {
   /**
    * Implementation of getInfo()
    *
    */
   public static function getInfo() {
     return array(
-      'name' => t('Australia Phone number test'),
-      'description' => t('Tests various valid and invalid Australia phone numbers for validity'),
-      'group' => t('Phone')
+      'name' => 'Australia Phone number test',
+      'description' => 'Tests various valid and invalid Australia phone numbers for validity',
+      'group' => 'Phone',
     );
   }
 
+  public function setUp() {
+    parent::setUp();
+    module_load_include('module', 'phone');
+  }
+
   public function testPhoneAUValid() {
     $this->assertTrue(valid_phone_number('au', '0200-0299'), t('ACT - 0200-0299'));
     $this->assertTrue(valid_phone_number('au', '2600-2639'), t('ACT - 2600-2639'));
diff --git a/tests/phone.be.test b/tests/phone.be.test
index 6943ff0..1e38815 100644
--- a/tests/phone.be.test
+++ b/tests/phone.be.test
@@ -1,18 +1,23 @@
 <?php
 
-class BEPhoneNumberTestCase extends DrupalWebTestCase {
+class BEPhoneNumberTestCase extends DrupalUnitTestCase {
   /**
    * Implementation of getInfo()
    *
    */
   public static function getInfo() {
     return array(
-      'name' => t('Belgium Phone number test'),
-      'description' => t('Tests various valid and invalid Belgium phone numbers for validity'),
-      'group' => t('Phone')
+      'name' => 'Belgium Phone number test',
+      'description' => 'Tests various valid and invalid Belgium phone numbers for validity',
+      'group' => 'Phone',
     );
   }
 
+  public function setUp() {
+    parent::setUp();
+    module_load_include('module', 'phone');
+  }
+
   public function testPhoneBEValid() {
     $this->assertTrue(valid_phone_number('be', '023456789'), '"023456789" should be valid');
     $this->assertTrue(valid_phone_number('be', '0478990011'), '"0478990011" should be  valid');
diff --git a/tests/phone.br.test b/tests/phone.br.test
index 2573b67..791e3a6 100644
--- a/tests/phone.br.test
+++ b/tests/phone.br.test
@@ -1,18 +1,23 @@
 <?php
 
-class BRPhoneNumberTestCase extends DrupalWebTestCase {
+class BRPhoneNumberTestCase extends DrupalUnitTestCase {
   /**
    * Implementation of getInfo()
    *
    */
   public static function getInfo() {
     return array(
-      'name' => t('Brazil Phone number test'),
-      'description' => t('Tests various valid and invalid Brazil phone numbers for validity'),
-      'group' => t('Phone')
+      'name' => 'Brazil Phone number test',
+      'description' => 'Tests various valid and invalid Brazil phone numbers for validity',
+      'group' => 'Phone',
     );
   }
 
+  public function setUp() {
+    parent::setUp();
+    module_load_include('module', 'phone');
+  }
+
   public function testPhoneBRValid() {
     $this->assertTrue(valid_phone_number('br', '(11) 1234-5678'), t('Test valid - (11) 1234-5678'));
     $this->assertTrue(valid_phone_number('br', '1234-5678 '), t('Test valid - 1234-5678'));
diff --git a/tests/phone.ca.test b/tests/phone.ca.test
index bf6477c..8ea9159 100644
--- a/tests/phone.ca.test
+++ b/tests/phone.ca.test
@@ -1,18 +1,23 @@
 <?php
 
-class CAPhoneNumberTestCase extends DrupalWebTestCase {
+class CAPhoneNumberTestCase extends DrupalUnitTestCase {
   /**
    * Implementation of getInfo()
    *
    */
   public static function getInfo() {
     return array(
-      'name' => t('Canada & US Phone number test'),
-      'description' => t('Tests various valid and invalid Canada & US phone numbers for validity'),
-      'group' => t('Phone')
+      'name' => 'Canada & US Phone number test',
+      'description' => 'Tests various valid and invalid Canada & US phone numbers for validity',
+      'group' => 'Phone',
     );
   }
 
+  public function setUp() {
+    parent::setUp();
+    module_load_include('module', 'phone');
+  }
+
   public function testPhoneCAValid() {
     $this->assertTrue(valid_phone_number('ca', '1-800-555-1212'), t('Test valid - 1-800-555-1212'));
     $this->assertTrue(valid_phone_number('ca', '800-555-1212'), t('Test valid - 800-555-1212'));
diff --git a/tests/phone.ch.test b/tests/phone.ch.test
index 98dcd3c..c040fcd 100644
--- a/tests/phone.ch.test
+++ b/tests/phone.ch.test
@@ -1,18 +1,23 @@
 <?php
 
-class CHPhoneNumberTestCase extends DrupalWebTestCase {
+class CHPhoneNumberTestCase extends DrupalUnitTestCase {
   /**
    * Implementation of getInfo()
    *
    */
   public static function getInfo() {
     return array(
-      'name' => t('Swiss Phone number test'),
-      'description' => t('Tests various valid and invalid Swiss phone numbers for validity'),
-      'group' => t('Phone')
+      'name' => 'Swiss Phone number test',
+      'description' => 'Tests various valid and invalid Swiss phone numbers for validity',
+      'group' => 'Phone',
     );
   }
 
+  public function setUp() {
+    parent::setUp();
+    module_load_include('module', 'phone');
+  }
+
   public function testPhoneCHValid() {
     //$this->assertTrue(valid_phone_number('ch', '04 476 0000'), t('Test valid'));
 
diff --git a/tests/phone.cl.test b/tests/phone.cl.test
index 92a13d9..78f0c8c 100644
--- a/tests/phone.cl.test
+++ b/tests/phone.cl.test
@@ -1,18 +1,23 @@
 <?php
 
-class CLPhoneNumberTestCase extends DrupalWebTestCase {
+class CLPhoneNumberTestCase extends DrupalUnitTestCase {
   /**
    * Implementation of getInfo()
    *
    */
   public static function getInfo() {
     return array(
-      'name' => t('Chili Phone number test'),
-      'description' => t('Tests various valid and invalid Chili phone numbers for validity'),
-      'group' => t('Phone')
+      'name' => 'Chili Phone number test',
+      'description' => 'Tests various valid and invalid Chili phone numbers for validity',
+      'group' => 'Phone',
     );
   }
 
+  public function setUp() {
+    parent::setUp();
+    module_load_include('module', 'phone');
+  }
+
   public function testPhoneCLValid() {
     $this->assertTrue(valid_phone_number('cl', '(041)245-9848'), t('Test valid'));
     $this->assertTrue(valid_phone_number('cl', '(063)421-232'), t('Test valid'));
diff --git a/tests/phone.cn.test b/tests/phone.cn.test
index 0286020..7d5100b 100644
--- a/tests/phone.cn.test
+++ b/tests/phone.cn.test
@@ -1,18 +1,23 @@
 <?php
 
-class CNPhoneNumberTestCase extends DrupalWebTestCase {
+class CNPhoneNumberTestCase extends DrupalUnitTestCase {
   /**
    * Implementation of getInfo()
    *
    */
   public static function getInfo() {
     return array(
-      'name' => t('China People\'s Republic Phone number test'),
-      'description' => t('Tests various valid and invalid Chinese People\'s Republic phone numbers for validity'),
-      'group' => t('Phone')
+      'name' => 'China People\'s Republic Phone number test',
+      'description' => 'Tests various valid and invalid Chinese People\'s Republic phone numbers for validity',
+      'group' => 'Phone',
     );
   }
 
+  public function setUp() {
+    parent::setUp();
+    module_load_include('module', 'phone');
+  }
+
   public function testPhoneCNValid() {
     $this->assertTrue(valid_phone_number('cn', '86-755-83998006'), t('Test valid - 86-755-83998006'));
     $this->assertTrue(valid_phone_number('cn', '86-10-5851 6688'), t('Test valid - 86-10-5851 6688'));
diff --git a/tests/phone.cr.test b/tests/phone.cr.test
index 0f2a97e..5506df8 100644
--- a/tests/phone.cr.test
+++ b/tests/phone.cr.test
@@ -1,18 +1,23 @@
 <?php
 
-class CRPhoneNumberTestCase extends DrupalWebTestCase {
+class CRPhoneNumberTestCase extends DrupalUnitTestCase {
   /**
    * Implementation of getInfo()
    *
    */
   public static function getInfo() {
     return array(
-      'name' => t('Costa Rica Phone number test'),
-      'description' => t('Tests various valid and invalid Costa Rica phone numbers for validity'),
-      'group' => t('Phone')
+      'name' => 'Costa Rica Phone number test',
+      'description' => 'Tests various valid and invalid Costa Rica phone numbers for validity',
+      'group' => 'Phone',
     );
   }
 
+  public function setUp() {
+    parent::setUp();
+    module_load_include('module', 'phone');
+  }
+
   public function testPhoneCRValid() {
     //$this->assertTrue(valid_phone_number('cr', '04 476 0000'), t('Test valid'));
   }
diff --git a/tests/phone.cs.test b/tests/phone.cs.test
index 99abc92..5c5de25 100644
--- a/tests/phone.cs.test
+++ b/tests/phone.cs.test
@@ -1,18 +1,23 @@
 <?php
 
-class CSPhoneNumberTestCase extends DrupalWebTestCase {
+class CSPhoneNumberTestCase extends DrupalUnitTestCase {
   /**
    * Implementation of getInfo()
    *
    */
   public static function getInfo() {
     return array(
-      'name' => t('Czech Republic Phone number test'),
-      'description' => t('Tests various valid and invalid Czech Republic phone numbers for validity'),
-      'group' => t('Phone')
+      'name' => 'Czech Republic Phone number test',
+      'description' => 'Tests various valid and invalid Czech Republic phone numbers for validity',
+      'group' => 'Phone',
     );
   }
 
+  public function setUp() {
+    parent::setUp();
+    module_load_include('module', 'phone');
+  }
+
   public function testPhoneCSValid() {
     $this->assertTrue(valid_phone_number('cs', '+420 999 999 999'), t('Test valid - +420 999 999 999'));
   }
diff --git a/tests/phone.eg.test b/tests/phone.eg.test
index 9fb3631..ae5684d 100644
--- a/tests/phone.eg.test
+++ b/tests/phone.eg.test
@@ -1,18 +1,23 @@
 <?php
 
-class EGPhoneNumberTestCase extends DrupalWebTestCase {
+class EGPhoneNumberTestCase extends DrupalUnitTestCase {
   /**
    * Implementation of getInfo()
    *
    */
   public static function getInfo() {
     return array(
-      'name' => t('Egypt Phone number test'),
-      'description' => t('Tests various valid and invalid Egypt phone numbers for validity'),
-      'group' => t('Phone')
+      'name' => 'Egypt Phone number test',
+      'description' => 'Tests various valid and invalid Egypt phone numbers for validity',
+      'group' => 'Phone',
     );
   }
 
+  public function setUp() {
+    parent::setUp();
+    module_load_include('module', 'phone');
+  }
+
   public function testPhoneEGValid() {
     //$this->assertTrue(valid_phone_number('eg', '04 476 0000'), t('Test valid'));
   }
diff --git a/tests/phone.es.test b/tests/phone.es.test
index e5394eb..69ce5cc 100644
--- a/tests/phone.es.test
+++ b/tests/phone.es.test
@@ -1,18 +1,23 @@
 <?php
 
-class ESPhoneNumberTestCase extends DrupalWebTestCase {
+class ESPhoneNumberTestCase extends DrupalUnitTestCase {
   /**
    * Implementation of getInfo()
    *
    */
   public static function getInfo() {
     return array(
-      'name' => t('Spain Phone number test'),
-      'description' => t('Tests various valid and invalid Spain phone numbers for validity'),
-      'group' => t('Phone')
+      'name' => 'Spain Phone number test',
+      'description' => 'Tests various valid and invalid Spain phone numbers for validity',
+      'group' => 'Phone',
     );
   }
 
+  public function setUp() {
+    parent::setUp();
+    module_load_include('module', 'phone');
+  }
+
   public function testPhoneESValid() {
     $this->assertTrue(valid_phone_number('es', '972367087'), t('Test valid - 972367087'));
     $this->assertTrue(valid_phone_number('es', '97-3770866'), t('Test valid - 97-3770866'));
diff --git a/tests/phone.fr.test b/tests/phone.fr.test
index 4524ccd..79e775f 100644
--- a/tests/phone.fr.test
+++ b/tests/phone.fr.test
@@ -6,20 +6,20 @@
 /**
 * Unit tests for Phone module.
 */
-class PhoneFrenchTest extends DrupalWebTestCase {
+class PhoneFrenchTest extends DrupalUnitTestCase {
 
   public static function getInfo() {
     return array(
-      'name' 		=> t('France Phone number test'),
-      'description' 	=> t('Executes test suite for validating / formatting France phone number.'),
-      'group' 		=> t('Phone')
+      'name' => 'France Phone number test',
+      'description' => 'Executes test suite for validating / formatting France phone number.',
+      'group' => 'Phone',
     );
   }
 
   function setUp() {
     parent::setUp();
-
-    include_once('./'. drupal_get_path('module', 'phone') .'/phone.fr.inc');
+    module_load_include('module', 'phone');
+    module_load_include('inc', 'phone', 'include/phone.fr');
   }
   
 
diff --git a/tests/phone.hu.test b/tests/phone.hu.test
index 0878e0b..a2ca803 100644
--- a/tests/phone.hu.test
+++ b/tests/phone.hu.test
@@ -1,18 +1,23 @@
 <?php
 
-class HUPhoneNumberTestCase extends DrupalWebTestCase {
+class HUPhoneNumberTestCase extends DrupalUnitTestCase {
   /**
    * Implementation of getInfo()
    *
    */
   public static function getInfo() {
     return array(
-      'name' => t('Hungary Phone number test'),
-      'description' => t('Tests various valid and invalid Hungary phone numbers for validity'),
-      'group' => t('Phone')
+      'name' => 'Hungary Phone number test',
+      'description' => 'Tests various valid and invalid Hungary phone numbers for validity',
+      'group' => 'Phone',
     );
   }
 
+  public function setUp() {
+    parent::setUp();
+    module_load_include('module', 'phone');
+  }
+
   public function testPhoneHUValid() {
     $this->assertTrue(valid_phone_number('hu', '+3611234567'), t('Test valid'));
     $this->assertTrue(valid_phone_number('hu', '+3676123456'), t('Test valid'));
diff --git a/tests/phone.il.test b/tests/phone.il.test
index a5e763a..5fb850a 100644
--- a/tests/phone.il.test
+++ b/tests/phone.il.test
@@ -1,18 +1,23 @@
 <?php
 
-class ILPhoneNumberTestCase extends DrupalWebTestCase {
+class ILPhoneNumberTestCase extends DrupalUnitTestCase {
   /**
    * Implementation of getInfo()
    *
    */
   public static function getInfo() {
     return array(
-      'name' => t('Israel Phone number test'),
-      'description' => t('Tests various valid and invalid Israel phone numbers for validity'),
-      'group' => t('Phone')
+      'name' => 'Israel Phone number test',
+      'description' => 'Tests various valid and invalid Israel phone numbers for validity',
+      'group' => 'Phone',
     );
   }
 
+  public function setUp() {
+    parent::setUp();
+    module_load_include('module', 'phone');
+  }
+
   public function testPhoneILValid() {
     $this->assertTrue(valid_phone_number('il', '1800 999 999'), '"1800 999 999" should be valid');    
   }
diff --git a/tests/phone.int.test b/tests/phone.int.test
index 219c297..7fc7a99 100644
--- a/tests/phone.int.test
+++ b/tests/phone.int.test
@@ -2,18 +2,18 @@
 
 //require_once drupal_get_path('module', 'phone') . 'includes/phone.int.inc';
 
-class PhoneIntTest extends DrupalWebTestCase {
+class PhoneIntTest extends DrupalUnitTestCase {
 
   public static function getInfo() {
     return array(
-      'name'  => 'International phone number test',
-      'description'  => 'Tests international phone number validation.',
+      'name' => 'International phone number test',
+      'description' => 'Tests international phone number validation.',
       'group' => 'Phone',
     );
   }
   public function setUp() {
-    // Enable the phone module.
-    parent::setUp(array('phone'));
+    parent::setUp();
+    module_load_include('module', 'phone');
   }
   
   private function assertConversion($input, $expect = TRUE, $field = array(), $expect_error = FALSE) {
diff --git a/tests/phone.it.test b/tests/phone.it.test
index bedc6e8..f87d232 100644
--- a/tests/phone.it.test
+++ b/tests/phone.it.test
@@ -1,18 +1,23 @@
 <?php
 
-class ITPhoneNumberTestCase extends DrupalWebTestCase {
+class ITPhoneNumberTestCase extends DrupalUnitTestCase {
   /**
    * Implementation of getInfo()
    *
    */
   public static function getInfo() {
     return array(
-      'name' => t('Italia Phone number test'),
-      'description' => t('Tests various valid and invalid Italia phone numbers for validity'),
-      'group' => t('Phone')
+      'name' => 'Italia Phone number test',
+      'description' => 'Tests various valid and invalid Italia phone numbers for validity',
+      'group' => 'Phone',
     );
   }
 
+  public function setUp() {
+    parent::setUp();
+    module_load_include('module', 'phone');
+  }
+
   public function testPhoneITValid() {
     $this->assertTrue(valid_phone_number('it', '06/2034567'), t('Test valid - 06/2034567'));
     $this->assertTrue(valid_phone_number('it', '+39 02/123456'), t('Test valid - +39 02/123456'));
diff --git a/tests/phone.jo.test b/tests/phone.jo.test
index aeeb14e..c5537fe 100644
--- a/tests/phone.jo.test
+++ b/tests/phone.jo.test
@@ -1,18 +1,23 @@
 <?php
 
-class JOPhoneNumberTestCase extends DrupalWebTestCase {
+class JOPhoneNumberTestCase extends DrupalUnitTestCase {
   /**
    * Implementation of getInfo()
    *
    */
   public static function getInfo() {
     return array(
-      'name' => t('Jordania Phone number test'),
-      'description' => t('Tests various valid and invalid Jordania phone numbers for validity'),
-      'group' => t('Phone')
+      'name' => 'Jordania Phone number test',
+      'description' => 'Tests various valid and invalid Jordania phone numbers for validity',
+      'group' => 'Phone',
     );
   }
 
+  public function setUp() {
+    parent::setUp();
+    module_load_include('module', 'phone');
+  }
+
   public function testPhoneJOValid() {
     //$this->assertTrue(valid_phone_number('jo', '04 476 0000'), t('Test valid'));
   }
diff --git a/tests/phone.nl.test b/tests/phone.nl.test
index 6886399..9c02bd6 100644
--- a/tests/phone.nl.test
+++ b/tests/phone.nl.test
@@ -1,18 +1,23 @@
 <?php
 
-class NLPhoneNumberTestCase extends DrupalWebTestCase {
+class NLPhoneNumberTestCase extends DrupalUnitTestCase {
   /**
    * Implementation of getInfo()
    *
    */
   public static function getInfo() {
     return array(
-      'name' => t('Netherland Phone number test'),
-      'description' => t('Tests various valid and invalid Netherland phone numbers for validity'),
-      'group' => t('Phone')
+      'name' => 'Netherland Phone number test',
+      'description' => 'Tests various valid and invalid Netherland phone numbers for validity',
+      'group' => 'Phone',
     );
   }
 
+  public function setUp() {
+    parent::setUp();
+    module_load_include('module', 'phone');
+  }
+
   public function testPhoneNLValid() {
     //$this->assertTrue(valid_phone_number('nl', '04 476 0000'), t('Test valid'));
   }
diff --git a/tests/phone.nz.test b/tests/phone.nz.test
index 57b7d1b..2b1c196 100644
--- a/tests/phone.nz.test
+++ b/tests/phone.nz.test
@@ -1,18 +1,23 @@
 <?php
 
-class NZPhoneNumberTestCase extends DrupalWebTestCase {
+class NZPhoneNumberTestCase extends DrupalUnitTestCase {
   /**
    * Implementation of getInfo()
    *
    */
   public static function getInfo() {
     return array(
-      'name' => t('New Zealand Phone number test'),
-      'description' => t('Tests various valid and invalid New Zealand phone numbers for validity'),
-      'group' => t('Phone')
+      'name' => 'New Zealand Phone number test',
+      'description' => 'Tests various valid and invalid New Zealand phone numbers for validity',
+      'group' => 'Phone',
     );
   }
 
+  public function setUp() {
+    parent::setUp();
+    module_load_include('module', 'phone');
+  }
+
   public function testPhoneNZValid() {
     $this->assertTrue(valid_phone_number('nz', '04 476 0000'), t('Test standard regional number 04 476 0000'));
     $this->assertTrue(valid_phone_number('nz', '+64 4 476 0000'), t('Test international variation of regional +64 4 476 0000'));
diff --git a/tests/phone.pa.test b/tests/phone.pa.test
index 88ecb29..bd16fa7 100644
--- a/tests/phone.pa.test
+++ b/tests/phone.pa.test
@@ -1,15 +1,20 @@
 <?php
 
-class PhonePanamanianTest extends DrupalWebTestCase {
+class PhonePanamanianTest extends DrupalUnitTestCase {
 
   public static function getInfo() {
     return array(
-      'name' => t('Panamanian phone'),
-      'description' => t('Executes test suite for validating / formatting Panamanian phone number.'),
-      'group' => t('Phone'),
+      'name' => 'Panamanian phone',
+      'description' => 'Executes test suite for validating / formatting Panamanian phone number.',
+      'group' => 'Phone',
     );
   }
 
+  public function setUp() {
+    parent::setUp();
+    module_load_include('module', 'phone');
+  }
+
   function testValidatingPanamenianPhoneNumber() {
     $this->assertTrue(valid_phone_number('pa', '+507 260-4334'), '+507 260-4334 should be valid');
     $this->assertTrue(valid_phone_number('pa', '+507 2604334'), '+507 2604334 should be valid');
diff --git a/tests/phone.ph.test b/tests/phone.ph.test
index c2e8929..7f64629 100644
--- a/tests/phone.ph.test
+++ b/tests/phone.ph.test
@@ -1,18 +1,23 @@
 <?php
 
-class PHPhoneNumberTestCase extends DrupalWebTestCase {
+class PHPhoneNumberTestCase extends DrupalUnitTestCase {
   /**
    * Implementation of getInfo()
    *
    */
   public static function getInfo() {
     return array(
-      'name' => t('Philippine Phone number test'),
-      'description' => t('Tests various valid and invalid Philippine phone numbers for validity'),
-      'group' => t('Phone')
+      'name' => 'Philippine Phone number test',
+      'description' => 'Tests various valid and invalid Philippine phone numbers for validity',
+      'group' => 'Phone',
     );
   }
 
+  public function setUp() {
+    parent::setUp();
+    module_load_include('module', 'phone');
+  }
+
   public function testPhonePHValid() {
     //$this->assertTrue(valid_phone_number('ph', '04 476 0000'), t('Test standard regional number 04 476 0000'));
   }
diff --git a/tests/phone.pk.test b/tests/phone.pk.test
index b2fafc5..714941e 100644
--- a/tests/phone.pk.test
+++ b/tests/phone.pk.test
@@ -1,18 +1,23 @@
 <?php
 
-class PKPhoneNumberTestCase extends DrupalWebTestCase {
+class PKPhoneNumberTestCase extends DrupalUnitTestCase {
   /**
    * Implementation of getInfo()
    *
    */
   public static function getInfo() {
     return array(
-      'name' => t('Pakistan Phone number test'),
-      'description' => t('Tests various valid and invalid Pakistan phone numbers for validity'),
-      'group' => t('Phone')
+      'name' => 'Pakistan Phone number test',
+      'description' => 'Tests various valid and invalid Pakistan phone numbers for validity',
+      'group' => 'Phone',
     );
   }
 
+  public function setUp() {
+    parent::setUp();
+    module_load_include('module', 'phone');
+  }
+
   public function testPhonePKValid() {
     $this->assertTrue(valid_phone_number('pk', '+92 321 7469854'), t('Test valid'));
     $this->assertTrue(valid_phone_number('pk', '923217469857'), t('Test valid'));
diff --git a/tests/phone.pl.test b/tests/phone.pl.test
index 0996f46..cc94df6 100644
--- a/tests/phone.pl.test
+++ b/tests/phone.pl.test
@@ -1,18 +1,23 @@
 <?php
 
-class PLPhoneNumberTestCase extends DrupalWebTestCase {
+class PLPhoneNumberTestCase extends DrupalUnitTestCase {
   /**
    * Implementation of getInfo()
    *
    */
   public static function getInfo() {
     return array(
-      'name' => t('Poland Phone number test'),
-      'description' => t('Tests various valid and invalid Poland phone numbers for validity'),
-      'group' => t('Phone')
+      'name' => 'Poland Phone number test',
+      'description' => 'Tests various valid and invalid Poland phone numbers for validity',
+      'group' => 'Phone',
     );
   }
 
+  public function setUp() {
+    parent::setUp();
+    module_load_include('module', 'phone');
+  }
+
   public function testPhonePLValid() {
     $this->assertTrue(valid_phone_number('pl', '+48 500-080-100'), t('Test valid'));
     $this->assertTrue(valid_phone_number('pl', '500080100'), t('Test valid'));
diff --git a/tests/phone.ru.test b/tests/phone.ru.test
index ea4109a..cc77a2e 100644
--- a/tests/phone.ru.test
+++ b/tests/phone.ru.test
@@ -1,18 +1,23 @@
 <?php
 
-class RUPhoneNumberTestCase extends DrupalWebTestCase {
+class RUPhoneNumberTestCase extends DrupalUnitTestCase {
   /**
    * Implementation of getInfo()
    *
    */
   public static function getInfo() {
     return array(
-      'name' => t('Russia Phone number test'),
-      'description' => t('Tests various valid and invalid Russia phone numbers for validity'),
-      'group' => t('Phone')
+      'name' => 'Russia Phone number test',
+      'description' => 'Tests various valid and invalid Russia phone numbers for validity',
+      'group' => 'Phone',
     );
   }
 
+  public function setUp() {
+    parent::setUp();
+    module_load_include('module', 'phone');
+  }
+
   public function testPhoneRUValid() {
     $this->assertTrue(valid_phone_number('ru', '+7(916)9985670'), t('Test valid'));
     $this->assertTrue(valid_phone_number('ru', '8-912-268-5440'), t('Test valid'));
diff --git a/tests/phone.se.test b/tests/phone.se.test
index 2c5fde4..a670854 100644
--- a/tests/phone.se.test
+++ b/tests/phone.se.test
@@ -1,18 +1,23 @@
 <?php
 
-class SEPhoneNumberTestCase extends DrupalWebTestCase {
+class SEPhoneNumberTestCase extends DrupalUnitTestCase {
   /**
    * Implementation of getInfo()
    *
    */
   public static function getInfo() {
     return array(
-      'name' => t('Sweden Phone number test'),
-      'description' => t('Tests various valid and invalid Sweden phone numbers for validity'),
-      'group' => t('Phone')
+      'name' => 'Sweden Phone number test',
+      'description' => 'Tests various valid and invalid Sweden phone numbers for validity',
+      'group' => 'Phone',
     );
   }
 
+  public function setUp() {
+    parent::setUp();
+    module_load_include('module', 'phone');
+  }
+
   public function testPhoneSEValid() {
     $this->assertTrue(valid_phone_number('se', '+46 8 123 456 78'), t('Test valid'));
     $this->assertTrue(valid_phone_number('se', '08-123 456 78'), t('Test valid'));
diff --git a/tests/phone.sg.test b/tests/phone.sg.test
index 2ad8b88..795738a 100644
--- a/tests/phone.sg.test
+++ b/tests/phone.sg.test
@@ -1,18 +1,23 @@
 <?php
 
-class SGPhoneNumberTestCase extends DrupalWebTestCase {
+class SGPhoneNumberTestCase extends DrupalUnitTestCase {
   /**
    * Implementation of getInfo()
    *
    */
   public static function getInfo() {
     return array(
-      'name' => t('Singapore Phone number test'),
-      'description' => t('Tests various valid and invalid Singapore phone numbers for validity'),
-      'group' => t('Phone')
+      'name' => 'Singapore Phone number test',
+      'description' => 'Tests various valid and invalid Singapore phone numbers for validity',
+      'group' => 'Phone',
     );
   }
 
+  public function setUp() {
+    parent::setUp();
+    module_load_include('module', 'phone');
+  }
+
   public function testPhoneSGValid() {
     $this->assertTrue(valid_phone_number('sg', '61234567'), "'61234567' should be valid");
     $this->assertTrue(valid_phone_number('sg', '63829324'), "'63829324' should be valid");
diff --git a/tests/phone.ua.test b/tests/phone.ua.test
index d1096cb..70dc311 100644
--- a/tests/phone.ua.test
+++ b/tests/phone.ua.test
@@ -1,20 +1,21 @@
 <?php
 
-class UAPhoneNumberTestCase extends DrupalWebTestCase {
+class UAPhoneNumberTestCase extends DrupalUnitTestCase {
   /**
    * Implementation of getInfo()
    *
    */
   public static function getInfo() {
     return array(
-      'name' => t('Ukraine Phone number test'),
-      'description' => t('Tests various valid and invalid Ukraine phone numbers for validity'),
-      'group' => t('Phone')
+      'name' => 'Ukraine Phone number test',
+      'description' => 'Tests various valid and invalid Ukraine phone numbers for validity',
+      'group' => 'Phone',
     );
   }
 
-  function setUp() {
+  public function setUp() {
     parent::setUp();
+    module_load_include('module', 'phone');
   }
 
   public function testPhoneUAValid() {
diff --git a/tests/phone.uk.test b/tests/phone.uk.test
index 2470a39..352c450 100644
--- a/tests/phone.uk.test
+++ b/tests/phone.uk.test
@@ -1,18 +1,23 @@
 <?php
 
-class UKPhoneNumberTestCase extends DrupalWebTestCase {
+class UKPhoneNumberTestCase extends DrupalUnitTestCase {
   /**
    * Implementation of getInfo()
    *
    */
   public static function getInfo() {
     return array(
-      'name' => t('UK Phone number test'),
-      'description' => t('Tests various valid and invalid UK phone numbers for validity'),
-      'group' => t('Phone')
+      'name' => 'UK Phone number test',
+      'description' => 'Tests various valid and invalid UK phone numbers for validity',
+      'group' => 'Phone',
     );
   }
 
+  public function setUp() {
+    parent::setUp();
+    module_load_include('module', 'phone');
+  }
+
   public function testPhoneUKValid() {
     $this->assertTrue(valid_phone_number('uk', '01905 23819'), t('Test valid - 01905 23819'));
     $this->assertTrue(valid_phone_number('uk', '01222 555 555'), t('Test valid - 01222 555 555'));
diff --git a/tests/phone.za.test b/tests/phone.za.test
index 535148e..dc4e985 100644
--- a/tests/phone.za.test
+++ b/tests/phone.za.test
@@ -1,18 +1,23 @@
 <?php
 
-class ZAPhoneNumberTestCase extends DrupalWebTestCase {
+class ZAPhoneNumberTestCase extends DrupalUnitTestCase {
   /**
    * Implementation of getInfo()
    *
    */
   public static function getInfo() {
     return array(
-      'name' => t('South Africa Phone number test'),
-      'description' => t('Tests various valid and invalid South African phone numbers for validity'),
-      'group' => t('Phone')
+      'name' => 'South Africa Phone number test',
+      'description' => 'Tests various valid and invalid South African phone numbers for validity',
+      'group' => 'Phone',
     );
   }
 
+  public function setUp() {
+    parent::setUp();
+    module_load_include('module', 'phone');
+  }
+
   public function testPhoneZAValid() {
     $this->assertTrue(valid_phone_number('za', '+27 11 888-8888'), t('Test valid - +27 11 888-8888'));
     $this->assertTrue(valid_phone_number('za', '0333872119'), t('Test valid - 0333872119'));