diff --git a/phpdotnet/phd/Config.php b/phpdotnet/phd/Config.php
index a80a0a8b..400fca73 100644
--- a/phpdotnet/phd/Config.php
+++ b/phpdotnet/phd/Config.php
@@ -140,6 +140,10 @@ public static function __callStatic($name, $params)
             : NULL;
     }
 
+    public function __call($name, $params) {
+        return self::__callStatic($name, $params);
+    }
+
     public static function getSupportedPackages() {
         $packageList = array();
         foreach(Config::package_dirs() as $dir) {
@@ -183,5 +187,3 @@ public static function copyright() {
     }
 
 }
-
-
diff --git a/phpdotnet/phd/Index.php b/phpdotnet/phd/Index.php
index 0181067a..e0d119d3 100644
--- a/phpdotnet/phd/Index.php
+++ b/phpdotnet/phd/Index.php
@@ -527,6 +527,3 @@ public function setMembership($membership) {
     }
 
 }
-
-
-
diff --git a/tests/xhtml/TestChunkedXHTML.php b/phpdotnet/phd/TestGenericChunkedXHTML.php
similarity index 92%
rename from tests/xhtml/TestChunkedXHTML.php
rename to phpdotnet/phd/TestGenericChunkedXHTML.php
index 21badb29..212af20a 100644
--- a/tests/xhtml/TestChunkedXHTML.php
+++ b/phpdotnet/phd/TestGenericChunkedXHTML.php
@@ -1,7 +1,7 @@
 <?php
 namespace phpdotnet\phd;
 
-class TestChunkedXHTML extends Package_Generic_ChunkedXHTML {
+class TestGenericChunkedXHTML extends Package_Generic_ChunkedXHTML {
     public function update($event, $val = null) {
         switch($event) {
         case Render::CHUNK:
diff --git a/tests/php/TestBigXHTML.php b/phpdotnet/phd/TestPHPBigXHTML.php
similarity index 95%
rename from tests/php/TestBigXHTML.php
rename to phpdotnet/phd/TestPHPBigXHTML.php
index ce0eec56..1355dbf8 100644
--- a/tests/php/TestBigXHTML.php
+++ b/phpdotnet/phd/TestPHPBigXHTML.php
@@ -1,7 +1,7 @@
 <?php
 namespace phpdotnet\phd;
 
-class TestBigXHTML extends Package_PHP_BigXHTML {
+class TestPHPBigXHTML extends Package_PHP_BigXHTML {
     public function update($event, $val = null) {
         switch($event) {
         case Render::CHUNK:
@@ -40,5 +40,3 @@ public function appendData($data) {
     }
 
 }
-
-
diff --git a/tests/php/TestChunkedXHTML.php b/phpdotnet/phd/TestPHPChunkedXHTML.php
similarity index 93%
rename from tests/php/TestChunkedXHTML.php
rename to phpdotnet/phd/TestPHPChunkedXHTML.php
index e3dc16ec..ab1a9f66 100644
--- a/tests/php/TestChunkedXHTML.php
+++ b/phpdotnet/phd/TestPHPChunkedXHTML.php
@@ -1,7 +1,7 @@
 <?php
 namespace phpdotnet\phd;
 
-class TestChunkedXHTML extends Package_PHP_ChunkedXHTML {
+class TestPHPChunkedXHTML extends Package_PHP_ChunkedXHTML {
     public function update($event, $val = null) {
         switch($event) {
         case Render::CHUNK:
@@ -32,5 +32,3 @@ public function writeChunk($id, $fp) {
         echo "Content:" . $content . "\n";
     }
 }
-
-
diff --git a/phpdotnet/phd/TestRender.php b/phpdotnet/phd/TestRender.php
new file mode 100644
index 00000000..d026150b
--- /dev/null
+++ b/phpdotnet/phd/TestRender.php
@@ -0,0 +1,33 @@
+<?php
+namespace phpdotnet\phd;
+
+class TestRender extends Render {
+    public function __construct(
+        protected Reader $reader,
+        protected Config $config,
+        protected ?Format $format = null,
+        protected ?Index $index = null,
+    ) {}
+
+    public function run() {
+        if ($this->index && $this->index::requireIndexing()) {
+            if (!file_exists($this->config->output_dir())) {
+                mkdir($this->config->output_dir(), 0755);
+            }
+            $this->attach($this->index);
+            $this->reader->open($this->config->xml_file());
+            $this->execute($this->reader);
+            $this->detach($this->index);
+        }
+
+        if ($this->format !== null) {
+            $this->attach($this->format);
+            $this->reader->open($this->config->xml_file());
+            $this->execute($this->reader);
+        }
+    }
+
+    public function getIndex(): ?Index {
+        return $this->index;
+    }
+}
diff --git a/tests/TestRender.php b/tests/TestRender.php
deleted file mode 100644
index 6c74f8dc..00000000
--- a/tests/TestRender.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-namespace phpdotnet\phd;
-
-class TestRender {
-    protected $format;
-
-    public function __construct(
-        string $formatclass,
-        array $opts,
-        ?array $extra = [],
-        ?array $indices = []
-    ) {
-        foreach ($opts as $k => $v) {
-            $method = "set_$k";
-            Config::$method($v);
-        }
-        if (count($extra) != 0) {
-            Config::init($extra);
-        }
-        $classname = __NAMESPACE__ . "\\" . $formatclass;
-        $this->format = new $classname();
-
-        foreach ($indices as $index) {
-            $this->format->SQLiteIndex(
-                null, // $context,
-                null, // $index,
-                $index["docbook_id"] ?? "", // $id,
-                $index["filename"] ?? "", // $filename,
-                $index["parent_id"] ?? "", // $parent,
-                $index["sdesc"] ?? "", // $sdesc,
-                $index["ldesc"] ?? "", // $ldesc,
-                $index["element"] ?? "", // $element,
-                $index["previous"] ?? "", // $previous,
-                $index["next"] ?? "", // $next,
-                $index["chunk"] ?? 0, // $chunk
-            );
-        }
-    }
-
-    public function run() {
-        $reader = new Reader();
-        $render = new Render();
-        if (Index::requireIndexing()) {
-           $format = new Index;
-           $render->attach($format);
-           $reader->open(Config::xml_file());
-           $render->execute($reader);
-           $render->detach($format);
-        }
-        $render->attach($this->format);
-        $reader->open(Config::xml_file());
-        $render->execute($reader);
-    }
-}
-
-
diff --git a/tests/xhtml/001.phpt b/tests/package/generic/001.phpt
similarity index 66%
rename from tests/xhtml/001.phpt
rename to tests/package/generic/001.phpt
index 785c089a..0f80b0c6 100644
--- a/tests/xhtml/001.phpt
+++ b/tests/package/generic/001.phpt
@@ -4,30 +4,14 @@ CALS Table rendering
 <?php
 namespace phpdotnet\phd;
 
-require_once __DIR__ . "/../setup.php";
-require_once __DIR__ . "/TestChunkedXHTML.php";
+require_once __DIR__ . "/../../setup.php";
 
-$formatclass = "TestChunkedXHTML";
 $xml_file = __DIR__ . "/data/001-1.xml";
 
-$opts = array(
-    "index"             => true,
-    "xml_root"          => dirname($xml_file),
-    "xml_file"          => $xml_file,
-    "output_dir"        => __DIR__ . "/output/",
-);
+Config::init(["xml_file" => $xml_file]);
 
-$extra = array(
-    "lang_dir" => __PHDDIR__ . "phpdotnet/phd/data/langs/",
-    "phpweb_version_filename" => dirname($xml_file) . '/version.xml',
-    "phpweb_acronym_filename" => dirname($xml_file) . '/acronyms.xml',
-);
-
-$render = new TestRender($formatclass, $opts, $extra);
-
-if (Index::requireIndexing() && !file_exists($opts["output_dir"])) {
-    mkdir($opts["output_dir"], 0755);
-}
+$format = new TestGenericChunkedXHTML;
+$render = new TestRender(new Reader, new Config, $format);
 
 $render->run();
 ?>
diff --git a/tests/xhtml/002.phpt b/tests/package/generic/002.phpt
similarity index 85%
rename from tests/xhtml/002.phpt
rename to tests/package/generic/002.phpt
index 9483f1ab..b00e65d1 100644
--- a/tests/xhtml/002.phpt
+++ b/tests/package/generic/002.phpt
@@ -4,30 +4,14 @@ CALS Table rendering#002
 <?php
 namespace phpdotnet\phd;
 
-require_once __DIR__ . "/../setup.php";
-require_once __DIR__ . "/TestChunkedXHTML.php";
+require_once __DIR__ . "/../../setup.php";
 
-$formatclass = "TestChunkedXHTML";
 $xml_file = __DIR__ . "/data/002.xml";
 
-$opts = array(
-    "index"             => true,
-    "xml_root"          => dirname($xml_file),
-    "xml_file"          => $xml_file,
-    "output_dir"        => __DIR__ . "/output/",
-);
+Config::init(["xml_file" => $xml_file]);
 
-$extra = array(
-    "lang_dir" => __PHDDIR__ . "phpdotnet/phd/data/langs/",
-    "phpweb_version_filename" => dirname($xml_file) . '/version.xml',
-    "phpweb_acronym_filename" => dirname($xml_file) . '/acronyms.xml',
-);
-
-$render = new TestRender($formatclass, $opts, $extra);
-
-if (Index::requireIndexing() && !file_exists($opts["output_dir"])) {
-    mkdir($opts["output_dir"], 0755);
-}
+$format = new TestGenericChunkedXHTML;
+$render = new TestRender(new Reader, new Config, $format);
 
 $render->run();
 ?>
diff --git a/tests/xhtml/003.phpt b/tests/package/generic/003.phpt
similarity index 90%
rename from tests/xhtml/003.phpt
rename to tests/package/generic/003.phpt
index becab032..512c1e3e 100644
--- a/tests/xhtml/003.phpt
+++ b/tests/package/generic/003.phpt
@@ -4,30 +4,14 @@ CALS Table rendering#003
 <?php
 namespace phpdotnet\phd;
 
-require_once __DIR__ . "/../setup.php";
-require_once __DIR__ . "/TestChunkedXHTML.php";
+require_once __DIR__ . "/../../setup.php";
 
-$formatclass = "TestChunkedXHTML";
 $xml_file = __DIR__ . "/data/003.xml";
 
-$opts = array(
-    "index"             => true,
-    "xml_root"          => dirname($xml_file),
-    "xml_file"          => $xml_file,
-    "output_dir"        => __DIR__ . "/output/",
-);
+Config::init(["xml_file" => $xml_file]);
 
-$extra = array(
-    "lang_dir" => __PHDDIR__ . "phpdotnet/phd/data/langs/",
-    "phpweb_version_filename" => dirname($xml_file) . '/version.xml',
-    "phpweb_acronym_filename" => dirname($xml_file) . '/acronyms.xml',
-);
-
-$render = new TestRender($formatclass, $opts, $extra);
-
-if (Index::requireIndexing() && !file_exists($opts["output_dir"])) {
-    mkdir($opts["output_dir"], 0755);
-}
+$format = new TestGenericChunkedXHTML;
+$render = new TestRender(new Reader, new Config, $format);
 
 $render->run();
 ?>
diff --git a/tests/xhtml/data/001-1.xml b/tests/package/generic/data/001-1.xml
similarity index 100%
rename from tests/xhtml/data/001-1.xml
rename to tests/package/generic/data/001-1.xml
diff --git a/tests/xhtml/data/002.xml b/tests/package/generic/data/002.xml
similarity index 100%
rename from tests/xhtml/data/002.xml
rename to tests/package/generic/data/002.xml
diff --git a/tests/xhtml/data/003.xml b/tests/package/generic/data/003.xml
similarity index 100%
rename from tests/xhtml/data/003.xml
rename to tests/package/generic/data/003.xml
diff --git a/tests/xhtml/data/simplelist.xml b/tests/package/generic/data/simplelist.xml
similarity index 100%
rename from tests/xhtml/data/simplelist.xml
rename to tests/package/generic/data/simplelist.xml
diff --git a/tests/xhtml/data/whitespace_formatting_001.xml b/tests/package/generic/data/whitespace_formatting_001.xml
similarity index 100%
rename from tests/xhtml/data/whitespace_formatting_001.xml
rename to tests/package/generic/data/whitespace_formatting_001.xml
diff --git a/tests/xhtml/simplelist_001.phpt b/tests/package/generic/simplelist_001.phpt
similarity index 67%
rename from tests/xhtml/simplelist_001.phpt
rename to tests/package/generic/simplelist_001.phpt
index ad461a05..5be5acdb 100644
--- a/tests/xhtml/simplelist_001.phpt
+++ b/tests/package/generic/simplelist_001.phpt
@@ -4,30 +4,14 @@ Simplelist rendering 001 - Types and columns
 <?php
 namespace phpdotnet\phd;
 
-require_once __DIR__ . "/../setup.php";
-require_once __DIR__ . "/TestChunkedXHTML.php";
+require_once __DIR__ . "/../../setup.php";
 
-$formatclass = "TestChunkedXHTML";
 $xml_file = __DIR__ . "/data/simplelist.xml";
 
-$opts = array(
-    "index"             => true,
-    "xml_root"          => dirname($xml_file),
-    "xml_file"          => $xml_file,
-    "output_dir"        => __DIR__ . "/output/",
-);
+Config::init(["xml_file" => $xml_file]);
 
-$extra = array(
-    "lang_dir" => __PHDDIR__ . "phpdotnet/phd/data/langs/",
-    "phpweb_version_filename" => dirname($xml_file) . '/version.xml',
-    "phpweb_acronym_filename" => dirname($xml_file) . '/acronyms.xml',
-);
-
-$render = new TestRender($formatclass, $opts, $extra);
-
-if (Index::requireIndexing() && !file_exists($opts["output_dir"])) {
-    mkdir($opts["output_dir"], 0755);
-}
+$format = new TestGenericChunkedXHTML;
+$render = new TestRender(new Reader, new Config, $format);
 
 $render->run();
 ?>
diff --git a/tests/xhtml/whitespace_formatting_001.phpt b/tests/package/generic/whitespace_formatting_001.phpt
similarity index 80%
rename from tests/xhtml/whitespace_formatting_001.phpt
rename to tests/package/generic/whitespace_formatting_001.phpt
index 5c1aa1d6..8c698aca 100644
--- a/tests/xhtml/whitespace_formatting_001.phpt
+++ b/tests/package/generic/whitespace_formatting_001.phpt
@@ -4,30 +4,14 @@ Whitespace formatting 001
 <?php
 namespace phpdotnet\phd;
 
-require_once __DIR__ . "/../setup.php";
-require_once __DIR__ . "/TestChunkedXHTML.php";
+require_once __DIR__ . "/../../setup.php";
 
-$formatclass = "TestChunkedXHTML";
 $xml_file = __DIR__ . "/data/whitespace_formatting_001.xml";
 
-$opts = array(
-    "index"             => true,
-    "xml_root"          => dirname($xml_file),
-    "xml_file"          => $xml_file,
-    "output_dir"        => __DIR__ . "/output/",
-);
+Config::init(["xml_file" => $xml_file]);
 
-$extra = array(
-    "lang_dir" => __PHDDIR__ . "phpdotnet/phd/data/langs/",
-    "phpweb_version_filename" => dirname($xml_file) . '/version.xml',
-    "phpweb_acronym_filename" => dirname($xml_file) . '/acronyms.xml',
-);
-
-$render = new TestRender($formatclass, $opts, $extra);
-
-if (Index::requireIndexing() && !file_exists($opts["output_dir"])) {
-    mkdir($opts["output_dir"], 0755);
-}
+$format = new TestGenericChunkedXHTML;
+$render = new TestRender(new Reader, new Config, $format);
 
 $render->run();
 ?>
diff --git a/tests/php/bug49101-1.phpt b/tests/package/php/bug49101-1.phpt
similarity index 64%
rename from tests/php/bug49101-1.phpt
rename to tests/package/php/bug49101-1.phpt
index d1f3644d..b8330949 100644
--- a/tests/php/bug49101-1.phpt
+++ b/tests/package/php/bug49101-1.phpt
@@ -1,33 +1,17 @@
 --TEST--
-Bug #49101 - Thick border again
+Bug #49101-1 - Thick border again
 --FILE--
 <?php
 namespace phpdotnet\phd;
 
-require_once __DIR__ . "/../setup.php";
-require_once __DIR__ . "/TestChunkedXHTML.php";
+require_once __DIR__ . "/../../setup.php";
 
-$formatclass = "TestChunkedXHTML";
 $xml_file = __DIR__ . "/data/bug49101-1.xml";
 
-$opts = array(
-    "index"             => true,
-    "xml_root"          => dirname($xml_file),
-    "xml_file"          => $xml_file,
-    "output_dir"        => __DIR__ . "/output/",
-);
+Config::init(["xml_file" => $xml_file]);
 
-$extra = array(
-    "lang_dir" => __DIR__ . "/../../phpdotnet/phd/data/langs/",
-    "phpweb_version_filename" => dirname($xml_file) . '/version.xml',
-    "phpweb_acronym_filename" => dirname($xml_file) . '/acronyms.xml',
-);
-
-$render = new TestRender($formatclass, $opts, $extra);
-
-if (Index::requireIndexing() && !file_exists($opts["output_dir"])) {
-    mkdir($opts["output_dir"], 0755);
-}
+$format = new TestPHPChunkedXHTML;
+$render = new TestRender(new Reader, new Config, $format);
 
 $render->run();
 ?>
@@ -91,3 +75,5 @@ Content:
 
 
 </div>
+
+
diff --git a/tests/php/bug49101-2.phpt b/tests/package/php/bug49101-2.phpt
similarity index 68%
rename from tests/php/bug49101-2.phpt
rename to tests/package/php/bug49101-2.phpt
index 6d04d116..b44dd02c 100644
--- a/tests/php/bug49101-2.phpt
+++ b/tests/package/php/bug49101-2.phpt
@@ -1,33 +1,17 @@
 --TEST--
-Bug #49101 - Thick border again - Big XHTML
+Bug #49101-2 - Thick border again - Big XHTML
 --FILE--
 <?php
 namespace phpdotnet\phd;
 
-require_once __DIR__ . "/../setup.php";
-require_once __DIR__ . "/TestBigXHTML.php";
+require_once __DIR__ . "/../../setup.php";
 
-$formatclass = "TestBigXHTML";
 $xml_file = __DIR__ . "/data/bug49101-1.xml";
 
-$opts = array(
-    "index"             => true,
-    "xml_root"          => dirname($xml_file),
-    "xml_file"          => $xml_file,
-    "output_dir"        => __DIR__ . "/output/",
-);
+Config::init(["xml_file" => $xml_file]);
 
-$extra = array(
-    "lang_dir" => __DIR__ . "/../../phpdotnet/phd/data/langs/",
-    "phpweb_version_filename" => dirname($xml_file) . '/version.xml',
-    "phpweb_acronym_filename" => dirname($xml_file) . '/acronyms.xml',
-);
-
-$render = new TestRender($formatclass, $opts, $extra);
-
-if (Index::requireIndexing() && !file_exists($opts["output_dir"])) {
-    mkdir($opts["output_dir"], 0755);
-}
+$format = new TestPHPBigXHTML;
+$render = new TestRender(new Reader, new Config, $format);
 
 $render->run();
 ?>
diff --git a/tests/php/bug49102-1.phpt b/tests/package/php/bug49102-1.phpt
similarity index 83%
rename from tests/php/bug49102-1.phpt
rename to tests/package/php/bug49102-1.phpt
index dd3f7902..8b1f032d 100644
--- a/tests/php/bug49102-1.phpt
+++ b/tests/package/php/bug49102-1.phpt
@@ -4,33 +4,16 @@ Bug #49102 - Class reference pages don't normalize the methodnames in PhD trunk/
 <?php
 namespace phpdotnet\phd;
 
-require_once __DIR__ . "/../setup.php";
-require_once __DIR__ . "/TestChunkedXHTML.php";
+require_once __DIR__ . "/../../setup.php";
 
-$formatclass = "TestChunkedXHTML";
 $xml_file = __DIR__ . "/data/bug49102-1.xml";
 
-$opts = array(
-    "index"             => true,
-    "xml_root"          => dirname($xml_file),
-    "xml_file"          => $xml_file,
-    "output_dir"        => __DIR__ . "/output/",
-    'language'          => 'en'
-);
+Config::init(["xml_file"          => $xml_file]);
 
-$extra = array(
-    "lang_dir" => __DIR__ . "/../../phpdotnet/phd/data/langs/",
-    "phpweb_version_filename" => dirname($xml_file) . '/version.xml',
-    "phpweb_acronym_filename" => dirname($xml_file) . '/acronyms.xml',
-);
+$format = new TestPHPChunkedXHTML;
+$render = new TestRender(new Reader, new Config, $format);
 
-$test = new TestRender($formatclass, $opts, $extra);
-
-if (Index::requireIndexing() && !file_exists($opts["output_dir"])) {
-    mkdir($opts["output_dir"], 0755);
-}
-
-$test->run();
+$render->run();
 ?>
 
 --EXPECTF--
diff --git a/tests/package/php/bug_doc-en_GH-3179.phpt b/tests/package/php/bug_doc-en_GH-3179.phpt
new file mode 100644
index 00000000..68cdef2a
--- /dev/null
+++ b/tests/package/php/bug_doc-en_GH-3179.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Bug doc-en GH-3197
+--FILE--
+<?php
+namespace phpdotnet\phd;
+
+require_once __DIR__ . "/../../setup.php";
+
+$xml_file = __DIR__ . "/data/bug_doc-en_GH-3197.xml";
+
+Config::init(["xml_file" => $xml_file]);
+
+$format = new TestPHPChunkedXHTML;
+$render = new TestRender(new Reader, new Config, $format);
+
+$render->run();
+?>
+--EXPECT--
+Filename: bug_doc-en_GH-3179.html
+Content:
+<div id="bug_doc-en_GH-3179" class="refentry">
+ <div class="refsect1 unknown-1" id="refsect1-bug_doc-en_GH-3179-unknown-1">
+  <div class="methodsynopsis dc-description"><span class="methodname"><strong>method_name</strong></span>(): <span class="type"><a href="language.types.void.html" class="type void">void</a></span></div>
+
+ </div>
+
+</div>
diff --git a/tests/php/constant_links_001.phpt b/tests/package/php/constant_links_001.phpt
similarity index 61%
rename from tests/php/constant_links_001.phpt
rename to tests/package/php/constant_links_001.phpt
index 15604229..6e40f8b9 100644
--- a/tests/php/constant_links_001.phpt
+++ b/tests/package/php/constant_links_001.phpt
@@ -4,26 +4,13 @@ Constant links 001
 <?php
 namespace phpdotnet\phd;
 
-require_once __DIR__ . "/../setup.php";
-require_once __DIR__ . "/TestChunkedXHTML.php";
+require_once __DIR__ . "/../../setup.php";
 
-$formatclass = "TestChunkedXHTML";
 $xml_file = __DIR__ . "/data/constant_links.xml";
 
-$opts = array(
-    "index"             => true,
-    "xml_root"          => dirname($xml_file),
-    "xml_file"          => $xml_file,
-    "output_dir"        => __DIR__ . "/output/",
-);
+Config::init(["xml_file" => $xml_file]);
 
-$extra = array(
-    "lang_dir" => __PHDDIR__ . "phpdotnet/phd/data/langs/",
-    "phpweb_version_filename" => dirname($xml_file) . '/version.xml',
-    "phpweb_acronym_filename" => dirname($xml_file) . '/acronyms.xml',
-);
-
-$indeces = [
+$indices = [
     [
         "docbook_id" => "constant.definitely-exists",
         "filename"   => "extensionname.constantspage",
@@ -34,12 +21,26 @@ $indeces = [
     ],
 ];
 
-$render = new TestRender($formatclass, $opts, $extra, $indeces);
+$format = new TestPHPChunkedXHTML;
 
-if (Index::requireIndexing() && !file_exists($opts["output_dir"])) {
-    mkdir($opts["output_dir"], 0755);
+foreach ($indices as $index) {
+    $format->SQLiteIndex(
+        null, // $context,
+        null, // $index,
+        $index["docbook_id"] ?? "", // $id,
+        $index["filename"] ?? "", // $filename,
+        $index["parent_id"] ?? "", // $parent,
+        $index["sdesc"] ?? "", // $sdesc,
+        $index["ldesc"] ?? "", // $ldesc,
+        $index["element"] ?? "", // $element,
+        $index["previous"] ?? "", // $previous,
+        $index["next"] ?? "", // $next,
+        $index["chunk"] ?? 0, // $chunk
+    );
 }
 
+$render = new TestRender(new Reader, new Config, $format);
+
 $render->run();
 ?>
 --EXPECTF--
diff --git a/tests/php/data/acronyms.xml b/tests/package/php/data/acronyms.xml
similarity index 100%
rename from tests/php/data/acronyms.xml
rename to tests/package/php/data/acronyms.xml
diff --git a/tests/php/data/bug49101-1.xml b/tests/package/php/data/bug49101-1.xml
similarity index 100%
rename from tests/php/data/bug49101-1.xml
rename to tests/package/php/data/bug49101-1.xml
diff --git a/tests/php/data/bug49102-1.xml b/tests/package/php/data/bug49102-1.xml
similarity index 100%
rename from tests/php/data/bug49102-1.xml
rename to tests/package/php/data/bug49102-1.xml
diff --git a/tests/php/data/bug_doc-en_GH-3197.xml b/tests/package/php/data/bug_doc-en_GH-3197.xml
similarity index 100%
rename from tests/php/data/bug_doc-en_GH-3197.xml
rename to tests/package/php/data/bug_doc-en_GH-3197.xml
diff --git a/tests/php/data/constant_links.xml b/tests/package/php/data/constant_links.xml
similarity index 100%
rename from tests/php/data/constant_links.xml
rename to tests/package/php/data/constant_links.xml
diff --git a/tests/php/data/faq001.xml b/tests/package/php/data/faq001.xml
similarity index 100%
rename from tests/php/data/faq001.xml
rename to tests/package/php/data/faq001.xml
diff --git a/tests/php/data/type_rendering_constructorsynopsis_parameters-and-return-type.xml b/tests/package/php/data/type_rendering_constructorsynopsis_parameters-and-return-type.xml
similarity index 100%
rename from tests/php/data/type_rendering_constructorsynopsis_parameters-and-return-type.xml
rename to tests/package/php/data/type_rendering_constructorsynopsis_parameters-and-return-type.xml
diff --git a/tests/php/data/type_rendering_methodsynopsis_parameters.xml b/tests/package/php/data/type_rendering_methodsynopsis_parameters.xml
similarity index 100%
rename from tests/php/data/type_rendering_methodsynopsis_parameters.xml
rename to tests/package/php/data/type_rendering_methodsynopsis_parameters.xml
diff --git a/tests/php/data/type_rendering_methodsynopsis_return_types.xml b/tests/package/php/data/type_rendering_methodsynopsis_return_types.xml
similarity index 100%
rename from tests/php/data/type_rendering_methodsynopsis_return_types.xml
rename to tests/package/php/data/type_rendering_methodsynopsis_return_types.xml
diff --git a/tests/php/data/variablelist_rendering_001.xml b/tests/package/php/data/variablelist_rendering_001.xml
similarity index 100%
rename from tests/php/data/variablelist_rendering_001.xml
rename to tests/package/php/data/variablelist_rendering_001.xml
diff --git a/tests/php/data/version.xml b/tests/package/php/data/version.xml
similarity index 100%
rename from tests/php/data/version.xml
rename to tests/package/php/data/version.xml
diff --git a/tests/php/faq001.phpt b/tests/package/php/faq001.phpt
similarity index 73%
rename from tests/php/faq001.phpt
rename to tests/package/php/faq001.phpt
index f05f444b..5f221630 100644
--- a/tests/php/faq001.phpt
+++ b/tests/package/php/faq001.phpt
@@ -4,30 +4,14 @@ Testing a simple FAQ
 <?php
 namespace phpdotnet\phd;
 
-require_once __DIR__ . "/../setup.php";
-require_once __DIR__ . "/TestChunkedXHTML.php";
+require_once __DIR__ . "/../../setup.php";
 
-$formatclass = "TestChunkedXHTML";
 $xml_file = __DIR__ . "/data/faq001.xml";
 
-$opts = array(
-    "index"             => false,
-    "xml_root"          => dirname($xml_file),
-    "xml_file"          => $xml_file,
-    "output_dir"        => __DIR__ . "/output/",
-);
+Config::init(["xml_file" => $xml_file]);
 
-$extra = array(
-    "lang_dir" => __DIR__ . "/../../phpdotnet/phd/data/langs/",
-    "phpweb_version_filename" => dirname($xml_file) . '/version.xml',
-    "phpweb_acronym_filename" => dirname($xml_file) . '/acronyms.xml',
-);
-
-$render = new TestRender($formatclass, $opts, $extra);
-
-if (Index::requireIndexing() && !file_exists($opts["output_dir"])) {
-    mkdir($opts["output_dir"], 0755);
-}
+$format = new TestPHPChunkedXHTML;
+$render = new TestRender(new Reader, new Config, $format);
 
 $render->run();
 ?>
diff --git a/tests/php/type_rendering_001.phpt b/tests/package/php/type_rendering_001.phpt
similarity index 83%
rename from tests/php/type_rendering_001.phpt
rename to tests/package/php/type_rendering_001.phpt
index 7cf4f28d..ed29ea18 100644
--- a/tests/php/type_rendering_001.phpt
+++ b/tests/package/php/type_rendering_001.phpt
@@ -4,30 +4,14 @@ Type rendering 001 - Methodsynopsis return types
 <?php
 namespace phpdotnet\phd;
 
-require_once __DIR__ . "/../setup.php";
-require_once __DIR__ . "/TestChunkedXHTML.php";
+require_once __DIR__ . "/../../setup.php";
 
-$formatclass = "TestChunkedXHTML";
 $xml_file = __DIR__ . "/data/type_rendering_methodsynopsis_return_types.xml";
 
-$opts = array(
-    "index"             => true,
-    "xml_root"          => dirname($xml_file),
-    "xml_file"          => $xml_file,
-    "output_dir"        => __DIR__ . "/output/",
-);
+Config::init(["xml_file" => $xml_file]);
 
-$extra = array(
-    "lang_dir" => __PHDDIR__ . "phpdotnet/phd/data/langs/",
-    "phpweb_version_filename" => dirname($xml_file) . '/version.xml',
-    "phpweb_acronym_filename" => dirname($xml_file) . '/acronyms.xml',
-);
-
-$render = new TestRender($formatclass, $opts, $extra);
-
-if (Index::requireIndexing() && !file_exists($opts["output_dir"])) {
-    mkdir($opts["output_dir"], 0755);
-}
+$format = new TestPHPChunkedXHTML;
+$render = new TestRender(new Reader, new Config, $format);
 
 $render->run();
 ?>
diff --git a/tests/php/type_rendering_002.phpt b/tests/package/php/type_rendering_002.phpt
similarity index 88%
rename from tests/php/type_rendering_002.phpt
rename to tests/package/php/type_rendering_002.phpt
index 6309b11f..d1a51531 100644
--- a/tests/php/type_rendering_002.phpt
+++ b/tests/package/php/type_rendering_002.phpt
@@ -4,30 +4,14 @@ Type rendering 002 - Methodsynopsis parameters and parameter types
 <?php
 namespace phpdotnet\phd;
 
-require_once __DIR__ . "/../setup.php";
-require_once __DIR__ . "/TestChunkedXHTML.php";
+require_once __DIR__ . "/../../setup.php";
 
-$formatclass = "TestChunkedXHTML";
 $xml_file = __DIR__ . "/data/type_rendering_methodsynopsis_parameters.xml";
 
-$opts = array(
-    "index"             => true,
-    "xml_root"          => dirname($xml_file),
-    "xml_file"          => $xml_file,
-    "output_dir"        => __DIR__ . "/output/",
-);
+Config::init(["xml_file" => $xml_file]);
 
-$extra = array(
-    "lang_dir" => __PHDDIR__ . "phpdotnet/phd/data/langs/",
-    "phpweb_version_filename" => dirname($xml_file) . '/version.xml',
-    "phpweb_acronym_filename" => dirname($xml_file) . '/acronyms.xml',
-);
-
-$render = new TestRender($formatclass, $opts, $extra);
-
-if (Index::requireIndexing() && !file_exists($opts["output_dir"])) {
-    mkdir($opts["output_dir"], 0755);
-}
+$format = new TestPHPChunkedXHTML;
+$render = new TestRender(new Reader, new Config, $format);
 
 $render->run();
 ?>
diff --git a/tests/php/type_rendering_003.phpt b/tests/package/php/type_rendering_003.phpt
similarity index 90%
rename from tests/php/type_rendering_003.phpt
rename to tests/package/php/type_rendering_003.phpt
index 88042837..d4467856 100644
--- a/tests/php/type_rendering_003.phpt
+++ b/tests/package/php/type_rendering_003.phpt
@@ -4,30 +4,14 @@ Type rendering 003 - Constructorsynopsis parameters and parameter types
 <?php
 namespace phpdotnet\phd;
 
-require_once __DIR__ . "/../setup.php";
-require_once __DIR__ . "/TestChunkedXHTML.php";
+require_once __DIR__ . "/../../setup.php";
 
-$formatclass = "TestChunkedXHTML";
 $xml_file = __DIR__ . "/data/type_rendering_constructorsynopsis_parameters-and-return-type.xml";
 
-$opts = array(
-    "index"             => true,
-    "xml_root"          => dirname($xml_file),
-    "xml_file"          => $xml_file,
-    "output_dir"        => __DIR__ . "/output/",
-);
+Config::init(["xml_file" => $xml_file]);
 
-$extra = array(
-    "lang_dir" => __PHDDIR__ . "phpdotnet/phd/data/langs/",
-    "phpweb_version_filename" => dirname($xml_file) . '/version.xml',
-    "phpweb_acronym_filename" => dirname($xml_file) . '/acronyms.xml',
-);
-
-$render = new TestRender($formatclass, $opts, $extra);
-
-if (Index::requireIndexing() && !file_exists($opts["output_dir"])) {
-    mkdir($opts["output_dir"], 0755);
-}
+$format = new TestPHPChunkedXHTML;
+$render = new TestRender(new Reader, new Config, $format);
 
 $render->run();
 ?>
diff --git a/tests/php/variablelist_rendering_001.phpt b/tests/package/php/variablelist_rendering_001.phpt
similarity index 66%
rename from tests/php/variablelist_rendering_001.phpt
rename to tests/package/php/variablelist_rendering_001.phpt
index 5855f264..b5fece9e 100644
--- a/tests/php/variablelist_rendering_001.phpt
+++ b/tests/package/php/variablelist_rendering_001.phpt
@@ -4,30 +4,14 @@ Variablelist rendering 001
 <?php
 namespace phpdotnet\phd;
 
-require_once __DIR__ . "/../setup.php";
-require_once __DIR__ . "/TestChunkedXHTML.php";
+require_once __DIR__ . "/../../setup.php";
 
-$formatclass = "TestChunkedXHTML";
 $xml_file = __DIR__ . "/data/variablelist_rendering_001.xml";
 
-$opts = array(
-    "index"             => true,
-    "xml_root"          => dirname($xml_file),
-    "xml_file"          => $xml_file,
-    "output_dir"        => __DIR__ . "/output/",
-);
+Config::init(["xml_file" => $xml_file]);
 
-$extra = array(
-    "lang_dir" => __PHDDIR__ . "phpdotnet/phd/data/langs/",
-    "phpweb_version_filename" => dirname($xml_file) . '/version.xml',
-    "phpweb_acronym_filename" => dirname($xml_file) . '/acronyms.xml',
-);
-
-$render = new TestRender($formatclass, $opts, $extra);
-
-if (Index::requireIndexing() && !file_exists($opts["output_dir"])) {
-    mkdir($opts["output_dir"], 0755);
-}
+$format = new TestPHPChunkedXHTML;
+$render = new TestRender(new Reader, new Config, $format);
 
 $render->run();
 ?>
diff --git a/tests/php/bug_doc-en_GH-3179.phpt b/tests/php/bug_doc-en_GH-3179.phpt
deleted file mode 100644
index 41ed0478..00000000
--- a/tests/php/bug_doc-en_GH-3179.phpt
+++ /dev/null
@@ -1,43 +0,0 @@
---TEST--
-Bug doc-en GH-3197
---FILE--
-<?php
-namespace phpdotnet\phd;
-
-require_once __DIR__ . "/../setup.php";
-require_once __DIR__ . "/TestChunkedXHTML.php";
-
-$formatclass = "TestChunkedXHTML";
-$xml_file = __DIR__ . "/data/bug_doc-en_GH-3197.xml";
-
-$opts = array(
-    "index"             => true,
-    "xml_root"          => dirname($xml_file),
-    "xml_file"          => $xml_file,
-    "output_dir"        => __DIR__ . "/output/",
-);
-
-$extra = array(
-    "lang_dir" => __PHDDIR__ . "phpdotnet/phd/data/langs/",
-    "phpweb_version_filename" => dirname($xml_file) . '/version.xml',
-    "phpweb_acronym_filename" => dirname($xml_file) . '/acronyms.xml',
-);
-
-$render = new TestRender($formatclass, $opts, $extra);
-
-if (Index::requireIndexing() && !file_exists($opts["output_dir"])) {
-    mkdir($opts["output_dir"], 0755);
-}
-
-$render->run();
-?>
---EXPECT--
-Filename: bug_doc-en_GH-3179.html
-Content:
-<div id="bug_doc-en_GH-3179" class="refentry">
- <div class="refsect1 unknown-1" id="refsect1-bug_doc-en_GH-3179-unknown-1">
-  <div class="methodsynopsis dc-description"><span class="methodname"><strong>method_name</strong></span>(): <span class="type"><a href="language.types.void.html" class="type void">void</a></span></div>
-
- </div>
-
-</div>
diff --git a/tests/setup.php b/tests/setup.php
index b5612000..ea392add 100644
--- a/tests/setup.php
+++ b/tests/setup.php
@@ -5,19 +5,13 @@
 define("__INSTALLDIR__", "@php_dir@" == "@"."php_dir@" ? dirname(dirname(__DIR__)) : "@php_dir@");
 
 require_once __PHDDIR__ . "phpdotnet" . DIRECTORY_SEPARATOR . "phd" . DIRECTORY_SEPARATOR . "Autoloader.php";
-require_once __PHDDIR__ . "phpdotnet" . DIRECTORY_SEPARATOR . "phd" . DIRECTORY_SEPARATOR . "functions.php";
-require_once __PHDDIR__ . "tests" . DIRECTORY_SEPARATOR . "TestRender.php";
-
 spl_autoload_register(["phpdotnet\\phd\\Autoloader", "autoload"]);
 
+require_once __PHDDIR__ . "phpdotnet" . DIRECTORY_SEPARATOR . "phd" . DIRECTORY_SEPARATOR . "functions.php";
+
 Config::init([
-    "lang_dir"  => __PHDDIR__ . DIRECTORY_SEPARATOR . "phpdotnet" . DIRECTORY_SEPARATOR
-                    . "phd" . DIRECTORY_SEPARATOR . "data" . DIRECTORY_SEPARATOR
-                    . "langs" . DIRECTORY_SEPARATOR,
-    "phpweb_version_filename" => Config::xml_root() . DIRECTORY_SEPARATOR . 'version.xml',
-    "phpweb_acronym_filename" => Config::xml_root() . DIRECTORY_SEPARATOR . 'entities' . DIRECTORY_SEPARATOR . 'acronyms.xml',
-    "phpweb_sources_filename" => Config::xml_root() . DIRECTORY_SEPARATOR . 'sources.xml',
+    "lang_dir"  => __DIR__ . DIRECTORY_SEPARATOR . ".." . DIRECTORY_SEPARATOR
+                    . "phpdotnet" . DIRECTORY_SEPARATOR . "phd" . DIRECTORY_SEPARATOR
+                    . "data" . DIRECTORY_SEPARATOR . "langs" . DIRECTORY_SEPARATOR,
     "package_dirs" => [__PHDDIR__, __INSTALLDIR__],
 ]);
-
-