diff --git a/Tests/TESTS b/Tests/TESTS
deleted file mode 100755
index 6957b34..0000000
--- a/Tests/TESTS
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-#To run the tests, you need "phpunit" software.
-# All the documentation is here :
-# phpunit.de/manual/current/en/writing-tests-for-phpunit.html
-
-#From the root dir of the project, run the tests like : 
-cd `dirname $0`/..
-phpunit --bootstrap Tests/autoload.php Tests/test*
-
-# You can run specific test with :
-# cd `dirname $0`/..
-# phpunit --bootstrap Tests/autoload.php Tests/testXXXXXXX.php
diff --git a/Tests/autoload.php b/Tests/autoload.php.dist
similarity index 100%
rename from Tests/autoload.php
rename to Tests/autoload.php.dist
diff --git a/Tests/test_outputjson.php b/Tests/outputjsonTest.php
similarity index 100%
rename from Tests/test_outputjson.php
rename to Tests/outputjsonTest.php
diff --git a/Tests/routeTest.php b/Tests/routeTest.php
new file mode 100644
index 0000000..2d49275
--- /dev/null
+++ b/Tests/routeTest.php
@@ -0,0 +1,167 @@
+<?php
+/** DomFramework - Tests
+    @package domframework
+    @author Dominique Fournier <dominique@fournier38.fr> */
+
+/** Test the route.php file */
+class test_route extends PHPUnit_Framework_TestCase
+{
+  /** Entry null */
+  public function test_baseURL_1 ()
+  {
+    $this->expectOutputString("");
+    $route = new route ();
+    $route->baseURL ();
+  }
+
+  /** Port 80 and HTTP without module */
+  public function test_baseURL_2 ()
+  {
+    $this->expectOutputString("http://localhost/");
+    unset ($_SERVER);
+    $_SERVER["SERVER_NAME"] = "localhost";
+    $_SERVER["SERVER_PORT"] = 80;
+    $_SERVER["SCRIPT_NAME"] = "/index.php";
+    $route = new route ();
+    echo $route->baseURL ();
+  }
+
+  /** Port 443 and HTTPS without module */
+  public function test_baseURL_3 ()
+  {
+    $this->expectOutputString("https://localhost/");
+    unset ($_SERVER);
+    $_SERVER["SERVER_NAME"] = "localhost";
+    $_SERVER["SERVER_PORT"] = 443;
+    $_SERVER["HTTPS"] = true;
+    $_SERVER["SCRIPT_NAME"] = "/index.php";
+    $route = new route ();
+    echo $route->baseURL ();
+  }
+
+  /** Port 888 and HTTP without module */
+  public function test_baseURL_4 ()
+  {
+    $this->expectOutputString("http://localhost:888/");
+    unset ($_SERVER);
+    $_SERVER["SERVER_NAME"] = "localhost";
+    $_SERVER["SERVER_PORT"] = 888;
+    $_SERVER["SCRIPT_NAME"] = "/index.php";
+    $route = new route ();
+    echo $route->baseURL ();
+  }
+
+  /** Port 888 and HTTPS without module */
+  public function test_baseURL_5 ()
+  {
+    $this->expectOutputString("https://localhost:888/");
+    unset ($_SERVER);
+    $_SERVER["SERVER_NAME"] = "localhost";
+    $_SERVER["SERVER_PORT"] = 888;
+    $_SERVER["HTTPS"] = true;
+    $_SERVER["SCRIPT_NAME"] = "/index.php";
+    $route = new route ();
+    echo $route->baseURL ();
+  }
+
+  /** Port 80 and HTTP with module */
+  public function test_baseURL_2_module ()
+  {
+    $this->expectOutputString("http://localhost/");
+    unset ($_SERVER);
+    $_SERVER["SERVER_NAME"] = "localhost";
+    $_SERVER["SERVER_PORT"] = 80;
+    $_SERVER["SCRIPT_NAME"] = "/module/index.php";
+    $route = new route ();
+    echo $route->baseURL ("module");
+  }
+
+  /** Port 443 and HTTPS with module */
+  public function test_baseURL_3_module ()
+  {
+    $this->expectOutputString("https://localhost/");
+    unset ($_SERVER);
+    $_SERVER["SERVER_NAME"] = "localhost";
+    $_SERVER["SERVER_PORT"] = 443;
+    $_SERVER["HTTPS"] = true;
+    $_SERVER["SCRIPT_NAME"] = "/module/index.php";
+    $route = new route ();
+    echo $route->baseURL ("module");
+  }
+
+  /** Port 888 and HTTP with module */
+  public function test_baseURL_4_module ()
+  {
+    $this->expectOutputString("http://localhost:888/");
+    unset ($_SERVER);
+    $_SERVER["SERVER_NAME"] = "localhost";
+    $_SERVER["SERVER_PORT"] = 888;
+    $_SERVER["SCRIPT_NAME"] = "/module/index.php";
+    $route = new route ();
+    echo $route->baseURL ("module");
+  }
+
+  /** Port 888 and HTTPS with module */
+  public function test_baseURL_5_module ()
+  {
+    $this->expectOutputString("https://localhost:888/");
+    unset ($_SERVER);
+    $_SERVER["SERVER_NAME"] = "localhost";
+    $_SERVER["SERVER_PORT"] = 888;
+    $_SERVER["HTTPS"] = true;
+    $_SERVER["SCRIPT_NAME"] = "/module/index.php";
+    $route = new route ();
+    echo $route->baseURL ("module");
+  }
+
+  /** Port 80 and HTTP requestURL */
+  public function test_requestURL_2 ()
+  {
+    $this->expectOutputString("http://localhost/index.php?var=1");
+    unset ($_SERVER);
+    $_SERVER["SERVER_NAME"] = "localhost";
+    $_SERVER["SERVER_PORT"] = 80;
+    $_SERVER["REQUEST_URI"] = "/index.php?var=1";
+    $route = new route ();
+    echo $route->requestURL ();
+  }
+
+  /** Port 443 and HTTPS requestURL */
+  public function test_requestURL_3 ()
+  {
+    $this->expectOutputString("https://localhost/index.php?var=1");
+    unset ($_SERVER);
+    $_SERVER["SERVER_NAME"] = "localhost";
+    $_SERVER["SERVER_PORT"] = 443;
+    $_SERVER["HTTPS"] = true;
+    $_SERVER["REQUEST_URI"] = "/index.php?var=1";
+    $route = new route ();
+    echo $route->requestURL ();
+  }
+
+  /** Port 888 and HTTP requestURL */
+  public function test_requestURL_4 ()
+  {
+    $this->expectOutputString("http://localhost:888/index.php?var=1");
+    unset ($_SERVER);
+    $_SERVER["SERVER_NAME"] = "localhost";
+    $_SERVER["SERVER_PORT"] = 888;
+    $_SERVER["REQUEST_URI"] = "/index.php?var=1";
+    $route = new route ();
+    echo $route->requestURL ();
+  }
+
+  /** Port 888 and HTTPS requestURL */
+  public function test_requestURL_5 ()
+  {
+    $this->expectOutputString("https://localhost:888/index.php?var=1");
+    unset ($_SERVER);
+    $_SERVER["SERVER_NAME"] = "localhost";
+    $_SERVER["SERVER_PORT"] = 888;
+    $_SERVER["HTTPS"] = true;
+    $_SERVER["REQUEST_URI"] = "/index.php?var=1";
+    $route = new route ();
+    echo $route->requestURL ();
+  }
+
+}
diff --git a/phpunit.xml b/phpunit.xml
new file mode 100644
index 0000000..528ee4a
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+	backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="false"
+         bootstrap="Tests/autoload.php.dist"
+>
+	<testsuites>
+		<testsuite name="DomFramework test suite">
+			<directory>Tests</directory>
+		</testsuite>
+	</testsuites>
+</phpunit>