diff --git a/test/BaseWithOneBook/metadata.db b/test/BaseWithOneBook/metadata.db
new file mode 100644
index 0000000..a1f24b3
Binary files /dev/null and b/test/BaseWithOneBook/metadata.db differ
diff --git a/test/metadata.db b/test/BaseWithSomeBooks/metadata.db
similarity index 100%
rename from test/metadata.db
rename to test/BaseWithSomeBooks/metadata.db
diff --git a/test/OPDSTest.php b/test/OPDSTest.php
index fcb3866..6e478e3 100644
--- a/test/OPDSTest.php
+++ b/test/OPDSTest.php
@@ -1,10 +1,16 @@
 <?php
+/**
+ * COPS (Calibre OPDS PHP Server) test file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Sébastien Lucas <sebastien@slucas.fr>
+ */
 
 require_once (dirname(__FILE__) . "/config_test.php");
 require_once (dirname(__FILE__) . "/../book.php");
 require_once (dirname(__FILE__) . "/../OPDS_renderer.php");
 
-define ("OPDS_RELAX_NG", dirname(__FILE__) . "/opds_catalog_1_1.rng");
+define ("OPDS_RELAX_NG", dirname(__FILE__) . "/opds-relax-ng/opds_catalog_1_1.rng");
 define ("JING_JAR", dirname(__FILE__) . "/jing.jar");
 define ("TEST_FEED", dirname(__FILE__) . "/text.atom");
 
diff --git a/test/baseTest.php b/test/baseTest.php
index ca6480f..7b2c21c 100644
--- a/test/baseTest.php
+++ b/test/baseTest.php
@@ -1,4 +1,10 @@
 <?php
+/**
+ * COPS (Calibre OPDS PHP Server) test file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Sébastien Lucas <sebastien@slucas.fr>
+ */
 
 require_once (dirname(__FILE__) . "/config_test.php");
 require_once (dirname(__FILE__) . "/../base.php");
diff --git a/test/bookTest.php b/test/bookTest.php
index 45986ad..f23c053 100644
--- a/test/bookTest.php
+++ b/test/bookTest.php
@@ -1,4 +1,10 @@
 <?php
+/**
+ * COPS (Calibre OPDS PHP Server) test file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Sébastien Lucas <sebastien@slucas.fr>
+ */
 
 require_once (dirname(__FILE__) . "/config_test.php");
 require_once (dirname(__FILE__) . "/../book.php");
diff --git a/test/config_test.php b/test/config_test.php
index 847889b..a2d3174 100644
--- a/test/config_test.php
+++ b/test/config_test.php
@@ -1,4 +1,4 @@
 <?php
 
 require_once (dirname(__FILE__) . "/../config_default.php");
-$config['calibre_directory'] = dirname(__FILE__) . "/";
\ No newline at end of file
+$config['calibre_directory'] = dirname(__FILE__) . "/BaseWithSomeBooks/";
\ No newline at end of file
diff --git a/test/atom.rng b/test/opds-relax-ng/atom.rng
similarity index 100%
rename from test/atom.rng
rename to test/opds-relax-ng/atom.rng
diff --git a/test/opds_catalog_1_1.rng b/test/opds-relax-ng/opds_catalog_1_1.rng
similarity index 100%
rename from test/opds_catalog_1_1.rng
rename to test/opds-relax-ng/opds_catalog_1_1.rng
diff --git a/test/pageMultidatabaseTest.php b/test/pageMultidatabaseTest.php
new file mode 100644
index 0000000..69d8df6
--- /dev/null
+++ b/test/pageMultidatabaseTest.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * COPS (Calibre OPDS PHP Server) test file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Sébastien Lucas <sebastien@slucas.fr>
+ */
+
+require_once (dirname(__FILE__) . "/config_test.php");
+require_once (dirname(__FILE__) . "/../book.php");
+
+class PageMultiDatabaseTest extends PHPUnit_Framework_TestCase
+{   
+    public function testPageIndex ()
+    {
+        global $config;
+        $config['calibre_directory'] = array ("Some books" => dirname(__FILE__) . "/BaseWithSomeBooks/",
+                                              "One book" => dirname(__FILE__) . "/BaseWithOneBook/");
+        $page = Base::PAGE_INDEX;
+        $query = NULL;
+        $search = NULL;
+        $qid = NULL;
+        $n = "1";
+        $database = NULL;
+        
+        $currentPage = Page::getPage ($page, $qid, $query, $n);
+        $currentPage->InitializeContent ();
+        
+        $this->assertEquals ($config['cops_title_default'], $currentPage->title);
+        $this->assertCount (2, $currentPage->entryArray);
+        $this->assertEquals ("Some books", $currentPage->entryArray [0]->title);
+        $this->assertEquals ("14 books", $currentPage->entryArray [0]->content);
+        $this->assertEquals ("One book", $currentPage->entryArray [1]->title);
+        $this->assertEquals ("1 book", $currentPage->entryArray [1]->content);
+        $this->assertFalse ($currentPage->ContainsBook ());
+    }
+}
\ No newline at end of file
diff --git a/test/pageTest.php b/test/pageTest.php
index eeeab9c..d5af42d 100644
--- a/test/pageTest.php
+++ b/test/pageTest.php
@@ -1,4 +1,10 @@
 <?php
+/**
+ * COPS (Calibre OPDS PHP Server) test file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Sébastien Lucas <sebastien@slucas.fr>
+ */
 
 require_once (dirname(__FILE__) . "/config_test.php");
 require_once (dirname(__FILE__) . "/../book.php");