diff --git a/tests/AllTests.php b/tests/AllTests.php
index c6b9057..234e21d 100644
--- a/tests/AllTests.php
+++ b/tests/AllTests.php
@@ -1,14 +1,17 @@
 <?php
-/*
-* To launch all tests, type the following line into the root directory
-* of SemanticScuttle (where is the config.php file) :
-*
-*     phpunit --testdox-html tests/dox.html AllTests tests/allTests.php
-*
-* A dox.html file will be created into the tests/ directory providing a summary
-* of tests according to agile development.
-* */
-
+/**
+ * SemanticScuttle - your social bookmark manager.
+ *
+ * PHP version 5.
+ *
+ * @category Bookmarking
+ * @package  SemanticScuttle
+ * @author   Benjamin Huynh-Kim-Bang <mensonge@users.sourceforge.net>
+ * @author   Christian Weiske <cweiske@cweiske.de>
+ * @author   Eric Dane <ericdane@users.sourceforge.net>
+ * @license  GPL http://www.gnu.org/licenses/gpl.html
+ * @link     http://sourceforge.net/projects/semanticscuttle
+ */
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'AllTests::main');
 }
@@ -16,6 +19,26 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
 require_once 'prepare.php';
 require_once 'PHPUnit/Framework/TestSuite.php';
 
+/**
+ * SemanticScuttle unit tests.
+ *
+ * To launch this tests, you need PHPUnit 3.
+ * Run them with:
+ * $ php tests/AllTests.php
+ * or single files like:
+ * $ php tests/BookmarkTest.php
+ *
+ * You also may use phpunit directly:
+ * $ phpunit tests/AllTests.php
+ *
+ * @category Bookmarking
+ * @package  SemanticScuttle
+ * @author   Benjamin Huynh-Kim-Bang <mensonge@users.sourceforge.net>
+ * @author   Christian Weiske <cweiske@cweiske.de>
+ * @author   Eric Dane <ericdane@users.sourceforge.net>
+ * @license  GPL http://www.gnu.org/licenses/gpl.html
+ * @link     http://sourceforge.net/projects/semanticscuttle
+ */
 class AllTests extends PHPUnit_Framework_TestSuite
 {
     public static function main()
diff --git a/tests/BookmarkTest.php b/tests/BookmarkTest.php
index d7f4240..1224dfe 100644
--- a/tests/BookmarkTest.php
+++ b/tests/BookmarkTest.php
@@ -6,7 +6,9 @@
  *
  * @category Bookmarking
  * @package  SemanticScuttle
+ * @author   Benjamin Huynh-Kim-Bang <mensonge@users.sourceforge.net>
  * @author   Christian Weiske <cweiske@cweiske.de>
+ * @author   Eric Dane <ericdane@users.sourceforge.net>
  * @license  GPL http://www.gnu.org/licenses/gpl.html
  * @link     http://sourceforge.net/projects/semanticscuttle
  */
@@ -22,7 +24,9 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
  *
  * @category Bookmarking
  * @package  SemanticScuttle
- * @author Christian Weiske <cweiske@cweiske.de>
+ * @author   Benjamin Huynh-Kim-Bang <mensonge@users.sourceforge.net>
+ * @author   Christian Weiske <cweiske@cweiske.de>
+ * @author   Eric Dane <ericdane@users.sourceforge.net>
  * @license  GPL http://www.gnu.org/licenses/gpl.html
  * @link     http://sourceforge.net/projects/semanticscuttle
  */
diff --git a/tests/CommonDescriptionTest.php b/tests/CommonDescriptionTest.php
index 7276601..63b9e0c 100644
--- a/tests/CommonDescriptionTest.php
+++ b/tests/CommonDescriptionTest.php
@@ -6,7 +6,9 @@
  *
  * @category Bookmarking
  * @package  SemanticScuttle
+ * @author   Benjamin Huynh-Kim-Bang <mensonge@users.sourceforge.net>
  * @author   Christian Weiske <cweiske@cweiske.de>
+ * @author   Eric Dane <ericdane@users.sourceforge.net>
  * @license  GPL http://www.gnu.org/licenses/gpl.html
  * @link     http://sourceforge.net/projects/semanticscuttle
  */
@@ -22,7 +24,9 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
  *
  * @category Bookmarking
  * @package  SemanticScuttle
- * @author Christian Weiske <cweiske@cweiske.de>
+ * @author   Benjamin Huynh-Kim-Bang <mensonge@users.sourceforge.net>
+ * @author   Christian Weiske <cweiske@cweiske.de>
+ * @author   Eric Dane <ericdane@users.sourceforge.net>
  * @license  GPL http://www.gnu.org/licenses/gpl.html
  * @link     http://sourceforge.net/projects/semanticscuttle
  */
diff --git a/tests/SearchHistoryTest.php b/tests/SearchHistoryTest.php
index 3405af1..3716b37 100644
--- a/tests/SearchHistoryTest.php
+++ b/tests/SearchHistoryTest.php
@@ -6,7 +6,9 @@
  *
  * @category Bookmarking
  * @package  SemanticScuttle
+ * @author   Benjamin Huynh-Kim-Bang <mensonge@users.sourceforge.net>
  * @author   Christian Weiske <cweiske@cweiske.de>
+ * @author   Eric Dane <ericdane@users.sourceforge.net>
  * @license  GPL http://www.gnu.org/licenses/gpl.html
  * @link     http://sourceforge.net/projects/semanticscuttle
  */
@@ -22,7 +24,9 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
  *
  * @category Bookmarking
  * @package  SemanticScuttle
- * @author Christian Weiske <cweiske@cweiske.de>
+ * @author   Benjamin Huynh-Kim-Bang <mensonge@users.sourceforge.net>
+ * @author   Christian Weiske <cweiske@cweiske.de>
+ * @author   Eric Dane <ericdane@users.sourceforge.net>
  * @license  GPL http://www.gnu.org/licenses/gpl.html
  * @link     http://sourceforge.net/projects/semanticscuttle
  */
diff --git a/tests/Tag2TagTest.php b/tests/Tag2TagTest.php
index 3d86cb0..f888dd5 100644
--- a/tests/Tag2TagTest.php
+++ b/tests/Tag2TagTest.php
@@ -6,7 +6,9 @@
  *
  * @category Bookmarking
  * @package  SemanticScuttle
+ * @author   Benjamin Huynh-Kim-Bang <mensonge@users.sourceforge.net>
  * @author   Christian Weiske <cweiske@cweiske.de>
+ * @author   Eric Dane <ericdane@users.sourceforge.net>
  * @license  GPL http://www.gnu.org/licenses/gpl.html
  * @link     http://sourceforge.net/projects/semanticscuttle
  */
@@ -22,7 +24,9 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
  *
  * @category Bookmarking
  * @package  SemanticScuttle
- * @author Christian Weiske <cweiske@cweiske.de>
+ * @author   Benjamin Huynh-Kim-Bang <mensonge@users.sourceforge.net>
+ * @author   Christian Weiske <cweiske@cweiske.de>
+ * @author   Eric Dane <ericdane@users.sourceforge.net>
  * @license  GPL http://www.gnu.org/licenses/gpl.html
  * @link     http://sourceforge.net/projects/semanticscuttle
  */
diff --git a/tests/TagTest.php b/tests/TagTest.php
index 52e418e..c08aba2 100644
--- a/tests/TagTest.php
+++ b/tests/TagTest.php
@@ -6,7 +6,9 @@
  *
  * @category Bookmarking
  * @package  SemanticScuttle
+ * @author   Benjamin Huynh-Kim-Bang <mensonge@users.sourceforge.net>
  * @author   Christian Weiske <cweiske@cweiske.de>
+ * @author   Eric Dane <ericdane@users.sourceforge.net>
  * @license  GPL http://www.gnu.org/licenses/gpl.html
  * @link     http://sourceforge.net/projects/semanticscuttle
  */
@@ -22,7 +24,9 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
  *
  * @category Bookmarking
  * @package  SemanticScuttle
- * @author Christian Weiske <cweiske@cweiske.de>
+ * @author   Benjamin Huynh-Kim-Bang <mensonge@users.sourceforge.net>
+ * @author   Christian Weiske <cweiske@cweiske.de>
+ * @author   Eric Dane <ericdane@users.sourceforge.net>
  * @license  GPL http://www.gnu.org/licenses/gpl.html
  * @link     http://sourceforge.net/projects/semanticscuttle
  */
diff --git a/tests/TagsCacheTest.php b/tests/TagsCacheTest.php
index 3211629..9097bcb 100644
--- a/tests/TagsCacheTest.php
+++ b/tests/TagsCacheTest.php
@@ -6,7 +6,9 @@
  *
  * @category Bookmarking
  * @package  SemanticScuttle
+ * @author   Benjamin Huynh-Kim-Bang <mensonge@users.sourceforge.net>
  * @author   Christian Weiske <cweiske@cweiske.de>
+ * @author   Eric Dane <ericdane@users.sourceforge.net>
  * @license  GPL http://www.gnu.org/licenses/gpl.html
  * @link     http://sourceforge.net/projects/semanticscuttle
  */
@@ -22,7 +24,9 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
  *
  * @category Bookmarking
  * @package  SemanticScuttle
- * @author Christian Weiske <cweiske@cweiske.de>
+ * @author   Benjamin Huynh-Kim-Bang <mensonge@users.sourceforge.net>
+ * @author   Christian Weiske <cweiske@cweiske.de>
+ * @author   Eric Dane <ericdane@users.sourceforge.net>
  * @license  GPL http://www.gnu.org/licenses/gpl.html
  * @link     http://sourceforge.net/projects/semanticscuttle
  */
diff --git a/tests/VoteTest.php b/tests/VoteTest.php
index 754d908..326a5b9 100644
--- a/tests/VoteTest.php
+++ b/tests/VoteTest.php
@@ -22,7 +22,7 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
  *
  * @category Bookmarking
  * @package  SemanticScuttle
- * @author Christian Weiske <cweiske@cweiske.de>
+ * @author   Christian Weiske <cweiske@cweiske.de>
  * @license  GPL http://www.gnu.org/licenses/gpl.html
  * @link     http://sourceforge.net/projects/semanticscuttle
  */
diff --git a/tests/prepare.php b/tests/prepare.php
index 095cf36..5cdcfcc 100644
--- a/tests/prepare.php
+++ b/tests/prepare.php
@@ -1,4 +1,18 @@
 <?php
+/**
+ * SemanticScuttle - your social bookmark manager.
+ *
+ * PHP version 5.
+ *
+ * @category Bookmarking
+ * @package  SemanticScuttle
+ * @author   Benjamin Huynh-Kim-Bang <mensonge@users.sourceforge.net>
+ * @author   Christian Weiske <cweiske@cweiske.de>
+ * @author   Eric Dane <ericdane@users.sourceforge.net>
+ * @license  GPL http://www.gnu.org/licenses/gpl.html
+ * @link     http://sourceforge.net/projects/semanticscuttle
+ */
+
 /**
  * Prepare the application for unit testing
  */