diff --git a/src/test/php/scriptlet/unittest/PreferenceTest.class.php b/src/test/php/scriptlet/unittest/PreferenceTest.class.php
index c1f6b9cd..b55407ff 100755
--- a/src/test/php/scriptlet/unittest/PreferenceTest.class.php
+++ b/src/test/php/scriptlet/unittest/PreferenceTest.class.php
@@ -1,278 +1,188 @@
 <?php namespace scriptlet\unittest;
 
-use unittest\TestCase;
 use scriptlet\Preference;
 
-
 /**
  * TestCase
  *
  * @see   http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html
  * @see   xp://scriptlet.Preference
  */
-class PreferenceTest extends TestCase {
+class PreferenceTest extends \unittest\TestCase {
 
-  /**
-   * Test constructor
-   *
-   */
   #[@test]
   public function create_with_single_preference() {
     $this->assertEquals(
-      create(new Preference(array('text/xml'))),
-      create(new Preference('text/xml'))
+      (new Preference(array('text/xml'))),
+      (new Preference('text/xml'))
     );
   }
 
-  /**
-   * Test constructor
-   *
-   */
   #[@test]
   public function create_with_multiple_preferences() {
     $this->assertEquals(
-      create(new Preference(array('text/xml', 'text/plain'))),
-      create(new Preference('text/xml,text/plain'))
+      (new Preference(array('text/xml', 'text/plain'))),
+      (new Preference('text/xml,text/plain'))
     );
   }
 
-  /**
-   * Test constructor
-   *
-   */
   #[@test]
   public function create_with_multiple_preferences_and_qvalues() {
     $this->assertEquals(
-      create(new Preference(array('text/xml;q=1.0', 'text/plain;q=0.9'))),
-      create(new Preference('text/xml;q=1.0,text/plain;q=0.9'))
+      (new Preference(array('text/xml;q=1.0', 'text/plain;q=0.9'))),
+      (new Preference('text/xml;q=1.0,text/plain;q=0.9'))
     );
   }
 
-  /**
-   * Test constructor
-   *
-   */
   #[@test]
   public function create_with_multiple_preferences_and_qvalues_reordered() {
     $this->assertEquals(
-      create(new Preference(array('text/xml;q=1.0', 'text/plain;q=0.9'))),
-      create(new Preference('text/plain;q=0.9,text/xml;q=1.0'))
+      (new Preference(array('text/xml;q=1.0', 'text/plain;q=0.9'))),
+      (new Preference('text/plain;q=0.9,text/xml;q=1.0'))
     );
   }
 
-  /**
-   * Test all()
-   *
-   */
   #[@test]
   public function single_preference() {
     $this->assertEquals(
       array('text/xml'), 
-      create(new Preference('text/xml'))->all()
+      (new Preference('text/xml'))->all()
     );
   }
 
-  /**
-   * Test all()
-   *
-   */
   #[@test]
   public function preferences_separated_by_comma() {
     $this->assertEquals(
       array('text/xml', 'text/plain'), 
-      create(new Preference('text/xml,text/plain'))->all()
+      (new Preference('text/xml,text/plain'))->all()
     );
   }
 
-  /**
-   * Test all()
-   *
-   */
   #[@test]
   public function preferences_separated_by_comma_and_space() {
     $this->assertEquals(
       array('text/xml', 'text/plain'), 
-      create(new Preference('text/xml, text/plain'))->all()
+      (new Preference('text/xml, text/plain'))->all()
     );
   }
 
-  /**
-   * Test all()
-   *
-   */
   #[@test]
   public function preferences_with_qvalues() {
     $this->assertEquals(
       array('text/xml', 'text/plain'), 
-      create(new Preference('text/xml;q=1.0, text/plain;q=0.9'))->all()
+      (new Preference('text/xml;q=1.0, text/plain;q=0.9'))->all()
     );
   }
 
-  /**
-   * Test all()
-   *
-   */
   #[@test]
   public function preferences_with_qvalues_and_spaces() {
     $this->assertEquals(
       array('text/xml', 'text/plain'), 
-      create(new Preference('text/xml; q=1.0, text/plain; q=0.9'))->all()
+      (new Preference('text/xml; q=1.0, text/plain; q=0.9'))->all()
     );
   }
 
-  /**
-   * Test all()
-   *
-   */
   #[@test]
   public function preferences_reordered() {
     $this->assertEquals(
       array('text/plain', 'text/xml'), 
-      create(new Preference('text/xml;q=0.9, text/plain;q=1.0'))->all()
+      (new Preference('text/xml;q=0.9, text/plain;q=1.0'))->all()
     );
   }
 
-  /**
-   * Test all()
-   *
-   */
   #[@test]
   public function rfc2616_more_specific_ranges_override() {
     $this->assertEquals(
       array('text/html;level=1', 'text/html', 'text/*', '*/*'), 
-      create(new Preference('text/*, text/html, text/html;level=1, */*'))->all()
+      (new Preference('text/*, text/html, text/html;level=1, */*'))->all()
     );
   }
 
-  /**
-   * Test match()
-   *
-   */
   #[@test]
   public function preference_exactly_matching_supported() {
     $this->assertEquals(
       'text/xml', 
-      create(new Preference('text/xml'))->match(array('text/xml'))
+      (new Preference('text/xml'))->match(array('text/xml'))
     );
   }
 
-  /**
-   * Test match()
-   *
-   */
   #[@test]
   public function preference_matching_one_of_supported() {
     $this->assertEquals(
       'text/plain', 
-      create(new Preference('text/plain'))->match(array('text/xml', 'text/html', 'text/plain'))
+      (new Preference('text/plain'))->match(array('text/xml', 'text/html', 'text/plain'))
     );
   }
 
-  /**
-   * Test match()
-   *
-   */
   #[@test]
   public function best_preference_matching_one_of_supported() {
     $this->assertEquals(
       'text/html', 
-      create(new Preference('text/plain;q=0.9, text/html'))->match(array('text/xml', 'text/html', 'text/plain'))
+      (new Preference('text/plain;q=0.9, text/html'))->match(array('text/xml', 'text/html', 'text/plain'))
     );
   }
 
-  /**
-   * Test match()
-   *
-   */
   #[@test]
   public function first_preference_matching_one_of_supported() {
     $this->assertEquals(
       'text/plain', 
-      create(new Preference('text/plain, text/html'))->match(array('text/xml', 'text/html', 'text/plain'))
+      (new Preference('text/plain, text/html'))->match(array('text/xml', 'text/html', 'text/plain'))
     );
   }
 
-  /**
-   * Test match()
-   *
-   */
   #[@test]
   public function text_any_matching_one_of_supported() {
     $this->assertEquals(
       'text/html', 
-      create(new Preference('text/*'))->match(array('application/xml', 'text/html', 'text/plain'))
+      (new Preference('text/*'))->match(array('application/xml', 'text/html', 'text/plain'))
     );
   }
 
-  /**
-   * Test match()
-   *
-   */
   #[@test]
   public function text_any_matching_first_of_supported() {
     $this->assertEquals(
       'text/plain', 
-      create(new Preference('text/*'))->match(array('text/plain', 'text/html'))
+      (new Preference('text/*'))->match(array('text/plain', 'text/html'))
     );
   }
 
-  /**
-   * Test match()
-   *
-   */
   #[@test]
   public function any_any_matches_first_of_supported() {
     $this->assertEquals(
       'application/xml', 
-      create(new Preference('*/*'))->match(array('application/xml', 'text/html', 'text/plain'))
+      (new Preference('*/*'))->match(array('application/xml', 'text/html', 'text/plain'))
     );
   }
 
-  /**
-   * Test match()
-   *
-   */
   #[@test]
   public function application_any_matches_first_of_supported() {
     $this->assertEquals(
       'application/xml', 
-      create(new Preference('*/*;q=0.1; application/*'))->match(array('application/xml', 'text/html', 'text/plain'))
+      (new Preference('*/*;q=0.1; application/*'))->match(array('application/xml', 'text/html', 'text/plain'))
     );
   }
 
-  /**
-   * Test match()
-   *
-   */
   #[@test]
   public function ie9_default_accept_match_html_vs_plaintext() {
     $this->assertEquals(
       'text/html', 
-      create(new Preference('text/html, application/xhtml+xml, */*'))->match(array('text/plain', 'text/html'))
+      (new Preference('text/html, application/xhtml+xml, */*'))->match(array('text/plain', 'text/html'))
     );
   }
 
-  /**
-   * Test match()
-   *
-   */
   #[@test]
   public function ff11_default_accept_match_html_vs_plaintext() {
     $this->assertEquals(
       'text/html', 
-      create(new Preference('text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'))->match(array('text/plain', 'text/html'))
+      (new Preference('text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'))->match(array('text/plain', 'text/html'))
     );
   }
 
-  /**
-   * Test match()
-   *
-   */
   #[@test]
   public function chrome_21_default_accept_match_html_vs_plaintext() {
     $this->assertEquals(
       'text/html', 
-      create(new Preference('text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'))->match(array('text/plain', 'text/html'))
+      (new Preference('text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'))->match(array('text/plain', 'text/html'))
     );
   }
 
@@ -285,126 +195,86 @@ public function chrome_21_default_accept_match_html_vs_plaintext() {
   public function wikipedia_example_match_html_vs_plaintext() {
     $this->assertEquals(
       'text/html', 
-      create(new Preference('text/html; q=1.0, text/*; q=0.8, image/gif; q=0.6, image/jpeg; q=0.6, image/*; q=0.5, */*; q=0.1
+      (new Preference('text/html; q=1.0, text/*; q=0.8, image/gif; q=0.6, image/jpeg; q=0.6, image/*; q=0.5, */*; q=0.1
 '))->match(array('text/plain', 'text/html'))
     );
   }
 
-  /**
-   * Test match()
-   *
-   */
   #[@test]
   public function application_json_not_supported() {
     $this->assertNull(
-      create(new Preference('application/json'))->match(array('text/html', 'text/plain'))
+      (new Preference('application/json'))->match(array('text/html', 'text/plain'))
     );
   }
 
-  /**
-   * Test match()
-   *
-   */
   #[@test]
   public function application_any_not_supported() {
     $this->assertNull(
-      create(new Preference('application/*'))->match(array('text/html', 'text/plain'))
+      (new Preference('application/*'))->match(array('text/html', 'text/plain'))
     );
   }
 
-  /**
-   * Test toString()
-   *
-   */
   #[@test]
   public function single_preference_string() {
     $this->assertEquals(
       'scriptlet.Preference<text/xml>',
-      create(new Preference('text/xml'))->toString()
+      (new Preference('text/xml'))->toString()
     );
   }
 
-  /**
-   * Test toString()
-   *
-   */
   #[@test]
   public function preferences_string() {
     $this->assertEquals(
       'scriptlet.Preference<text/xml, text/html>',
-      create(new Preference('text/xml, text/html'))->toString()
+      (new Preference('text/xml, text/html'))->toString()
     );
   }
 
-  /**
-   * Test toString()
-   *
-   */
   #[@test]
   public function preferences_with_qvalue_string() {
     $this->assertEquals(
       'scriptlet.Preference<text/xml, text/html;q=0.8>',
-      create(new Preference('text/xml, text/html;q=0.8'))->toString()
+      (new Preference('text/xml, text/html;q=0.8'))->toString()
     );
   }
 
-  /**
-   * Test toString()
-   *
-   */
   #[@test]
   public function one_point_zero_qvalue_omitted_in_string() {
     $this->assertEquals(
       'scriptlet.Preference<text/xml, text/html;q=0.8>',
-      create(new Preference('text/xml;q=1.0, text/html;q=0.8'))->toString()
+      (new Preference('text/xml;q=1.0, text/html;q=0.8'))->toString()
     );
   }
 
-  /**
-   * Test qualityOf()
-   *
-   */
   #[@test]
   public function quality_of_xml() {
     $this->assertEquals(
       1.0,
-      create(new Preference('text/xml;q=1.0, text/html;q=0.8'))->qualityOf('text/xml')
+      (new Preference('text/xml;q=1.0, text/html;q=0.8'))->qualityOf('text/xml')
     );
   }
 
-  /**
-   * Test qualityOf()
-   *
-   */
   #[@test]
   public function quality_of_html() {
     $this->assertEquals(
       0.8,
-      create(new Preference('text/xml;q=1.0, text/html;q=0.8'))->qualityOf('text/html')
+      (new Preference('text/xml;q=1.0, text/html;q=0.8'))->qualityOf('text/html')
     );
   }
 
-  /**
-   * Test qualityOf()
-   *
-   */
   #[@test]
   public function quality_of_plain() {
     $this->assertEquals(
       1.0,
-      create(new Preference('text/xml, text/plain'))->qualityOf('text/plain')
+      (new Preference('text/xml, text/plain'))->qualityOf('text/plain')
     );
   }
 
-  /**
-   * Test qualityOf()
-   *
-   */
   #[@test]
   public function quality_of_plain_with_asterisk() {
     $this->assertEquals(
       0.99999,
-      create(new Preference('text/*'))->qualityOf('text/plain', 6)
+      (new Preference('text/*'))->qualityOf('text/plain', 6)
     );
   }
 }
diff --git a/src/test/php/scriptlet/unittest/RunnerTest.class.php b/src/test/php/scriptlet/unittest/RunnerTest.class.php
index 7b35957e..2e4315db 100755
--- a/src/test/php/scriptlet/unittest/RunnerTest.class.php
+++ b/src/test/php/scriptlet/unittest/RunnerTest.class.php
@@ -47,11 +47,11 @@ public function doGet($request, $response) {
     self::$xmlScriptlet= \lang\ClassLoader::defineClass('XmlScriptletImpl', 'scriptlet.xml.XMLScriptlet', array(), '{
       protected function _response() {
         $res= parent::_response();
-        $stylesheet= create(new \xml\Stylesheet())
+        $stylesheet= (new \xml\Stylesheet())
           ->withEncoding("iso-8859-1")
           ->withOutputMethod("xml")
-          ->withTemplate(create(new \xml\XslTemplate())->matching("/")
-            ->withChild(create(new \xml\Node("h1"))
+          ->withTemplate((new \xml\XslTemplate())->matching("/")
+            ->withChild((new \xml\Node("h1"))
               ->withChild(new \xml\Node("xsl:value-of", NULL, array("select" => "/formresult/result")))
             )
           )
@@ -122,7 +122,7 @@ protected function newRunner($profile= null) {
     $r= new Runner('/var/www', $profile);
     
     // The debug application
-    $r->mapApplication('/debug', create(new \xp\scriptlet\WebApplication('debug'))
+    $r->mapApplication('/debug', (new \xp\scriptlet\WebApplication('debug'))
       ->withScriptlet(self::$debugScriptlet->getName())
       ->withConfig($r->expand('{WEBROOT}/etc/{PROFILE}'))
       ->withEnvironment(array('DOMAIN' => 'example.com', 'ADMINS' => 'admin@example.com,root@localhost'))
@@ -130,7 +130,7 @@ protected function newRunner($profile= null) {
     );
 
     // The error application
-    $r->mapApplication('/error', create(new \xp\scriptlet\WebApplication('error'))
+    $r->mapApplication('/error', (new \xp\scriptlet\WebApplication('error'))
       ->withScriptlet(self::$errorScriptlet->getName())
       ->withConfig($r->expand('{WEBROOT}/etc'))
       ->withDebug('dev' === $profile 
@@ -140,13 +140,13 @@ protected function newRunner($profile= null) {
     );
 
     // The incomplete app (missing a scriptlet)
-    $r->mapApplication('/incomplete', create(new \xp\scriptlet\WebApplication('incomplete'))
+    $r->mapApplication('/incomplete', (new \xp\scriptlet\WebApplication('incomplete'))
       ->withScriptlet(null)
       ->withDebug(\xp\scriptlet\WebDebug::STACKTRACE)
     );
 
     // The XML application
-    $r->mapApplication('/xml', create(new \xp\scriptlet\WebApplication('xml'))
+    $r->mapApplication('/xml', (new \xp\scriptlet\WebApplication('xml'))
       ->withScriptlet(self::$xmlScriptlet->getName())
       ->withDebug('dev' === $profile 
         ? \xp\scriptlet\WebDebug::XML 
@@ -155,12 +155,12 @@ protected function newRunner($profile= null) {
     );
     
     // The exit scriptlet
-    $r->mapApplication('/exit', create(new \xp\scriptlet\WebApplication('exit'))
+    $r->mapApplication('/exit', (new \xp\scriptlet\WebApplication('exit'))
       ->withScriptlet(self::$exitScriptlet->getName())
     );
 
     // The welcome application
-    $r->mapApplication('/', create(new \xp\scriptlet\WebApplication('welcome'))
+    $r->mapApplication('/', (new \xp\scriptlet\WebApplication('welcome'))
       ->withScriptlet(self::$welcomeScriptlet->getName())
       ->withConfig($r->expand('{WEBROOT}/etc'))
       ->withDebug('dev' === $profile 
@@ -232,7 +232,7 @@ public function noApplication() {
   #[@test]
   public function welcomeApplication() {
     $this->assertEquals(
-      create(new \xp\scriptlet\WebApplication('welcome'))->withConfig('/var/www/etc')->withScriptlet('WelcomeScriptlet'),
+      (new \xp\scriptlet\WebApplication('welcome'))->withConfig('/var/www/etc')->withScriptlet('WelcomeScriptlet'),
       $this->newRunner()->applicationAt('/')
     );
   }
@@ -244,7 +244,7 @@ public function welcomeApplication() {
   #[@test]
   public function welcomeApplicationAtEmptyUrl() {
     $this->assertEquals(
-      create(new \xp\scriptlet\WebApplication('welcome'))->withConfig('/var/www/etc')->withScriptlet('WelcomeScriptlet'),
+      (new \xp\scriptlet\WebApplication('welcome'))->withConfig('/var/www/etc')->withScriptlet('WelcomeScriptlet'),
       $this->newRunner()->applicationAt('')
     );
   }
@@ -256,7 +256,7 @@ public function welcomeApplicationAtEmptyUrl() {
   #[@test]
   public function welcomeApplicationAtDoubleSlash() {
     $this->assertEquals(
-      create(new \xp\scriptlet\WebApplication('welcome'))->withConfig('/var/www/etc')->withScriptlet('WelcomeScriptlet'),
+      (new \xp\scriptlet\WebApplication('welcome'))->withConfig('/var/www/etc')->withScriptlet('WelcomeScriptlet'),
       $this->newRunner()->applicationAt('//')
     );
   }
@@ -268,7 +268,7 @@ public function welcomeApplicationAtDoubleSlash() {
   #[@test]
   public function errorApplication() {
     $this->assertEquals(
-      create(new \xp\scriptlet\WebApplication('error'))->withConfig('/var/www/etc')->withScriptlet('ErrorScriptlet'),
+      (new \xp\scriptlet\WebApplication('error'))->withConfig('/var/www/etc')->withScriptlet('ErrorScriptlet'),
       $this->newRunner()->applicationAt('/error')
     );
   }
@@ -280,7 +280,7 @@ public function errorApplication() {
   #[@test]
   public function welcomeApplicationAtUrlEvenWithErrorInside() {
     $this->assertEquals(
-      create(new \xp\scriptlet\WebApplication('welcome'))->withConfig('/var/www/etc')->withScriptlet('WelcomeScriptlet'),
+      (new \xp\scriptlet\WebApplication('welcome'))->withConfig('/var/www/etc')->withScriptlet('WelcomeScriptlet'),
       $this->newRunner()->applicationAt('/url/with/error/inside')
     );
   }
@@ -292,7 +292,7 @@ public function welcomeApplicationAtUrlEvenWithErrorInside() {
   #[@test]
   public function welcomeApplicationAtUrlBeginningWithErrors() {
     $this->assertEquals(
-      create(new \xp\scriptlet\WebApplication('welcome'))->withConfig('/var/www/etc')->withScriptlet('WelcomeScriptlet'),
+      (new \xp\scriptlet\WebApplication('welcome'))->withConfig('/var/www/etc')->withScriptlet('WelcomeScriptlet'),
       $this->newRunner()->applicationAt('/errors')
     );
   }
@@ -304,7 +304,7 @@ public function welcomeApplicationAtUrlBeginningWithErrors() {
   #[@test]
   public function errorApplicationAtErrorPath() {
     $this->assertEquals(
-      create(new \xp\scriptlet\WebApplication('error'))->withConfig('/var/www/etc')->withScriptlet('ErrorScriptlet'),
+      (new \xp\scriptlet\WebApplication('error'))->withConfig('/var/www/etc')->withScriptlet('ErrorScriptlet'),
       $this->newRunner()->applicationAt('/error/happened')
     );
   }
@@ -648,7 +648,7 @@ public function callingMain() {
   #[@test]
   public function properties() {
     $r= new Runner('/var/www', 'dev');
-    $r->mapApplication('/debug', create(new \xp\scriptlet\WebApplication('debug'))
+    $r->mapApplication('/debug', (new \xp\scriptlet\WebApplication('debug'))
       ->withScriptlet(self::$debugScriptlet->getName())
       ->withConfig('res://user')
       ->withArguments(array('Debugging', 'today'))
diff --git a/src/test/php/scriptlet/unittest/XmlScriptletTest.class.php b/src/test/php/scriptlet/unittest/XmlScriptletTest.class.php
index c1663e6f..3fbd15db 100755
--- a/src/test/php/scriptlet/unittest/XmlScriptletTest.class.php
+++ b/src/test/php/scriptlet/unittest/XmlScriptletTest.class.php
@@ -81,12 +81,12 @@ protected function newResponse(Stylesheet $stylesheet) {
   #[@test]
   public function doGet() {
     $req= $this->newRequest('GET', new URL('http://localhost/'));
-    $res= $this->newResponse(create(new Stylesheet())
+    $res= $this->newResponse((new Stylesheet())
       ->withEncoding('iso-8859-1')
       ->withOutputMethod('xml')
-      ->withTemplate(create(new \xml\XslTemplate())->matching('/')
-        ->withChild(create(new \xml\Node('html'))
-          ->withChild(create(new \xml\Node('body'))
+      ->withTemplate((new \xml\XslTemplate())->matching('/')
+        ->withChild((new \xml\Node('html'))
+          ->withChild((new \xml\Node('body'))
             ->withChild(new \xml\Node('xsl:value-of', null, array('select' => '/formresult/result')))
           )
         )
@@ -139,7 +139,7 @@ public function needsSession($request) { return true; }
   #[@test, @expect('scriptlet.ScriptletException')]
   public function writeToResponseNotPermitted () {
     $req= $this->newRequest('GET', new URL('http://localhost/'));
-    $res= $this->newResponse(create(new Stylesheet())->withOutputMethod('xml'));
+    $res= $this->newResponse((new Stylesheet())->withOutputMethod('xml'));
     
     $s= newinstance('scriptlet.xml.XMLScriptlet', array(), '{
       public function doGet($request, $response) {
@@ -157,7 +157,7 @@ public function doGet($request, $response) {
   #[@test]
   public function writeToResponsePermittedIfNotProcessed () {
     $req= $this->newRequest('GET', new URL('http://localhost/'));
-    $res= $this->newResponse(create(new Stylesheet())->withOutputMethod('xml'));
+    $res= $this->newResponse((new Stylesheet())->withOutputMethod('xml'));
     
     $s= newinstance('scriptlet.xml.XMLScriptlet', array(), '{
       public function doGet($request, $response) {
@@ -177,12 +177,12 @@ public function doGet($request, $response) {
   #[@test]
   public function doPost() {
     $req= $this->newRequest('POST', new URL('http://localhost/'));
-    $res= $this->newResponse(create(new Stylesheet())
+    $res= $this->newResponse((new Stylesheet())
       ->withEncoding('iso-8859-1')
       ->withOutputMethod('xml')
-      ->withTemplate(create(new \xml\XslTemplate())->matching('/')
-        ->withChild(create(new \xml\Node('html'))
-          ->withChild(create(new \xml\Node('body'))
+      ->withTemplate((new \xml\XslTemplate())->matching('/')
+        ->withChild((new \xml\Node('html'))
+          ->withChild((new \xml\Node('body'))
             ->withChild(new \xml\Node('xsl:value-of', null, array('select' => '/formresult/result')))
           )
         )
@@ -209,9 +209,9 @@ public function doPost($request, $response) {
    * @return  xml.XslTemplate
    */
   protected function dumpParamsTemplate() {
-    return create(new \xml\XslTemplate())->matching('/')
-      ->withChild(create(new \xml\Node('html'))
-        ->withChild(create(new \xml\Node('body'))
+    return (new \xml\XslTemplate())->matching('/')
+      ->withChild((new \xml\Node('html'))
+        ->withChild((new \xml\Node('body'))
           ->withChild(new \xml\Node('xsl:value-of', null, array('select' => 'concat(
             "state=",   $__state, ", ",
             "page=",    $__page, ", ",
@@ -232,12 +232,12 @@ protected function dumpParamsTemplate() {
   #[@test]
   public function requestParametersAppearInFormresult() {
     $req= $this->newRequest('GET', new URL('http://localhost/?a=b&b=c'));
-    $res= $this->newResponse(create(new Stylesheet())
+    $res= $this->newResponse((new Stylesheet())
       ->withEncoding('iso-8859-1')
       ->withOutputMethod('xml')
-      ->withTemplate(create(new \xml\XslTemplate())->matching('/')
-        ->withChild(create(new \xml\Node('html'))
-          ->withChild(create(new \xml\Node('body'))
+      ->withTemplate((new \xml\XslTemplate())->matching('/')
+        ->withChild((new \xml\Node('html'))
+          ->withChild((new \xml\Node('body'))
             ->withChild(new \xml\Node('xsl:copy-of', null, array('select' => '/formresult/formvalues')))
           )
         )
@@ -268,12 +268,12 @@ public function requestParametersAppearInFormresult() {
   #[@test]
   public function requestArrayParametersAppearInFormresult() {
     $req= $this->newRequest('GET', new URL('http://localhost/?a[]=b&a[]=c'));
-    $res= $this->newResponse(create(new Stylesheet())
+    $res= $this->newResponse((new Stylesheet())
       ->withEncoding('iso-8859-1')
       ->withOutputMethod('xml')
-      ->withTemplate(create(new \xml\XslTemplate())->matching('/')
-        ->withChild(create(new \xml\Node('html'))
-          ->withChild(create(new \xml\Node('body'))
+      ->withTemplate((new \xml\XslTemplate())->matching('/')
+        ->withChild((new \xml\Node('html'))
+          ->withChild((new \xml\Node('body'))
             ->withChild(new \xml\Node('xsl:copy-of', null, array('select' => '/formresult/formvalues')))
           )
         )
@@ -304,7 +304,7 @@ public function requestArrayParametersAppearInFormresult() {
   #[@test]
   public function defaultParameters() {
     $req= $this->newRequest('GET', new URL('http://localhost/'));
-    $res= $this->newResponse(create(new Stylesheet())
+    $res= $this->newResponse((new Stylesheet())
       ->withEncoding('iso-8859-1')
       ->withOutputMethod('xml')
       ->withTemplate($this->dumpParamsTemplate())
@@ -327,7 +327,7 @@ public function defaultParameters() {
   #[@test]
   public function homeState() {
     $req= $this->newRequest('GET', new URL('http://localhost/xml/home'));
-    $res= $this->newResponse(create(new Stylesheet())
+    $res= $this->newResponse((new Stylesheet())
       ->withEncoding('iso-8859-1')
       ->withOutputMethod('xml')
       ->withTemplate($this->dumpParamsTemplate())
@@ -350,7 +350,7 @@ public function homeState() {
   #[@test]
   public function productAndLanguage() {
     $req= $this->newRequest('GET', new URL('http://localhost/xml/public.de_DE/home'));
-    $res= $this->newResponse(create(new Stylesheet())
+    $res= $this->newResponse((new Stylesheet())
       ->withEncoding('iso-8859-1')
       ->withOutputMethod('xml')
       ->withTemplate($this->dumpParamsTemplate())
@@ -373,7 +373,7 @@ public function productAndLanguage() {
   #[@test]
   public function query() {
     $req= $this->newRequest('GET', new URL('http://localhost/?a=b'));
-    $res= $this->newResponse(create(new Stylesheet())
+    $res= $this->newResponse((new Stylesheet())
       ->withEncoding('iso-8859-1')
       ->withOutputMethod('xml')
       ->withTemplate($this->dumpParamsTemplate())