diff --git a/phpunit.xml b/phpunit.xml
index 8e425f9..5693a09 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -12,7 +12,7 @@
 >
   <testsuites>
     <testsuite name="Valitron Test Suite">
-      <directory suffix=".php">tests/Valitron</directory>
+      <directory suffix="Test.php">tests/Valitron</directory>
     </testsuite>
   </testsuites>
 </phpunit>
diff --git a/src/Valitron/Validator.php b/src/Valitron/Validator.php
index 6879524..cb7cc8e 100644
--- a/src/Valitron/Validator.php
+++ b/src/Valitron/Validator.php
@@ -40,9 +40,9 @@ class Validator
         }
 
         // set lang in the follow order: constructor param, static::$_lang, defaul to en
-        $lang = $lang ?: static::$_lang ?: 'en';
+        $lang = $lang ?: static::lang();
         // set langDir in the follow order: constructor param, static::$_langDir, default to package lang dir
-        $langDir = $langDir ?: static::$_langDir ?: dirname(dirname(__DIR__)) . '/lang';
+        $langDir = $langDir ?: static::langDir();
 
         static::langDir($langDir);
         static::lang($lang);
@@ -60,7 +60,7 @@ class Validator
             $langDir = static::langDir();
             static::$_ruleMessages = require rtrim($langDir, '/') . '/' . $lang . '.php';
         }
-        return static::$_lang;
+        return static::$_lang ?: 'en';
     }
 
     /**
@@ -71,7 +71,7 @@ class Validator
         if($dir !== null) {
             static::$_langDir = $dir;
         }
-        return static::$_langDir;
+        return static::$_langDir ?: dirname(dirname(__DIR__)) . '/lang';
     }
 
     /**
diff --git a/tests/Valitron/BaseTestCase.php b/tests/Valitron/BaseTestCase.php
new file mode 100644
index 0000000..0dec6c4
--- /dev/null
+++ b/tests/Valitron/BaseTestCase.php
@@ -0,0 +1,24 @@
+<?php
+
+class BaseTestCase extends \PHPUnit_Framework_TestCase
+{
+	public function setUp()
+	{
+		$this->tearDown();
+	}
+
+	public function tearDown()
+	{
+		$this->resetProperty('_lang');
+		$this->resetProperty('_langDir');
+		$this->resetProperty('_ruleMessages', array());
+	}
+
+	protected function resetProperty($name, $value = null)
+	{
+		$prop = new ReflectionProperty('Valitron\Validator', $name);
+		$prop->setAccessible(true);
+		$prop->setValue($value);
+		$prop->setAccessible(false);
+	}
+}
diff --git a/tests/Valitron/ErrorMessages.php b/tests/Valitron/ErrorMessages.php
index b517e2f..51f7f19 100644
--- a/tests/Valitron/ErrorMessages.php
+++ b/tests/Valitron/ErrorMessages.php
@@ -1,7 +1,7 @@
 <?php
 use Valitron\Validator;
 
-class ErrorMessagesTest extends \PHPUnit_Framework_TestCase
+class ErrorMessagesTest extends BaseTestCase
 {
     public function testErrorMessageIncludesFieldName()
     {
diff --git a/tests/Valitron/StaticLangTest.php b/tests/Valitron/StaticLangTest.php
index 6ea489a..0ff847a 100644
--- a/tests/Valitron/StaticLangTest.php
+++ b/tests/Valitron/StaticLangTest.php
@@ -1,23 +1,8 @@
 <?php
 use Valitron\Validator;
 
-class StaticLangTest extends \PHPUnit_Framework_TestCase
+class StaticLangTest extends BaseTestCase
 {
-	public function tearDown()
-	{
-		$this->resetProperty('_lang');
-		$this->resetProperty('_langDir');
-		$this->resetProperty('_ruleMessages', array());
-	}
-
-	protected function resetProperty($name, $value = null)
-	{
-		$prop = new ReflectionProperty('Valitron\Validator', $name);
-		$prop->setAccessible(true);
-		$prop->setValue($value);
-		$prop->setAccessible(false);
-	}
-
 	protected function getLangDir()
 	{
 		return __DIR__.'/../../lang';
diff --git a/tests/Valitron/Validate.php b/tests/Valitron/ValidateTest.php
similarity index 99%
rename from tests/Valitron/Validate.php
rename to tests/Valitron/ValidateTest.php
index 8f61764..b3d5d1b 100644
--- a/tests/Valitron/Validate.php
+++ b/tests/Valitron/ValidateTest.php
@@ -1,7 +1,7 @@
 <?php
 use Valitron\Validator;
 
-class ValidateTest extends \PHPUnit_Framework_TestCase
+class ValidateTest extends BaseTestCase
 {
     public function testValidWithNoRules()
     {
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index d134f38..b4dcfb1 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -16,3 +16,4 @@ if($vendorPos !== false) {
     $loader = require __DIR__.'/../vendor/autoload.php';
 }
 
+require_once __DIR__ . '/Valitron/BaseTestCase.php';
\ No newline at end of file