diff --git a/~dev_rating/application/tests/classes/Model_Discipline_Test.php b/~dev_rating/application/tests/classes/Model_Discipline_Test.php
new file mode 100644
index 0000000000000000000000000000000000000000..7678ec5a3e7474440563c5b64d7f431555e157b5
--- /dev/null
+++ b/~dev_rating/application/tests/classes/Model_Discipline_Test.php
@@ -0,0 +1,11 @@
+<?php
+
+class Model_Discipline_Test extends PHPUnit_Framework_TestCase {
+
+    /** @test */
+    function idField() {
+        $d = Model_Discipline::load(1);
+        $this->assertEquals($d->id, 1);
+    }
+
+}
diff --git a/~dev_rating/modules/unittest/bootstrap.php b/~dev_rating/modules/unittest/bootstrap.php
index 177dae15a0a76e7c57d7eef1bf91461c67d39334..493076b62b3d66ff34c2f968def713aa08d33142 100644
--- a/~dev_rating/modules/unittest/bootstrap.php
+++ b/~dev_rating/modules/unittest/bootstrap.php
@@ -121,5 +121,10 @@ if (($ob_len = ob_get_length()) !== FALSE)
 	}
 }
 
-// Enable the unittest module
-Kohana::modules(Kohana::modules() + array('unittest' => MODPATH.'unittest'));
\ No newline at end of file
+// Enable the unittest module if it is not already loaded - use the absolute path
+$modules = Kohana::modules();
+$unittest_path = realpath(__DIR__).DIRECTORY_SEPARATOR;
+if ( ! in_array($unittest_path, $modules)) {
+    $modules['unittest'] = $unittest_path;
+    Kohana::modules($modules);
+}