diff --git a/src/main/php/xml/io/XmlStreamWriter.class.php b/src/main/php/xml/io/XmlStreamWriter.class.php
index 0a6d5bea..745aa7ca 100755
--- a/src/main/php/xml/io/XmlStreamWriter.class.php
+++ b/src/main/php/xml/io/XmlStreamWriter.class.php
@@ -2,11 +2,10 @@
 
 use io\streams\OutputStream;
 
-
 /**
  * Outputs XML to an output stream.
  *
- * @test    xp://xml.unittest.io.XmlStreamWriterTest
+ * @test  xml.unittest.io.XmlStreamWriterTest
  */
 class XmlStreamWriter extends XmlWriter {
   protected $stack= [];
@@ -21,6 +20,9 @@ public function __construct(OutputStream $stream) {
     $this->stream= $stream;
   }
 
+  /** @return io.streams.OutputStream */
+  public function out() { return $this->stream; }
+
   /**
    * Start writing a document
    *
diff --git a/src/test/php/xml/unittest/AbstractProcessorTest.class.php b/src/test/php/xml/unittest/AbstractProcessorTest.class.php
index 77ce60c1..12a69756 100755
--- a/src/test/php/xml/unittest/AbstractProcessorTest.class.php
+++ b/src/test/php/xml/unittest/AbstractProcessorTest.class.php
@@ -2,15 +2,10 @@
 
 use io\FileNotFoundException;
 use lang\Runtime;
-use unittest\{Expect, PrerequisitesNotMetError, Test, TestCase};
+use unittest\{Assert, Expect, PrerequisitesNotMetError, Test, TestCase};
 use xml\{TransformerException, Tree};
 
-/**
- * Test XSL processor
- *
- * @see    xp://xml.IXSLProcessor
- */
-abstract class AbstractProcessorTest extends TestCase {
+abstract class AbstractProcessorTest {
   public $processor= null;
   public $xmlDeclaration= '';
     
@@ -24,7 +19,7 @@ abstract class AbstractProcessorTest extends TestCase {
    * @throws  unittest.AssertionFailedError
    */
   public function assertXmlEquals($expect, $actual) {
-    $this->assertEquals(
+    Assert::equals(
       $this->xmlDeclaration.preg_replace('#>[\s\r\n]+<#', '><', trim($expect)),
       preg_replace('#>[\s\r\n]+<#', '><', trim($actual))
     );
@@ -82,6 +77,7 @@ public function processorCharset() { }
    *
    * @throws  unittest.PrerequisitesNotMetError
    */
+  #[Before]
   public function setUp() {
     foreach ((array)$this->neededExtension() as $ext) {
       if (!extension_loaded($ext)) {
@@ -167,7 +163,7 @@ public function setMalformedXSLTree() {
   #[Test]
   public function paramAccessors() {
     $this->processor->setParam('a', 'b');
-    $this->assertEquals('b', $this->processor->getParam('a'));
+    Assert::equals('b', $this->processor->getParam('a'));
   }
 
   #[Test]
@@ -175,7 +171,7 @@ public function baseAccessors() {
     $file= Runtime::getInstance()->getExecutable()->getFilename();
     $path= rtrim(realpath(dirname($file)), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
     $this->processor->setBase($path);
-    $this->assertEquals($path, $this->processor->getBase());
+    Assert::equals($path, $this->processor->getBase());
   }
 
   #[Test]
@@ -183,7 +179,7 @@ public function setBaseAddsTrailingDirectorySeparator() {
     $file= Runtime::getInstance()->getExecutable()->getFilename();
     $path= rtrim(realpath(dirname($file)), DIRECTORY_SEPARATOR);
     $this->processor->setBase($path);
-    $this->assertEquals($path.DIRECTORY_SEPARATOR, $this->processor->getBase());
+    Assert::equals($path.DIRECTORY_SEPARATOR, $this->processor->getBase());
   }
 
   #[Test]
@@ -193,9 +189,9 @@ public function setParams() {
       'left'  => 'one',
       'right' => 'two'
     ]);
-    $this->assertEquals('b', $this->processor->getParam('a')) &&
-    $this->assertEquals('one', $this->processor->getParam('left')) &&
-    $this->assertEquals('two', $this->processor->getParam('right'));
+    Assert::equals('b', $this->processor->getParam('a')) &&
+    Assert::equals('one', $this->processor->getParam('left')) &&
+    Assert::equals('two', $this->processor->getParam('right'));
   }
 
   #[Test]
@@ -207,7 +203,7 @@ public function transformationWithEmptyResult() {
       </xsl:stylesheet>
     ');
     $this->processor->run();
-    $this->assertEquals('', $this->processor->output());
+    Assert::equals('', $this->processor->output());
   }
 
   #[Test]
@@ -222,8 +218,8 @@ public function iso88591XslWithoutOutputEncoding() {
       </xsl:stylesheet>
     ');
     $this->processor->run();
-    $this->assertEquals($this->processorCharset(), $this->processor->outputEncoding());
-    $this->assertEquals('übercoder', $this->processor->output());
+    Assert::equals($this->processorCharset(), $this->processor->outputEncoding());
+    Assert::equals('übercoder', $this->processor->output());
   }
 
   #[Test]
@@ -238,8 +234,8 @@ public function iso88591XslWithUtf8OutputEncoding() {
       </xsl:stylesheet>
     ');
     $this->processor->run();
-    $this->assertEquals('utf-8', $this->processor->outputEncoding());
-    $this->assertEquals('übercoder', $this->processor->output());
+    Assert::equals('utf-8', $this->processor->outputEncoding());
+    Assert::equals('übercoder', $this->processor->output());
   }
 
   #[Test]
@@ -254,8 +250,8 @@ public function utf8XslWithoutOutputEncoding() {
       </xsl:stylesheet>
     ');
     $this->processor->run();
-    $this->assertEquals($this->processorCharset(), $this->processor->outputEncoding());
-    $this->assertEquals('übercoder', $this->processor->output());
+    Assert::equals($this->processorCharset(), $this->processor->outputEncoding());
+    Assert::equals('übercoder', $this->processor->output());
   }
 
   #[Test]
@@ -270,8 +266,8 @@ public function utf8XslWithUtf8OutputEncoding() {
       </xsl:stylesheet>
     ');
     $this->processor->run();
-    $this->assertEquals('utf-8', $this->processor->outputEncoding());
-    $this->assertEquals('übercoder', $this->processor->output());
+    Assert::equals('utf-8', $this->processor->outputEncoding());
+    Assert::equals('übercoder', $this->processor->output());
   }
 
   #[Test]
@@ -286,8 +282,8 @@ public function utf8XslWithIso88591OutputEncoding() {
       </xsl:stylesheet>
     ');
     $this->processor->run();
-    $this->assertEquals('iso-8859-1', $this->processor->outputEncoding());
-    $this->assertEquals("\xfcbercoder", $this->processor->output());
+    Assert::equals('iso-8859-1', $this->processor->outputEncoding());
+    Assert::equals("\xfcbercoder", $this->processor->output());
   }
 
   #[Test]
@@ -302,8 +298,8 @@ public function iso88591XslWithIso88591OutputEncoding() {
       </xsl:stylesheet>
     ');
     $this->processor->run();
-    $this->assertEquals('iso-8859-1', $this->processor->outputEncoding());
-    $this->assertEquals("\xfcbercoder", $this->processor->output());
+    Assert::equals('iso-8859-1', $this->processor->outputEncoding());
+    Assert::equals("\xfcbercoder", $this->processor->output());
   }
 
   #[Test]
@@ -333,7 +329,7 @@ public function transformationToHtml() {
       </xsl:stylesheet>
     ');
     $this->processor->run();
-    $this->assertEquals('<b>Hello</b>', trim($this->processor->output()));
+    Assert::equals('<b>Hello</b>', trim($this->processor->output()));
   }
 
   #[Test]
@@ -348,7 +344,7 @@ public function javaScriptInCDataSection() {
       </xsl:stylesheet>
     ');
     $this->processor->run();
-    $this->assertEquals(
+    Assert::equals(
       '<script language="JavaScript"> alert(1 && 2); </script>', 
       trim($this->processor->output())
     );
@@ -366,7 +362,7 @@ public function omitXmlDeclaration() {
       </xsl:stylesheet>
     ');
     $this->processor->run();
-    $this->assertEquals('<tag>No XML declaration</tag>', trim($this->processor->output()));
+    Assert::equals('<tag>No XML declaration</tag>', trim($this->processor->output()));
   }
 
   #[Test]
@@ -481,7 +477,7 @@ public function includingAFile() {
       </xsl:stylesheet>
     ');
     $this->processor->run();
-    $this->assertEquals('TEST', $this->processor->output());
+    Assert::equals('TEST', $this->processor->output());
   }
 
   #[Test]
@@ -496,7 +492,7 @@ public function importingAFile() {
       </xsl:stylesheet>
     ');
     $this->processor->run();
-    $this->assertEquals('TEST', $this->processor->output());
+    Assert::equals('TEST', $this->processor->output());
   }
 
   #[Test]
@@ -508,7 +504,7 @@ public function outputEncodingFromIncludedFile() {
       </xsl:stylesheet>
     ');
     $this->processor->run();
-    $this->assertEquals('iso-8859-1', $this->processor->outputEncoding());
+    Assert::equals('iso-8859-1', $this->processor->outputEncoding());
   }
 
   #[Test]
@@ -520,7 +516,7 @@ public function outputEncodingFromImportedFile() {
       </xsl:stylesheet>
     ');
     $this->processor->run();
-    $this->assertEquals('iso-8859-1', $this->processor->outputEncoding());
+    Assert::equals('iso-8859-1', $this->processor->outputEncoding());
   }
 
   #[Test]
@@ -532,7 +528,7 @@ public function outputEncodingFromIncludedInImportedFile() {
       </xsl:stylesheet>
     ');
     $this->processor->run();
-    $this->assertEquals('iso-8859-1', $this->processor->outputEncoding());
+    Assert::equals('iso-8859-1', $this->processor->outputEncoding());
   }
 
   #[Test]
@@ -544,6 +540,6 @@ public function outputEncodingFromIncludedInIncludedFile() {
       </xsl:stylesheet>
     ');
     $this->processor->run();
-    $this->assertEquals('iso-8859-1', $this->processor->outputEncoding());
+    Assert::equals('iso-8859-1', $this->processor->outputEncoding());
   }
 }
\ No newline at end of file
diff --git a/src/test/php/xml/unittest/AbstractXMLParserTest.class.php b/src/test/php/xml/unittest/AbstractXMLParserTest.class.php
index 79617236..17a6be3a 100755
--- a/src/test/php/xml/unittest/AbstractXMLParserTest.class.php
+++ b/src/test/php/xml/unittest/AbstractXMLParserTest.class.php
@@ -1,16 +1,11 @@
 <?php namespace xml\unittest;
 
+use unittest\Assert;
 use unittest\{Expect, Test, TestCase};
 use xml\XMLFormatException;
 use xml\parser\{InputSource, ParserCallback, XMLParser};
 
-/**
- * TestCase
- *
- * @see      xp://xml.parser.ParserCallback
- * @see      xp://xml.parser.XMLParser
- */
-abstract class AbstractXMLParserTest extends TestCase {
+abstract class AbstractXMLParserTest {
   const NAME = 0;
   const ATTR = 1;
   const CHLD = 2;
@@ -20,6 +15,7 @@ abstract class AbstractXMLParserTest extends TestCase {
   /**
    * Sets up test case
    */
+  #[Before]
   public function setUp() {
     $this->parser= new XMLParser();
   }
@@ -27,6 +23,7 @@ public function setUp() {
   /**
    * Tears down test case
    */
+  #[After]
   public function tearDown() {
     unset($this->parser);
   }
@@ -92,7 +89,7 @@ public function onFinish($instance) {
 
   #[Test]
   public function withoutDeclaration() {
-    $this->assertTrue($this->parser->parse($this->source('<root/>', true)));
+    Assert::true($this->parser->parse($this->source('<root/>', true)));
   }
 
   #[Test, Expect(XMLFormatException::class)]
@@ -102,7 +99,7 @@ public function emptyString() {
   
   #[Test]
   public function withDeclaration() {
-    $this->assertTrue($this->parser->parse($this->source('<root/>')));
+    Assert::true($this->parser->parse($this->source('<root/>')));
   }
 
   #[Test]
@@ -118,34 +115,34 @@ public function tree() {
         </paragraph>
       </chapter>
     </book>'));
-    $this->assertEquals('book', $callback->tree[self::NAME]);
-    $this->assertEquals([], $callback->tree[self::ATTR]);
+    Assert::equals('book', $callback->tree[self::NAME]);
+    Assert::equals([], $callback->tree[self::ATTR]);
     
     with ($author= $callback->tree[self::CHLD][1]); {
-      $this->assertEquals('author', $author[self::NAME]);
-      $this->assertEquals([], $author[self::ATTR]);
+      Assert::equals('author', $author[self::NAME]);
+      Assert::equals([], $author[self::ATTR]);
     
       with ($name= $author[self::CHLD][0]); {
-        $this->assertEquals('name', $name[self::NAME]);
-        $this->assertEquals([], $name[self::ATTR]);
-        $this->assertEquals(['Timm'], $name[self::CHLD]);
+        Assert::equals('name', $name[self::NAME]);
+        Assert::equals([], $name[self::ATTR]);
+        Assert::equals(['Timm'], $name[self::CHLD]);
       }
     }
 
     with ($chapter= $callback->tree[self::CHLD][3]); {
-      $this->assertEquals('chapter', $chapter[self::NAME]);
-      $this->assertEquals(['id' => '1'], $chapter[self::ATTR]);
+      Assert::equals('chapter', $chapter[self::NAME]);
+      Assert::equals(['id' => '1'], $chapter[self::ATTR]);
 
       with ($title= $chapter[self::CHLD][1]); {
-        $this->assertEquals('title', $title[self::NAME]);
-        $this->assertEquals([], $title[self::ATTR]);
-        $this->assertEquals(['Introduction'], $title[self::CHLD]);
+        Assert::equals('title', $title[self::NAME]);
+        Assert::equals([], $title[self::ATTR]);
+        Assert::equals(['Introduction'], $title[self::CHLD]);
       }
 
       with ($paragraph= $chapter[self::CHLD][3]); {
-        $this->assertEquals('paragraph', $paragraph[self::NAME]);
-        $this->assertEquals([], $paragraph[self::ATTR]);
-        $this->assertEquals(['This is where it all started.'], $paragraph[self::CHLD]);
+        Assert::equals('paragraph', $paragraph[self::NAME]);
+        Assert::equals([], $paragraph[self::ATTR]);
+        Assert::equals(['This is where it all started.'], $paragraph[self::CHLD]);
       }
     }
   }
@@ -156,7 +153,7 @@ public function reusable() {
       $callback= $this->newCallback();
       $this->parser->setCallback($callback);
       $this->parser->parse($this->source('<run id="'.$i.'"/>'));
-      $this->assertEquals(
+      Assert::equals(
         ['run', ['id' => (string)$i], []], 
         $callback->tree, 
         'Run #'.$i
@@ -172,13 +169,13 @@ public function errorOccursLate() {
       $this->parser->parse($this->source('<doc><h1>Title</h1><p>Text</p><img></doc>'));
       $this->fail('Parsed without problems', null, 'xml.XMLFormatException');
     } catch (\xml\XMLFormatException $expected) {
-      $this->assertEquals(null, $callback->tree, 'Tree only set if entire doc parsed');
+      Assert::equals(null, $callback->tree, 'Tree only set if entire doc parsed');
 
-      $this->assertEquals(4, sizeof($callback->elements));
-      $this->assertEquals('doc', $callback->elements[0]);
-      $this->assertEquals('h1', $callback->elements[1]);
-      $this->assertEquals('p', $callback->elements[2]);
-      $this->assertEquals('img', $callback->elements[3]);
+      Assert::equals(4, sizeof($callback->elements));
+      Assert::equals('doc', $callback->elements[0]);
+      Assert::equals('h1', $callback->elements[1]);
+      Assert::equals('p', $callback->elements[2]);
+      Assert::equals('img', $callback->elements[3]);
     }
   }
 
@@ -227,7 +224,7 @@ public function quotesInsideAttributes() {
     $callback= $this->newCallback();
     $this->parser->setCallback($callback);
     $this->parser->parse($this->source('<n id="\'1\'" t=\'"_new"\' q="&apos;&quot;"/>'));
-    $this->assertEquals(
+    Assert::equals(
       ['n', ['id' => "'1'", 't' => '"_new"', 'q' => '\'"'], []],
       $callback->tree
     );
@@ -238,7 +235,7 @@ public function greaterSignInAttribute() {
     $callback= $this->newCallback();
     $this->parser->setCallback($callback);
     $this->parser->parse($this->source('<a id=">"/>'));
-    $this->assertEquals(
+    Assert::equals(
       ['a', ['id' => '>'], []],
       $callback->tree
     );
@@ -256,7 +253,7 @@ public function cdataSection() {
     $this->parser->parse($this->source('
       <doc>CDATA [<![CDATA[ <&> ]]>]</doc>
     '));
-    $this->assertEquals([
+    Assert::equals([
       'doc', [], [
         'CDATA [', '<&>', ']'
       ]
@@ -269,7 +266,7 @@ public function processingInstruction() {
     $this->parser->setCallback($callback);
     $this->parser->parse($this->source('<doc><?php echo "1"; ?></doc>'));
 
-    $this->assertEquals([
+    Assert::equals([
       'doc', [], [
         '<?php echo "1"; ?>'
       ]
@@ -282,7 +279,7 @@ public function comment() {
     $this->parser->setCallback($callback);
     $this->parser->parse($this->source('<doc><!-- Comment --></doc>'));
 
-    $this->assertEquals([
+    Assert::equals([
       'doc', [], [
         '<!-- Comment -->'
       ]
@@ -306,7 +303,7 @@ public function predefinedEntities() {
       <doc>&quot;3 &lt; 5 &apos;&amp;&apos; 5 &gt; 3&quot;</doc>
     '));
 
-    $this->assertEquals([
+    Assert::equals([
       'doc', [], [
         '"', '3', '<', '5', "'", '&', "'", '5', '>', '3', '"'
       ]
@@ -321,7 +318,7 @@ public function hexEntity() {
       <doc>&#169; 2001-2009 the XP team</doc>
     '));
 
-    $this->assertEquals([
+    Assert::equals([
       'doc', [], [
         '©', '2001-2009 the XP team'
       ]
@@ -337,8 +334,8 @@ public function iso88591Conversion() {
       <doc>The übercoder returns</doc>
     '));
 
-    $this->assertEquals('iso-8859-1', $callback->encoding);
-    $this->assertEquals([
+    Assert::equals('iso-8859-1', $callback->encoding);
+    Assert::equals([
       'doc', [], [
         'The', 'übercoder returns'
       ]
@@ -354,8 +351,8 @@ public function utf8Conversion() {
       <doc>The übercoder returns</doc>
     '));
     
-    $this->assertEquals('utf-8', $callback->encoding);
-    $this->assertEquals([
+    Assert::equals('utf-8', $callback->encoding);
+    Assert::equals([
       'doc', [], [
         'The', 'übercoder returns'
       ]
@@ -391,7 +388,7 @@ public function characterEntity() {
       <doc>Copyright: &copy;</doc>
     '));
 
-    $this->assertEquals([
+    Assert::equals([
       'doc', [], [
         'Copyright:', '&copy;'
       ]
@@ -407,7 +404,7 @@ public function entity() {
       <doc>Copyright: &copyright;</doc>
     '));
 
-    $this->assertEquals([
+    Assert::equals([
       'doc', [], [
         'Copyright:', '&copyright;'
       ]
@@ -423,7 +420,7 @@ public function entityInAttribute() {
       <doc><book copyright="Copyright &copyright;"/></doc>
     '));
 
-    $this->assertEquals([
+    Assert::equals([
       'doc', [], [
         ['book', ['copyright' => 'Copyright 2009 The XP team'], []],
       ]
@@ -442,7 +439,7 @@ public function entityExpansion() {
       <doc><book copyright="Copyright &copyright;"/></doc>
     '));
 
-    $this->assertEquals([
+    Assert::equals([
       'doc', [], [
         ['book', ['copyright' => 'Copyright 2009 The XP team'], []],
       ]
@@ -458,7 +455,7 @@ public function externalEntity() {
       <doc>Copyright: &copyright;</doc>
     '));
 
-    $this->assertEquals([
+    Assert::equals([
       'doc', [], ['Copyright:'],
     ], $callback->tree);
   }
diff --git a/src/test/php/xml/unittest/ApplicationType.class.php b/src/test/php/xml/unittest/ApplicationType.class.php
index 35d41723..4cd218cd 100755
--- a/src/test/php/xml/unittest/ApplicationType.class.php
+++ b/src/test/php/xml/unittest/ApplicationType.class.php
@@ -2,13 +2,7 @@
 
 use xml\Xmlns;
 
-/**
- * Test class for Marshaller / Unmarshaller tests
- *
- * @see  xp://xml.unittest.UnmarshallerTest
- * @see  xp://xml.unittest.MarshallerTest
- */
 #[Xmlns(app: 'http://projects.xp-framework.net/xmlns/app')]
 class ApplicationType {
 
-}
+}
\ No newline at end of file
diff --git a/src/test/php/xml/unittest/ButtonType.class.php b/src/test/php/xml/unittest/ButtonType.class.php
index 6dc86e89..45f8ae0d 100755
--- a/src/test/php/xml/unittest/ButtonType.class.php
+++ b/src/test/php/xml/unittest/ButtonType.class.php
@@ -2,12 +2,6 @@
 
 use xml\{Xmlfactory, Xmlmapping};
 
-/**
- * Test class for Marshaller / Unmarshaller tests. Used by
- * DialogType.
- *
- * @see  xp://xml.unittest.DialogType
- */
 class ButtonType {
   public $id= '';
   public $caption= '';
diff --git a/src/test/php/xml/unittest/DialogType.class.php b/src/test/php/xml/unittest/DialogType.class.php
index abd22612..ffd68698 100755
--- a/src/test/php/xml/unittest/DialogType.class.php
+++ b/src/test/php/xml/unittest/DialogType.class.php
@@ -2,13 +2,6 @@
 
 use xml\{Xmlfactory, Xmlmapping};
 
-/**
- * Test class for Marshaller / Unmarshaller tests
- *
- * @see  xp://xml.unittest.UnmarshallerTest
- * @see  xp://xml.unittest.MarshallerTest
- * @see  rfc://0040
- */
 class DialogType {
   public
     $id       = '',
diff --git a/src/test/php/xml/unittest/DocumentTest.class.php b/src/test/php/xml/unittest/DocumentTest.class.php
index 871ba083..3cc9ae48 100755
--- a/src/test/php/xml/unittest/DocumentTest.class.php
+++ b/src/test/php/xml/unittest/DocumentTest.class.php
@@ -1,14 +1,9 @@
 <?php namespace xml\unittest;
 
-use unittest\{Test, TestCase};
+use unittest\{Assert, Test, TestCase};
 use xml\dom\Document;
 
-/**
- * TestCase for Document class
- *
- * @see      xp://xml.dom.Document
- */
-class DocumentTest extends TestCase {
+class DocumentTest {
 
   #[Test]
   public function elementsByTagName() {
@@ -17,7 +12,7 @@ public function elementsByTagName() {
       <person id="1552">Alex</person>
     </list>');
     
-    $this->assertEquals(
+    Assert::equals(
       $dom->getDocumentElement()->getChildren(),
       $dom->getElementsByTagName('person')
     );
@@ -30,7 +25,7 @@ public function elementById() {
       <person id="1552">Alex</person>
     </list>');
     
-    $this->assertEquals(
+    Assert::equals(
       $dom->getDocumentElement()->nodeAt(0),
       $dom->getElementById('1549')
     );
@@ -46,7 +41,7 @@ public function elementsByName() {
       </step>
     </wizard>');
     
-    $this->assertEquals(
+    Assert::equals(
       [$dom->getDocumentElement()->nodeAt(0)->nodeAt(0)],
       $dom->getElementsByName('package')
     );
@@ -67,7 +62,7 @@ public function nestedElementById() {
       </body>
     </html>');
     
-    $this->assertEquals(
+    Assert::equals(
       $dom->getDocumentElement()->nodeAt(1)->nodeAt(0)->nodeAt(0)->nodeAt(0),
       $dom->getElementById('home')
     );
@@ -75,7 +70,7 @@ public function nestedElementById() {
 
   #[Test]
   public function noSuchElementById() {
-    $this->assertEquals(
+    Assert::equals(
       null,
       Document::fromString('<list/>')->getElementById('1777')
     );
diff --git a/src/test/php/xml/unittest/DomXslProcessorTest.class.php b/src/test/php/xml/unittest/DomXslProcessorTest.class.php
index 37568d16..664dc172 100755
--- a/src/test/php/xml/unittest/DomXslProcessorTest.class.php
+++ b/src/test/php/xml/unittest/DomXslProcessorTest.class.php
@@ -2,16 +2,10 @@
 
 use io\FileNotFoundException;
 use lang\{ElementNotFoundException, IllegalArgumentException};
+use unittest\Assert;
 use unittest\{Expect, Test, Xslmethod};
 use xml\{DomXSLProcessor, TransformerException};
  
-/**
- * ProcessorTest implementation that tests the DomXSL processor
- *
- * @see   xp://xml.DomXSLProcessor
- * @ext   dom
- * @ext   xsl
- */
 class DomXslProcessorTest extends AbstractProcessorTest {
 
   /**
@@ -203,7 +197,7 @@ public function errorStackDoesNotAffectErrorHandling() {
       $i->setXMLBuf('<document>&nbsp;</document>');
       $this->fail('Malformed XML did not trigger exception');
     } catch (\xml\TransformerException $e) {
-      $this->assertTrue((bool)strstr($e->getMessage(), "Entity 'nbsp' not defined"));
+      Assert::true((bool)strstr($e->getMessage(), "Entity 'nbsp' not defined"));
     }
   }
   
@@ -254,6 +248,6 @@ public function processDocuments() {
     $this->setXSLDoc();
     $this->setXMLDoc();
     $this->processor->run();
-    $this->assertEquals('document', $this->processor->output());
+    Assert::equals('document', $this->processor->output());
   }
 }
\ No newline at end of file
diff --git a/src/test/php/xml/unittest/MarshallerTest.class.php b/src/test/php/xml/unittest/MarshallerTest.class.php
index 4c54115f..f69199be 100755
--- a/src/test/php/xml/unittest/MarshallerTest.class.php
+++ b/src/test/php/xml/unittest/MarshallerTest.class.php
@@ -1,21 +1,18 @@
 <?php namespace xml\unittest;
- 
+
 use lang\IllegalArgumentException;
+use unittest\Assert;
 use unittest\{Expect, Test, TestCase};
 use xml\Node;
 use xml\meta\Marshaller;
 
-/**
- * Test Marshaller API
- *
- * @see   xp://xml.meta.Marshaller
- */
-class MarshallerTest extends TestCase {
+class MarshallerTest {
   protected $fixture= null;
 
   /**
    * Creates fixture
    */
+  #[Before]
   public function setUp() {
     $this->fixture= new Marshaller();
   }
@@ -30,7 +27,7 @@ public function setUp() {
    * @throws  unittest.AssertionFailedError
    */
   public function assertMarshalled($expect, $node) {
-    $this->assertEquals(
+    Assert::equals(
       preg_replace('#>[\s\r\n]+<#', '><', trim($expect)),
       preg_replace('#>[\s\r\n]+<#', '><', trim($node->getSource(INDENT_DEFAULT)))
     );
@@ -39,7 +36,7 @@ public function assertMarshalled($expect, $node) {
   #[Test]
   public function marshalToReturnsGivenNode() {
     $n= new Node('node');
-    $this->assertEquals($n, $this->fixture->marshalTo($n, new Some()));
+    Assert::equals($n, $this->fixture->marshalTo($n, new Some()));
   }
 
   #[Test]
@@ -57,12 +54,12 @@ public function nameOfNodeUsed() {
 
   #[Test]
   public function marshalToCreatesNewNodeWhenNoneGiven() {
-    $this->assertEquals(new Node('some'), $this->fixture->marshalTo(null, new Some()));
+    Assert::equals(new Node('some'), $this->fixture->marshalTo(null, new Some()));
   }
 
   #[Test]
   public function classAnnotationSuppliesName() {
-    $this->assertEquals(new Node('scroll'), $this->fixture->marshalTo(null, new ScrollBarType()));
+    Assert::equals(new Node('scroll'), $this->fixture->marshalTo(null, new ScrollBarType()));
   }
 
   #[Test]
@@ -140,15 +137,15 @@ public function asTree() {
     $dialog->setId('file.open');
 
     $node= $this->fixture->marshalTo(new Node('dialog'), $dialog);
-    $this->assertInstanceOf(Node::class, $node);
-    $this->assertEquals('dialog', $node->getName());
-    $this->assertEquals('file.open', $node->getAttribute('id'));
+    Assert::instance(Node::class, $node);
+    Assert::equals('dialog', $node->getName());
+    Assert::equals('file.open', $node->getAttribute('id'));
   }
 
   #[Test]
   public function deprecatedUsage() {
     $dialog= new DialogType();
-    $this->assertEquals(
+    Assert::equals(
       Marshaller::marshal($dialog),
       $this->fixture->marshalTo(new Node('dialogtype'), $dialog)->getSource(INDENT_DEFAULT)
     );
@@ -157,7 +154,7 @@ public function deprecatedUsage() {
   #[Test]
   public function deprecatedUsageWithNamespace() {
     $app= new ApplicationType();
-    $this->assertEquals(
+    Assert::equals(
       Marshaller::marshal($app),
       $this->fixture->marshalTo(new Node('ApplicationType'), $app)->getSource(INDENT_DEFAULT)
     );
diff --git a/src/test/php/xml/unittest/NodeTest.class.php b/src/test/php/xml/unittest/NodeTest.class.php
index 280bcec9..1b62c80f 100755
--- a/src/test/php/xml/unittest/NodeTest.class.php
+++ b/src/test/php/xml/unittest/NodeTest.class.php
@@ -1,15 +1,11 @@
 <?php namespace xml\unittest;
- 
+
 use lang\{Error, IllegalArgumentException};
+use unittest\Assert;
 use unittest\{Expect, Test};
 use xml\{Node, XMLFormatException};
 
-/**
- * Test XML Node class
- *
- * @see   xp://xml.unittest.TreeTest 
- */
-class NodeTest extends \unittest\TestCase {
+class NodeTest {
   
   /**
    * Helper method which returns the XML representation of a Node object,
@@ -26,9 +22,9 @@ protected function sourceOf($node, $mode= INDENT_DEFAULT) {
   public function attributeAccessors() {
     $n= new Node('node');
     $n->setAttribute('id', 1);
-    $this->assertTrue($n->hasAttribute('id'));
-    $this->assertFalse($n->hasAttribute('href'));
-    $this->assertEquals(1, $n->getAttribute('id'));
+    Assert::true($n->hasAttribute('id'));
+    Assert::false($n->hasAttribute('href'));
+    Assert::equals(1, $n->getAttribute('id'));
   }
 
   #[Test]
@@ -36,14 +32,14 @@ public function contentAccessors() {
     $content= '"This is interesting", Tom\'s friend said. "It\'s > 4 but < 2!"';
     $n= new Node('node');
     $n->setContent($content);
-    $this->assertEquals($content, $n->getContent());
+    Assert::equals($content, $n->getContent());
   }
   
   #[Test]
   public function nameAccessors() {
     $n= new Node('node');
     $n->setName('name');
-    $this->assertEquals('name', $n->getName());
+    Assert::equals('name', $n->getName());
   }
   
   #[Test, Expect(XMLFormatException::class)]
@@ -61,19 +57,19 @@ public function addingNullChild() {
   public function addingReturnsChild() {
     $n= new Node('node');
     $child= new Node('node');
-    $this->assertEquals($child, $n->addChild($child));
+    Assert::equals($child, $n->addChild($child));
   }
 
   #[Test]
   public function withChildReturnsNode() {
     $n= new Node('node');
     $child= new Node('node');
-    $this->assertEquals($n, $n->withChild($child));
+    Assert::equals($n, $n->withChild($child));
   }
   
   #[Test]
   public function fromEmptyArray() {
-    $this->assertEquals(
+    Assert::equals(
       '<node/>', 
       $this->sourceOf(Node::fromArray([], 'node'))
     );
@@ -81,7 +77,7 @@ public function fromEmptyArray() {
 
   #[Test]
   public function fromNumberArray() {
-    $this->assertEquals(
+    Assert::equals(
       '<items><item>1</item><item>2</item></items>', 
       $this->sourceOf(Node::fromArray([1, 2], 'items'), INDENT_NONE)
     );
@@ -89,7 +85,7 @@ public function fromNumberArray() {
 
   #[Test]
   public function fromCharacterArray() {
-    $this->assertEquals(
+    Assert::equals(
       '<characters><character>1</character><character>&amp;</character><character>1</character></characters>', 
       $this->sourceOf(Node::fromArray(['1', '&', '1'], 'characters'), INDENT_NONE)
     );
@@ -97,7 +93,7 @@ public function fromCharacterArray() {
   
   #[Test]
   public function sourceOfEmptyNode() {
-    $this->assertEquals(
+    Assert::equals(
       '<node/>', 
       $this->sourceOf(new Node('node'))
     );
@@ -105,7 +101,7 @@ public function sourceOfEmptyNode() {
 
   #[Test]
   public function sourceOfNodeWithOneAttribute() {
-    $this->assertEquals(
+    Assert::equals(
       '<node id="1"/>', 
       $this->sourceOf(new Node('node', null, ['id' => 1]))
     );
@@ -113,7 +109,7 @@ public function sourceOfNodeWithOneAttribute() {
 
   #[Test]
   public function sourceOfNodeWithTwoAttributes() {
-    $this->assertEquals(
+    Assert::equals(
       '<node id="2" name="&amp;XML"/>', 
       $this->sourceOf(new Node('node', null, ['id' => 2, 'name' => '&XML']))
     );
@@ -121,7 +117,7 @@ public function sourceOfNodeWithTwoAttributes() {
 
   #[Test]
   public function sourceOfNodeWithContent() {
-    $this->assertEquals(
+    Assert::equals(
       '<expr>eval(\'1 &lt;&gt; 2 &amp;&amp; \') == &quot;Parse Error&quot;</expr>', 
       $this->sourceOf(new Node('expr', 'eval(\'1 <> 2 && \') == "Parse Error"'))
     );
@@ -129,7 +125,7 @@ public function sourceOfNodeWithContent() {
 
   #[Test]
   public function sourceOfNodeWithCData() {
-    $this->assertEquals(
+    Assert::equals(
       '<text><![CDATA[Special characters: <>"\'&]]></text>', 
       $this->sourceOf(new Node('text', new \xml\CData('Special characters: <>"\'&')))
     );
@@ -137,7 +133,7 @@ public function sourceOfNodeWithCData() {
 
   #[Test]
   public function sourceOfNodeWithPCData() {
-    $this->assertEquals(
+    Assert::equals(
       '<text>A <a href="http://xp-framework.net/">link</a> to click on</text>', 
       $this->sourceOf(new Node('text', new \xml\PCData('A <a href="http://xp-framework.net/">link</a> to click on')))
     );
@@ -145,7 +141,7 @@ public function sourceOfNodeWithPCData() {
   
   #[Test]
   public function getSourceWithDefaultEncoding() {
-    $this->assertEquals(
+    Assert::equals(
       "<n>\xc3\x9cbercoder</n>",
       (new Node('n', "Übercoder"))->getSource(INDENT_NONE)
     );
@@ -153,7 +149,7 @@ public function getSourceWithDefaultEncoding() {
 
   #[Test]
   public function getSourceWithIsoEncoding() {
-    $this->assertEquals(
+    Assert::equals(
       "<n>\xdcbercoder</n>",
       (new Node('n', "Übercoder"))->getSource(INDENT_NONE, 'iso-8859-1')
     );
@@ -161,7 +157,7 @@ public function getSourceWithIsoEncoding() {
 
   #[Test]
   public function getSourceWithUtf8Encoding() {
-    $this->assertEquals(
+    Assert::equals(
       "<n>\xc3\x9cbercoder</n>",
       (new Node('n', "Übercoder"))->getSource(INDENT_NONE, 'utf-8')
     );
@@ -169,7 +165,7 @@ public function getSourceWithUtf8Encoding() {
 
   #[Test]
   public function fromObject() { 
-    $this->assertEquals(
+    Assert::equals(
       "<node>\n".
       "  <id>1549</id>\n".
       "  <color>green</color>\n".
@@ -189,7 +185,7 @@ public function __construct() {
 
   #[Test]
   public function fromObject_uses_short_name_if_omitted() {
-    $this->assertEquals(
+    Assert::equals(
       '<Some/>',
       $this->sourceOf(Node::fromObject(new Some(), null))
     );
@@ -197,7 +193,7 @@ public function fromObject_uses_short_name_if_omitted() {
 
   #[Test]
   public function fromObject_invokes_serialize() {
-    $this->assertEquals(
+    Assert::equals(
       "<node>\n".
       "  <value>test</value>\n".
       "</node>",
@@ -211,7 +207,7 @@ public function __serialize() {
 
   #[Test]
   public function as_string() {
-    $this->assertEquals(
+    Assert::equals(
       'xml.Node(doc) { }',
       (new Node('doc'))->toString()
     );
@@ -219,7 +215,7 @@ public function as_string() {
 
   #[Test]
   public function as_string_with_content() {
-    $this->assertEquals(
+    Assert::equals(
       'xml.Node(test) { "Succeeded" }',
       (new Node('test', 'Succeeded'))->toString()
     );
@@ -227,7 +223,7 @@ public function as_string_with_content() {
 
   #[Test]
   public function as_string_with_attributes() {
-    $this->assertEquals(
+    Assert::equals(
       'xml.Node(a @href= "http://example.com") { }',
       (new Node('a', null, ['href' => 'http://example.com']))->toString()
     );
@@ -235,7 +231,7 @@ public function as_string_with_attributes() {
 
   #[Test]
   public function as_string_with_children() {
-    $this->assertEquals(
+    Assert::equals(
       "xml.Node(div) {\n".
       "  xml.Node(p) { \"Test\" }\n".
       "}",
diff --git a/src/test/php/xml/unittest/RDFNewsFeedTest.class.php b/src/test/php/xml/unittest/RDFNewsFeedTest.class.php
index c3ed905b..fea29a98 100755
--- a/src/test/php/xml/unittest/RDFNewsFeedTest.class.php
+++ b/src/test/php/xml/unittest/RDFNewsFeedTest.class.php
@@ -1,11 +1,12 @@
 <?php namespace xml\unittest;
 
 use lang\{Error, IllegalArgumentException};
-use unittest\{Expect, TestCase, Test};
+use unittest\Assert;
+use unittest\{Expect, Test, TestCase};
 use util\Date;
 use xml\rdf\RDFNewsFeed;
 
-class RDFNewsFeedTest extends TestCase {
+class RDFNewsFeedTest {
 
   #[Test]
   public function can_create() {
@@ -15,7 +16,7 @@ public function can_create() {
   #[Test]
   public function source_of_new_newsfeed() {
     $f= new RDFNewsFeed();
-    $this->assertEquals(
+    Assert::equals(
       '<rdf:RDF'.
       ' xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"'.
       ' xmlns:dc="http://purl.org/dc/elements/1.1/"'.
@@ -29,7 +30,7 @@ public function source_of_new_newsfeed() {
   public function source_of_newsfeed_with_channel() {
     $f= new RDFNewsFeed();
     $f->setChannel('Channel', 'http://example.com/channel', 'Description', new \util\Date('2013-02-27 10:37:12 +01:00'));
-    $this->assertEquals(
+    Assert::equals(
       '<rdf:RDF'.
       ' xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"'.
       ' xmlns:dc="http://purl.org/dc/elements/1.1/"'.
@@ -55,7 +56,7 @@ public function source_of_newsfeed_with_channel_and_item() {
     $f= new RDFNewsFeed();
     $f->setChannel('Channel', 'http://example.com/channel', 'Description', new \util\Date('2013-02-27 10:37:12 +01:00'));
     $f->addItem('Item', 'http://example.com/channel/item/1', 'Description', new \util\Date('2013-02-28 14:12:36 +01:00'));
-    $this->assertEquals(
+    Assert::equals(
       '<rdf:RDF'.
       ' xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"'.
       ' xmlns:dc="http://purl.org/dc/elements/1.1/"'.
@@ -92,7 +93,7 @@ public function source_of_newsfeed_with_channel_and_two_items() {
     $f->setChannel('Channel', 'http://example.com/channel', 'Description', new \util\Date('2013-02-27 10:37:12 +01:00'));
     $f->addItem('Item 1', 'http://example.com/channel/item/1', 'Description 1', new \util\Date('2013-02-28 14:12:36 +01:00'));
     $f->addItem('Item 2', 'http://example.com/channel/item/2', 'Description 2', new \util\Date('2013-02-28 14:12:37 +01:00'));
-    $this->assertEquals(
+    Assert::equals(
       '<rdf:RDF'.
       ' xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"'.
       ' xmlns:dc="http://purl.org/dc/elements/1.1/"'.
@@ -141,7 +142,7 @@ public function setChannel_accepting_date() {
     $f= new RDFNewsFeed();
     $f->setChannel('Channel', 'http://localhost/', 'Channel description', new Date('1980-05-28 00:00:00+0200'), 'english', 'Alex Kiesel', 'Alex Kiesel', 'rights');
 
-    $this->assertEquals(
+    Assert::equals(
       '<rdf:RDF'.
       ' xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"'.
       ' xmlns:dc="http://purl.org/dc/elements/1.1/"'.
@@ -175,7 +176,7 @@ public function addItem_accepting_date() {
     $f->setChannel('Channel', 'http://localhost/', 'Channel description', new Date('1980-05-28 00:00:00+0200'), 'english', 'Alex Kiesel', 'Alex Kiesel', 'rights');
     $f->addItem('Item 1', 'http://localhost/item/1', 'Item description', new Date('2013-04-03 00:00:00+0200'));
 
-    $this->assertEquals(
+    Assert::equals(
       '<rdf:RDF'.
       ' xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"'.
       ' xmlns:dc="http://purl.org/dc/elements/1.1/"'.
diff --git a/src/test/php/xml/unittest/ScrollBarType.class.php b/src/test/php/xml/unittest/ScrollBarType.class.php
index fc70575f..29ad0421 100755
--- a/src/test/php/xml/unittest/ScrollBarType.class.php
+++ b/src/test/php/xml/unittest/ScrollBarType.class.php
@@ -2,13 +2,7 @@
 
 use xml\Xmlfactory;
 
-/**
- * Test class for Marshaller / Unmarshaller tests
- *
- * @see  xp://xml.unittest.MarshallerTest
- * @see  rfc://0040
- */
 #[Xmlfactory(element: 'scroll')]
 class ScrollBarType {
 
-}
+}
\ No newline at end of file
diff --git a/src/test/php/xml/unittest/Some.class.php b/src/test/php/xml/unittest/Some.class.php
index 8e9f58ff..122a56c9 100755
--- a/src/test/php/xml/unittest/Some.class.php
+++ b/src/test/php/xml/unittest/Some.class.php
@@ -2,4 +2,4 @@
 
 class Some {
 
-}
+}
\ No newline at end of file
diff --git a/src/test/php/xml/unittest/StreamXMLParserTest.class.php b/src/test/php/xml/unittest/StreamXMLParserTest.class.php
index 513a0524..4ef64076 100755
--- a/src/test/php/xml/unittest/StreamXMLParserTest.class.php
+++ b/src/test/php/xml/unittest/StreamXMLParserTest.class.php
@@ -3,11 +3,6 @@
 use io\streams\MemoryInputStream;
 use xml\parser\StreamInputSource;
 
-/**
- * Tests XML parser API with io.streams.InputStream source
- *
- * @see  xp://xml.unittest.AbstractXMLParserTest
- */
 class StreamXMLParserTest extends AbstractXMLParserTest {
   
   /**
@@ -21,7 +16,7 @@ class StreamXMLParserTest extends AbstractXMLParserTest {
   protected function source($str, $decl= true) {
     return new StreamInputSource(
       new MemoryInputStream(($decl ? '<?xml version="1.0" encoding="utf-8"?>' : '').$str),
-      $this->name.' test'
+      nameof($this).' test'
     );
   }
 }
\ No newline at end of file
diff --git a/src/test/php/xml/unittest/StringXMLParserTest.class.php b/src/test/php/xml/unittest/StringXMLParserTest.class.php
index 385e04ac..863dac09 100755
--- a/src/test/php/xml/unittest/StringXMLParserTest.class.php
+++ b/src/test/php/xml/unittest/StringXMLParserTest.class.php
@@ -1,10 +1,7 @@
 <?php namespace xml\unittest;
 
-/**
- * Tests XML parser API with primitive string source
- *
- * @see  xp://xml.unittest.AbstractXMLParserTest
- */
+use xml\parser\StringInputSource;
+
 class StringXMLParserTest extends AbstractXMLParserTest {
   
   /**
@@ -16,9 +13,9 @@ class StringXMLParserTest extends AbstractXMLParserTest {
    * @return  xml.parser.InputSource XML the source XML
    */
   protected function source($str, $decl= true) {
-    return new \xml\parser\StringInputSource(
+    return new StringInputSource(
       ($decl ? '<?xml version="1.0" encoding="utf-8"?>' : '').$str,
-      $this->name.' test'
+      nameof($this).' test'
     );
   }
 }
\ No newline at end of file
diff --git a/src/test/php/xml/unittest/StylesheetTest.class.php b/src/test/php/xml/unittest/StylesheetTest.class.php
index b31a0731..e599e333 100755
--- a/src/test/php/xml/unittest/StylesheetTest.class.php
+++ b/src/test/php/xml/unittest/StylesheetTest.class.php
@@ -1,15 +1,11 @@
 <?php namespace xml\unittest;
 
+use unittest\Assert;
 use unittest\Test;
 use util\collections\Vector;
 use xml\Stylesheet;
 
-/**
- * TestCase for Stylesheet class
- *
- * @see  xp://xml.Stylesheet
- */
-class StylesheetTest extends \unittest\TestCase {
+class StylesheetTest {
 
   /**
    * Helper method
@@ -36,7 +32,7 @@ protected function getElementsByTagName($node, $tagname) {
 
   #[Test]
   public function emptyStylesheet() {
-    $this->assertEquals(
+    Assert::equals(
       '<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/>',
       trim((new Stylesheet())->getSource(INDENT_DEFAULT))
     );
@@ -47,7 +43,7 @@ public function setOutputMethod() {
     $s= new Stylesheet();
     $s->setOutputMethod('text', false, 'utf-8');
     
-    $this->assertEquals(
+    Assert::equals(
       '<xsl:output method="text" encoding="utf-8" indent="no"></xsl:output>',
       trim($this->getElementsByTagName($s->root, 'xsl:output')->get(0)->getSource(INDENT_NONE))
     );
@@ -57,7 +53,7 @@ public function setOutputMethod() {
   public function withOutputMethod() {
     $s= (new Stylesheet())->withOutputMethod('text', false, 'utf-8');
     
-    $this->assertEquals(
+    Assert::equals(
       '<xsl:output method="text" encoding="utf-8" indent="no"></xsl:output>',
       trim($this->getElementsByTagName($s->root, 'xsl:output')->get(0)->getSource(INDENT_NONE))
     );
@@ -68,7 +64,7 @@ public function addImport() {
     $s= new Stylesheet();
     $s->addImport('portlets/welcome.portlet.xsl');
     
-    $this->assertEquals(
+    Assert::equals(
       '<xsl:import href="portlets/welcome.portlet.xsl"></xsl:import>',
       trim($this->getElementsByTagName($s->root, 'xsl:import')->get(0)->getSource(INDENT_NONE))
     );
@@ -78,7 +74,7 @@ public function addImport() {
   public function withImport() {
     $s= (new Stylesheet())->withImport('portlets/welcome.portlet.xsl');
     
-    $this->assertEquals(
+    Assert::equals(
       '<xsl:import href="portlets/welcome.portlet.xsl"></xsl:import>',
       trim($this->getElementsByTagName($s->root, 'xsl:import')->get(0)->getSource(INDENT_NONE))
     );
@@ -89,7 +85,7 @@ public function addInclude() {
     $s= new Stylesheet();
     $s->addInclude('portlets/welcome.portlet.xsl');
     
-    $this->assertEquals(
+    Assert::equals(
       '<xsl:include href="portlets/welcome.portlet.xsl"></xsl:include>',
       trim($this->getElementsByTagName($s->root, 'xsl:include')->get(0)->getSource(INDENT_NONE))
     );
@@ -99,7 +95,7 @@ public function addInclude() {
   public function withInclude() {
     $s= (new Stylesheet())->withInclude('portlets/welcome.portlet.xsl');
     
-    $this->assertEquals(
+    Assert::equals(
       '<xsl:include href="portlets/welcome.portlet.xsl"></xsl:include>',
       trim($this->getElementsByTagName($s->root, 'xsl:include')->get(0)->getSource(INDENT_NONE))
     );
@@ -110,7 +106,7 @@ public function addParam() {
     $s= new Stylesheet();
     $s->addParam('session');
     
-    $this->assertEquals(
+    Assert::equals(
       '<xsl:param name="session"></xsl:param>',
       trim($this->getElementsByTagName($s->root, 'xsl:param')->get(0)->getSource(INDENT_NONE))
     );
@@ -120,7 +116,7 @@ public function addParam() {
   public function withParam() {
     $s= (new Stylesheet())->withParam('session');
     
-    $this->assertEquals(
+    Assert::equals(
       '<xsl:param name="session"></xsl:param>',
       trim($this->getElementsByTagName($s->root, 'xsl:param')->get(0)->getSource(INDENT_NONE))
     );
@@ -131,7 +127,7 @@ public function addVariable() {
     $s= new Stylesheet();
     $s->addVariable('session');
     
-    $this->assertEquals(
+    Assert::equals(
       '<xsl:variable name="session"></xsl:variable>',
       trim($this->getElementsByTagName($s->root, 'xsl:variable')->get(0)->getSource(INDENT_NONE))
     );
@@ -144,11 +140,11 @@ public function addVariables() {
     $s->addVariable('language');
     
     $variables= $this->getElementsByTagName($s->root, 'xsl:variable');
-    $this->assertEquals(
+    Assert::equals(
       '<xsl:variable name="session"></xsl:variable>',
       trim($variables->get(0)->getSource(INDENT_NONE))
     );
-    $this->assertEquals(
+    Assert::equals(
       '<xsl:variable name="language"></xsl:variable>',
       trim($variables->get(1)->getSource(INDENT_NONE))
     );
@@ -158,7 +154,7 @@ public function addVariables() {
   public function withVariable() {
     $s= (new Stylesheet())->withVariable('session');
     
-    $this->assertEquals(
+    Assert::equals(
       '<xsl:variable name="session"></xsl:variable>',
       trim($this->getElementsByTagName($s->root, 'xsl:variable')->get(0)->getSource(INDENT_NONE))
     );
@@ -169,7 +165,7 @@ public function addMatchTemplate() {
     $s= new Stylesheet();
     $s->addTemplate((new \xml\XslTemplate())->matching('/'));
     
-    $this->assertEquals(
+    Assert::equals(
       '<xsl:template match="/"></xsl:template>',
       trim($this->getElementsByTagName($s->root, 'xsl:template')->get(0)->getSource(INDENT_NONE))
     );
@@ -179,7 +175,7 @@ public function addMatchTemplate() {
   public function withMatchTemplate() {
     $s= (new Stylesheet())->withTemplate((new \xml\XslTemplate())->matching('/'));
     
-    $this->assertEquals(
+    Assert::equals(
       '<xsl:template match="/"></xsl:template>',
       trim($this->getElementsByTagName($s->root, 'xsl:template')->get(0)->getSource(INDENT_NONE))
     );
@@ -190,7 +186,7 @@ public function addNamedTemplate() {
     $s= new Stylesheet();
     $s->addTemplate((new \xml\XslTemplate())->named('sitemap'));
     
-    $this->assertEquals(
+    Assert::equals(
       '<xsl:template name="sitemap"></xsl:template>',
       trim($this->getElementsByTagName($s->root, 'xsl:template')->get(0)->getSource(INDENT_NONE))
     );
@@ -200,7 +196,7 @@ public function addNamedTemplate() {
   public function withNamedTemplate() {
     $s= (new Stylesheet())->withTemplate((new \xml\XslTemplate())->named('sitemap'));
     
-    $this->assertEquals(
+    Assert::equals(
       '<xsl:template name="sitemap"></xsl:template>',
       trim($this->getElementsByTagName($s->root, 'xsl:template')->get(0)->getSource(INDENT_NONE))
     );
diff --git a/src/test/php/xml/unittest/TextInputType.class.php b/src/test/php/xml/unittest/TextInputType.class.php
index 5f5bb9e0..2c913367 100755
--- a/src/test/php/xml/unittest/TextInputType.class.php
+++ b/src/test/php/xml/unittest/TextInputType.class.php
@@ -2,12 +2,6 @@
 
 use xml\{Xmlfactory, Xmlmapping};
 
-/**
- * Test class for Marshaller / Unmarshaller tests.
- *
- * @see  xp://xml.unittest.UnmarshallerTest
- * @see  xp://xml.unittest.MarshallerTest
- */
 class TextInputType {
   protected $id= '';
   protected $disabled= false;
diff --git a/src/test/php/xml/unittest/TreeTest.class.php b/src/test/php/xml/unittest/TreeTest.class.php
index 5a3a7d11..ad2e69f5 100755
--- a/src/test/php/xml/unittest/TreeTest.class.php
+++ b/src/test/php/xml/unittest/TreeTest.class.php
@@ -1,16 +1,12 @@
 <?php namespace xml\unittest;
- 
+
+use unittest\Assert;
 use unittest\actions\RuntimeVersion;
 use unittest\{Expect, Ignore, Test};
 use xml\parser\XMLParser;
 use xml\{Node, Tree, XMLFormatException};
 
-/**
- * Test XML Tree class
- *
- * @see   xp://xml.unittest.NodeTest 
- */
-class TreeTest extends \unittest\TestCase {
+class TreeTest {
   
   /**
    * Helper method which returns the XML representation of a Tree object,
@@ -25,7 +21,7 @@ protected function sourceOf($tree, $mode= INDENT_DEFAULT) {
 
   #[Test]
   public function emptyTree() {
-    $this->assertEquals(
+    Assert::equals(
       '<root/>', 
       $this->sourceOf(new Tree('root'))
     );
@@ -34,10 +30,10 @@ public function emptyTree() {
   #[Test]
   public function rootMember() {
     with ($t= new Tree('formresult'), $r= $t->root()); {
-      $this->assertInstanceOf(Node::class, $r);
-      $this->assertFalse($r->hasChildren());
-      $this->assertEquals([], $r->getAttributes());
-      $this->assertEquals('formresult', $r->getName());
+      Assert::instance(Node::class, $r);
+      Assert::false($r->hasChildren());
+      Assert::equals([], $r->getAttributes());
+      Assert::equals('formresult', $r->getName());
     }
   }
 
@@ -45,7 +41,7 @@ public function rootMember() {
   public function addChild() {
     $t= new Tree('tests');
     $child= new Node('test', 'success', ['name' => 'TreeTest']);
-    $this->assertEquals($child, $t->addChild($child));
+    Assert::equals($child, $t->addChild($child));
   }
 
   #[Test]
@@ -57,18 +53,18 @@ public function fromString() {
     ');
     
     with ($r= $t->root()); {
-      $this->assertEquals('c:config', $r->getName());
-      $this->assertTrue($r->hasAttribute('xmlns:c'));
-      $this->assertEquals('http://example.com/cfg/1.0', $r->getAttribute('xmlns:c'));
-      $this->assertEquals(1, sizeof($r->getChildren()));
+      Assert::equals('c:config', $r->getName());
+      Assert::true($r->hasAttribute('xmlns:c'));
+      Assert::equals('http://example.com/cfg/1.0', $r->getAttribute('xmlns:c'));
+      Assert::equals(1, sizeof($r->getChildren()));
     }      
     
     with ($c= $t->root()->nodeAt(0)); {
-      $this->assertEquals('attribute', $c->getName());
-      $this->assertTrue($c->hasAttribute('name'));
-      $this->assertEquals('key', $c->getAttribute('name'));
-      $this->assertEquals(0, sizeof($c->getChildren()));
-      $this->assertEquals('value', $c->getContent());
+      Assert::equals('attribute', $c->getName());
+      Assert::true($c->hasAttribute('name'));
+      Assert::equals('key', $c->getAttribute('name'));
+      Assert::equals(0, sizeof($c->getChildren()));
+      Assert::equals('value', $c->getContent());
     }
   }
   
@@ -78,10 +74,10 @@ public function fromStringEncodingIso88591() {
       <document><node>Some umlauts: öäü</node></document>
     '));
     
-    $this->assertEquals('utf-8', $tree->getEncoding());
-    $this->assertEquals(1, sizeof($tree->root()->getChildren()));
-    $this->assertEquals('document', $tree->root()->getName());
-    $this->assertEquals('Some umlauts: öäü', $tree->root()->nodeAt(0)->getContent());
+    Assert::equals('utf-8', $tree->getEncoding());
+    Assert::equals(1, sizeof($tree->root()->getChildren()));
+    Assert::equals('document', $tree->root()->getName());
+    Assert::equals('Some umlauts: öäü', $tree->root()->nodeAt(0)->getContent());
   }
 
   #[Test]
@@ -90,18 +86,18 @@ public function fromStringEncodingUTF8() {
       <document><node>Some umlauts: öäü</node></document>
     ');
     
-    $this->assertEquals('utf-8', $tree->getEncoding());
-    $this->assertEquals(1, sizeof($tree->root()->getChildren()));
-    $this->assertEquals('document', $tree->root()->getName());
-    $this->assertEquals('Some umlauts: öäü', $tree->root()->nodeAt(0)->getContent());
+    Assert::equals('utf-8', $tree->getEncoding());
+    Assert::equals(1, sizeof($tree->root()->getChildren()));
+    Assert::equals('document', $tree->root()->getName());
+    Assert::equals('Some umlauts: öäü', $tree->root()->nodeAt(0)->getContent());
   }
 
   #[Test]
   public function singleElement() {
     $tree= Tree::fromString('<document empty="false">Content</document>');
-    $this->assertEquals(0, sizeof($tree->root()->getChildren()));
-    $this->assertEquals('Content', $tree->root()->getContent());
-    $this->assertEquals('false', $tree->root()->getAttribute('empty'));
+    Assert::equals(0, sizeof($tree->root()->getChildren()));
+    Assert::equals('Content', $tree->root()->getContent());
+    Assert::equals('false', $tree->root()->getAttribute('empty'));
   }
 
   #[Test, Expect(XMLFormatException::class)]
@@ -114,8 +110,8 @@ public function utf8Encoding() {
     $t= (new Tree('unicode'))->withEncoding('UTF-8');
     $t->root()->setContent('Hällo');
 
-    $this->assertEquals('<?xml version="1.0" encoding="UTF-8"?>', $t->getDeclaration());
-    $this->assertEquals('<unicode>Hällo</unicode>', $this->sourceOf($t));
+    Assert::equals('<?xml version="1.0" encoding="UTF-8"?>', $t->getDeclaration());
+    Assert::equals('<unicode>Hällo</unicode>', $this->sourceOf($t));
   }
 
   #[Test]
@@ -123,8 +119,8 @@ public function iso88591Encoding() {
     $t= (new Tree('unicode'))->withEncoding('iso-8859-1');
     $t->root()->setContent('Hällo');
 
-    $this->assertEquals('<?xml version="1.0" encoding="ISO-8859-1"?>', $t->getDeclaration());
-    $this->assertEquals(iconv(\xp::ENCODING, 'iso-8859-1', '<unicode>Hällo</unicode>'), $this->sourceOf($t));
+    Assert::equals('<?xml version="1.0" encoding="ISO-8859-1"?>', $t->getDeclaration());
+    Assert::equals(iconv(\xp::ENCODING, 'iso-8859-1', '<unicode>Hällo</unicode>'), $this->sourceOf($t));
   }
 
   #[Test, Ignore('Performance testing')]
@@ -149,10 +145,10 @@ public function parseIntoUtf8() {
       <document><node>Some umlauts: öäü</node></document>
     '));
     
-    $this->assertEquals('utf-8', $tree->getEncoding());
-    $this->assertEquals(1, sizeof($tree->root()->getChildren()));
-    $this->assertEquals('document', $tree->root()->getName());
-    $this->assertEquals('Some umlauts: öäü', $tree->root()->nodeAt(0)->getContent());
+    Assert::equals('utf-8', $tree->getEncoding());
+    Assert::equals(1, sizeof($tree->root()->getChildren()));
+    Assert::equals('document', $tree->root()->getName());
+    Assert::equals('Some umlauts: öäü', $tree->root()->nodeAt(0)->getContent());
   }
 
   #[Test]
@@ -163,15 +159,15 @@ public function parseIntoIso() {
       <document><node>Some umlauts: öäü</node></document>
     '));
     
-    $this->assertEquals('iso-8859-1', $tree->getEncoding());
-    $this->assertEquals(1, sizeof($tree->root()->getChildren()));
-    $this->assertEquals('document', $tree->root()->getName());
-    $this->assertEquals('Some umlauts: öäü', $tree->root()->nodeAt(0)->getContent());
+    Assert::equals('iso-8859-1', $tree->getEncoding());
+    Assert::equals(1, sizeof($tree->root()->getChildren()));
+    Assert::equals('document', $tree->root()->getName());
+    Assert::equals('Some umlauts: öäü', $tree->root()->nodeAt(0)->getContent());
   }
 
   #[Test]
   public function as_string() {
-    $this->assertEquals(
+    Assert::equals(
       "xml.Tree(version=1.0 encoding=utf-8)@{\n".
       "  xml.Node(doc) { }\n".
       "}",
diff --git a/src/test/php/xml/unittest/UnmarshallerTest.class.php b/src/test/php/xml/unittest/UnmarshallerTest.class.php
index b9d83689..0e77ad98 100755
--- a/src/test/php/xml/unittest/UnmarshallerTest.class.php
+++ b/src/test/php/xml/unittest/UnmarshallerTest.class.php
@@ -1,25 +1,21 @@
 <?php namespace xml\unittest;
- 
+
 use io\streams\MemoryInputStream;
 use lang\IllegalArgumentException;
 use lang\reflect\TargetInvocationException;
-use unittest\{Expect, Test, TestCase};
+use unittest\{Assert, Before, Expect, Test, TestCase};
 use xml\XMLFormatException;
 use xml\meta\Unmarshaller;
 use xml\parser\StreamInputSource;
 use xml\unittest\{ApplicationType, ButtonType, DialogType, TextInputType};
 
-/**
- * Test Unmarshaller API
- *
- * @see    xp://xml.meta.Unmarshaller
- */
-class UnmarshallerTest extends TestCase {
+class UnmarshallerTest {
   protected $fixture= null;
 
   /**
    * Creates fixture
    */
+  #[Before]
   public function setUp() {
     $this->fixture= new Unmarshaller();
   }
@@ -32,8 +28,8 @@ public function idAttribute() {
       </dialogtype>')),
       'xml.unittest.DialogType'
     );
-    $this->assertInstanceOf(DialogType::class, $dialog);
-    $this->assertEquals('file.open', $dialog->getId());
+    Assert::instance(DialogType::class, $dialog);
+    Assert::equals('file.open', $dialog->getId());
   }
 
   #[Test]
@@ -44,8 +40,8 @@ public function captionNode() {
       </dialogtype>')),
       'xml.unittest.DialogType'
     );
-    $this->assertInstanceOf(DialogType::class, $dialog);
-    $this->assertEquals('Open a file > Choose', $dialog->getCaption());
+    Assert::instance(DialogType::class, $dialog);
+    Assert::equals('Open a file > Choose', $dialog->getCaption());
   }
   
   #[Test]
@@ -58,17 +54,17 @@ public function buttonsNodeSet() {
       </dialogtype>')), 
       'xml.unittest.DialogType'
     );
-    $this->assertInstanceOf(DialogType::class, $dialog);
-    $this->assertTrue($dialog->hasButtons());
-    $this->assertEquals(2, $dialog->numButtons());
+    Assert::instance(DialogType::class, $dialog);
+    Assert::true($dialog->hasButtons());
+    Assert::equals(2, $dialog->numButtons());
 
     with ($ok= $dialog->buttonAt(0), $cancel= $dialog->buttonAt(1)); {
-      $this->assertInstanceOf(ButtonType::class, $ok);
-      $this->assertInstanceOf(ButtonType::class, $cancel);
-      $this->assertEquals('ok', $ok->getId());
-      $this->assertEquals('cancel', $cancel->getId());
-      $this->assertEquals('Yes, go ahead', $ok->getCaption());
-      $this->assertEquals('No, please don\'t!', $cancel->getCaption());
+      Assert::instance(ButtonType::class, $ok);
+      Assert::instance(ButtonType::class, $cancel);
+      Assert::equals('ok', $ok->getId());
+      Assert::equals('cancel', $cancel->getId());
+      Assert::equals('Yes, go ahead', $ok->getCaption());
+      Assert::equals('No, please don\'t!', $cancel->getCaption());
     }
   }
   
@@ -80,8 +76,8 @@ public function usingPassWithScalars() {
       </dialogtype>')), 
       'xml.unittest.DialogType'
     );
-    $this->assertInstanceOf(DialogType::class, $dialog);
-    $this->assertEquals(['ON_TOP', 'MODAL'], $dialog->getFlags());
+    Assert::instance(DialogType::class, $dialog);
+    Assert::equals(['ON_TOP', 'MODAL'], $dialog->getFlags());
   }
   
   #[Test]
@@ -95,8 +91,8 @@ public function usingPassWithNodes() {
       </dialogtype>')), 
       'xml.unittest.DialogType'
     );
-    $this->assertInstanceOf(DialogType::class, $dialog);
-    $this->assertEquals([
+    Assert::instance(DialogType::class, $dialog);
+    Assert::equals([
       'width' => '100',
       'height' => '100'
     ], $dialog->getOptions());
@@ -108,8 +104,8 @@ public function unmarshallingAnInputStream() {
       new StreamInputSource(new MemoryInputStream('<dialogtype id="stream.select"/>'), 'memory'),
       'xml.unittest.DialogType'
     );
-    $this->assertInstanceOf(DialogType::class, $dialog);
-    $this->assertEquals('stream.select', $dialog->getId());
+    Assert::instance(DialogType::class, $dialog);
+    Assert::equals('stream.select', $dialog->getId());
   }
 
   #[Test, Expect(XMLFormatException::class)]
@@ -132,7 +128,7 @@ public function emptyStream() {
   public function deprecatedUsage() {
     $xml= '<dialogtype id="file.open"/>';
     $type= 'xml.unittest.DialogType';
-    $this->assertEquals(
+    Assert::equals(
       Unmarshaller::unmarshal($xml, $type),
       $this->fixture->unmarshalFrom(new StreamInputSource(new MemoryInputStream($xml)), $type)
     );
@@ -160,7 +156,7 @@ public function nameBasedFactoryToDialog() {
       new StreamInputSource(new MemoryInputStream('<dialog/>')),
       'xml.unittest.NameBasedTypeFactory'
     );
-    $this->assertInstanceOf(DialogType::class, $object);
+    Assert::instance(DialogType::class, $object);
   }
 
   #[Test]
@@ -169,7 +165,7 @@ public function nameBasedFactoryToButton() {
       new StreamInputSource(new MemoryInputStream('<button/>')),
       'xml.unittest.NameBasedTypeFactory'
     );
-    $this->assertInstanceOf(ButtonType::class, $object);
+    Assert::instance(ButtonType::class, $object);
   }
 
   #[Test, Expect(TargetInvocationException::class)]
@@ -186,7 +182,7 @@ public function idBasedFactoryToDialog() {
       new StreamInputSource(new MemoryInputStream('<object id="dialog"/>')),
       'xml.unittest.IdBasedTypeFactory'
     );
-    $this->assertInstanceOf(DialogType::class, $object);
+    Assert::instance(DialogType::class, $object);
   }
 
   #[Test]
@@ -195,7 +191,7 @@ public function idBasedFactoryToButton() {
       new StreamInputSource(new MemoryInputStream('<object id="button"/>')),
       'xml.unittest.IdBasedTypeFactory'
     );
-    $this->assertInstanceOf(ButtonType::class, $object);
+    Assert::instance(ButtonType::class, $object);
   }
 
   #[Test, Expect(TargetInvocationException::class)]
@@ -216,7 +212,7 @@ public function inject() {
         'desktop'  => 0
       ]]
     );
-    $this->assertEquals(1, $window->getOwnerWindow());
+    Assert::equals(1, $window->getOwnerWindow());
   }
 
   #[Test, Expect(IllegalArgumentException::class)]
@@ -233,7 +229,7 @@ public function namespaces() {
       new StreamInputSource(new MemoryInputStream('<app:application xmlns:app="http://projects.xp-framework.net/xmlns/app"/>')),
       'xml.unittest.ApplicationType'
     );
-    $this->assertInstanceOf(ApplicationType::class, $app);
+    Assert::instance(ApplicationType::class, $app);
   }
 
   #[Test]
@@ -242,7 +238,7 @@ public function casting() {
       new StreamInputSource(new MemoryInputStream('<input id="name" disabled="true"/>')),
       'xml.unittest.TextInputType'
     );
-    $this->assertInstanceOf(TextInputType::class, $t);
-    $this->assertTrue($t->getDisabled());
+    Assert::instance(TextInputType::class, $t);
+    Assert::true($t->getDisabled());
   }
 }
\ No newline at end of file
diff --git a/src/test/php/xml/unittest/WindowType.class.php b/src/test/php/xml/unittest/WindowType.class.php
index cb430ba3..4de65938 100755
--- a/src/test/php/xml/unittest/WindowType.class.php
+++ b/src/test/php/xml/unittest/WindowType.class.php
@@ -2,12 +2,6 @@
 
 use xml\{Xmlfactory, Xmlmapping};
 
-/**
- * Test class for Marshaller / Unmarshaller tests
- *
- * @see  xp://xml.unittest.UnmarshallerTest
- * @see  xp://xml.unittest.MarshallerTest
- */
 class WindowType {
   protected $window= null;
 
diff --git a/src/test/php/xml/unittest/XPathTest.class.php b/src/test/php/xml/unittest/XPathTest.class.php
index 610a47d2..049bcf10 100755
--- a/src/test/php/xml/unittest/XPathTest.class.php
+++ b/src/test/php/xml/unittest/XPathTest.class.php
@@ -1,16 +1,12 @@
 <?php namespace xml\unittest;
 
 use lang\IllegalArgumentException;
+use unittest\Assert;
 use unittest\actions\RuntimeVersion;
 use unittest\{Expect, Test};
 use xml\{Node, Tree, XMLFormatException, XPath, XPathException};
 
-/**
- * TestCase for XPath class
- *
- * @see  xp://xml.XPath
- */
-class XPathTest extends \unittest\TestCase {
+class XPathTest {
 
   /**
    * Returns an XML tree for use in further test cases
@@ -61,7 +57,7 @@ public function constructWithSyntaxErrorInAttribute() {
   
   #[Test]
   public function queryReturnsNodeList() {
-    $this->assertInstanceOf(
+    Assert::instance(
       'DOMNodeList',
       (new XPath('<document/>'))->query('/')
     );
@@ -69,7 +65,7 @@ public function queryReturnsNodeList() {
 
   #[Test]
   public function slashQueryReturnsDocument() {
-    $this->assertInstanceOf(
+    Assert::instance(
       'DOMDocument',
       (new XPath('<document/>'))->query('/')->item(0)
     );
@@ -77,7 +73,7 @@ public function slashQueryReturnsDocument() {
   
   #[Test]
   public function attributeQuery() {
-    $this->assertEquals('1549', (new XPath($this->personTree()))
+    Assert::equals('1549', (new XPath($this->personTree()))
       ->query('/person/@id')
       ->item(0)
       ->nodeValue
@@ -86,14 +82,14 @@ public function attributeQuery() {
 
   #[Test]
   public function attributeName() {
-    $this->assertEquals('id', (new XPath($this->personTree()))
+    Assert::equals('id', (new XPath($this->personTree()))
       ->query('name(/person/@id)')
     );
   }
 
   #[Test]
   public function textQuery() {
-    $this->assertEquals('Timm', (new XPath($this->personTree()))
+    Assert::equals('Timm', (new XPath($this->personTree()))
       ->query('/person/firstName/text()')
       ->item(0)
       ->nodeValue
@@ -102,14 +98,14 @@ public function textQuery() {
 
   #[Test]
   public function nameQuery() {
-    $this->assertEquals('firstName', (new XPath($this->personTree()))
+    Assert::equals('firstName', (new XPath($this->personTree()))
       ->query('name(/person/firstName)')
     );
   }
 
   #[Test]
   public function stringQuery() {
-    $this->assertEquals('Timm', (new XPath($this->personTree()))
+    Assert::equals('Timm', (new XPath($this->personTree()))
       ->query('string(/person/firstName)')
     );
   }
@@ -118,13 +114,13 @@ public function stringQuery() {
   public function multipleQuery() {
     $locations= (new XPath($this->personTree()))->query('/person/location');
     
-    $this->assertEquals('Karlsruhe', $locations->item(0)->nodeValue);
-    $this->assertEquals('Germany', $locations->item(1)->nodeValue);
+    Assert::equals('Karlsruhe', $locations->item(0)->nodeValue);
+    Assert::equals('Germany', $locations->item(1)->nodeValue);
   }
 
   #[Test]
   public function offsetQuery() {
-    $this->assertEquals('Karlsruhe', (new XPath($this->personTree()))
+    Assert::equals('Karlsruhe', (new XPath($this->personTree()))
       ->query('string(/person/location[1])')
     );
   }
@@ -137,7 +133,7 @@ public function invalidQuery() {
   #[Test]
   public function queryTree() {
     $xpath= new XPath(Tree::fromString('<document><node>value</node></document>'));
-    $this->assertEquals('value', $xpath->query('string(/document/node)'));
+    Assert::equals('value', $xpath->query('string(/document/node)'));
   }
   
   #[Test]
@@ -147,12 +143,12 @@ public function queryTreeWithEncoding() {
       '<document><node>%s</node></document>',
       iconv(\xp::ENCODING, 'iso-8859-1', 'öäü')
     )));
-    $this->assertEquals('öäü', $xpath->query('string(/document/node)'));
+    Assert::equals('öäü', $xpath->query('string(/document/node)'));
   }
   
   #[Test]
   public function queryTreeWithDefaultEncoding() {
     $xpath= new XPath('<document><node>öäü</node></document>');
-    $this->assertEquals('öäü', $xpath->query('string(/document/node)'));
+    Assert::equals('öäü', $xpath->query('string(/document/node)'));
   }
 }
\ No newline at end of file
diff --git a/src/test/php/xml/unittest/XslCallbackTest.class.php b/src/test/php/xml/unittest/XslCallbackTest.class.php
index 0112fd03..7283c592 100755
--- a/src/test/php/xml/unittest/XslCallbackTest.class.php
+++ b/src/test/php/xml/unittest/XslCallbackTest.class.php
@@ -1,20 +1,14 @@
 <?php namespace xml\unittest;
 
 use lang\{ElementNotFoundException, IllegalArgumentException};
+use unittest\Assert;
 use unittest\actions\ExtensionAvailable;
-use unittest\{Expect, Action, Test, TestCase};
+use unittest\{Action, Expect, Test, TestCase};
 use util\Date;
 use xml\{DomXSLProcessor, Node, XSLCallback, Xslmethod};
 
-/**
- * TestCase for XSL callbacks
- *
- * @see   xp://xml.XSLCallback
- * @see   xp://xml.xslt.XSLDateCallback
- * @see   xp://xml.xslt.XSLStringCallback
- */
 #[Action(eval: '[new ExtensionAvailable("dom"), new ExtensionAvailable("xsl")]')]
-class XslCallbackTest extends TestCase {
+class XslCallbackTest {
 
   /**
    * Runs a transformation
@@ -76,7 +70,7 @@ public function uberCoder($in) {
   
   #[Test]
   public function callSayHello() {
-    $this->assertEquals('Hello Test', $this->runTransformation(
+    Assert::equals('Hello Test', $this->runTransformation(
       '<document/>', 
       'this::sayHello',
       ["'Test'"]
@@ -85,7 +79,7 @@ public function callSayHello() {
 
   #[Test]
   public function callUberCoderFromUtf8XmlAndUtf8Xsl() {
-    $this->assertEquals('Übercoder=Übercoder', $this->runTransformation(
+    Assert::equals('Übercoder=Übercoder', $this->runTransformation(
       '<?xml version="1.0" encoding="utf-8"?><document/>', 
       'this::uberCoder',
       ["'Übercoder'"],
@@ -95,7 +89,7 @@ public function callUberCoderFromUtf8XmlAndUtf8Xsl() {
 
   #[Test]
   public function callUberCoderFromIso88591XmlAndUtf8Xsl() {
-    $this->assertEquals('Übercoder=Übercoder', $this->runTransformation(
+    Assert::equals('Übercoder=Übercoder', $this->runTransformation(
       '<?xml version="1.0" encoding="iso-8859-1"?><document/>', 
       'this::uberCoder',
       ["'Übercoder'"],
@@ -105,7 +99,7 @@ public function callUberCoderFromIso88591XmlAndUtf8Xsl() {
 
   #[Test]
   public function callUberCoderFromUtf8XmlAndIso88591Xsl() {
-    $this->assertEquals('Übercoder=Übercoder', $this->runTransformation(
+    Assert::equals('Übercoder=Übercoder', $this->runTransformation(
       '<?xml version="1.0" encoding="utf-8"?><document/>', 
       'this::uberCoder',
       [iconv(\xp::ENCODING, 'iso-8859-1', "'Übercoder'")],
@@ -115,7 +109,7 @@ public function callUberCoderFromUtf8XmlAndIso88591Xsl() {
 
   #[Test]
   public function callUberCoderFromIso88591XmlAndIso88591Xsl() {
-    $this->assertEquals('Übercoder=Übercoder', $this->runTransformation(
+    Assert::equals('Übercoder=Übercoder', $this->runTransformation(
       '<?xml version="1.0" encoding="iso-8859-1"?><document/>', 
       'this::uberCoder',
       [iconv(\xp::ENCODING, 'iso-8859-1', "'Übercoder'")],
@@ -125,7 +119,7 @@ public function callUberCoderFromIso88591XmlAndIso88591Xsl() {
 
   #[Test]
   public function callSayHelloOmittingOptionalParameter() {
-    $this->assertEquals('Hello World', $this->runTransformation(
+    Assert::equals('Hello World', $this->runTransformation(
       '<document/>', 
       'this::sayHello',
       []
@@ -150,7 +144,7 @@ public function callNonExistantMethod() {
   #[Test]
   public function dateFormatCallback() {
     $date= new Date('2009-09-20 21:33:00');
-    $this->assertEquals($date->toString('Y-m-d H:i:s T'), $this->runTransformation(
+    Assert::equals($date->toString('Y-m-d H:i:s T'), $this->runTransformation(
       Node::fromObject($date, 'date')->getSource(),
       'xp.date::format',
       ['string(/date/value)', "'Y-m-d H:i:s T'"]
@@ -161,7 +155,7 @@ public function dateFormatCallback() {
   public function dateFormatCallbackWithTZ() {
     $date= new Date('2009-09-20 21:33:00');
     $tz= new \util\TimeZone('Australia/Sydney');
-    $this->assertEquals($date->toString('Y-m-d H:i:s T', $tz), $this->runTransformation(
+    Assert::equals($date->toString('Y-m-d H:i:s T', $tz), $this->runTransformation(
       Node::fromObject($date, 'date')->getSource(),
       'xp.date::format',
       ['string(/date/value)', "'Y-m-d H:i:s T'", "'".$tz->name()."'"]
@@ -171,7 +165,7 @@ public function dateFormatCallbackWithTZ() {
   #[Test]
   public function dateFormatCallbackWithEmptyTZ() {
     $date= new Date('2009-09-20 21:33:00');
-    $this->assertEquals($date->toString('Y-m-d H:i:s T'), $this->runTransformation(
+    Assert::equals($date->toString('Y-m-d H:i:s T'), $this->runTransformation(
       Node::fromObject($date, 'date')->getSource(),
       'xp.date::format',
       ['string(/date/value)', "'Y-m-d H:i:s T'", "''"]
@@ -181,7 +175,7 @@ public function dateFormatCallbackWithEmptyTZ() {
   #[Test]
   public function dateFormatCallbackWithoutTZ() {
     $date= new Date('2009-09-20 21:33:00');
-    $this->assertEquals($date->toString('Y-m-d H:i:s T'), $this->runTransformation(
+    Assert::equals($date->toString('Y-m-d H:i:s T'), $this->runTransformation(
       Node::fromObject($date, 'date')->getSource(),
       'xp.date::format',
       ['string(/date/value)', "'Y-m-d H:i:s T'"]
@@ -190,7 +184,7 @@ public function dateFormatCallbackWithoutTZ() {
 
   #[Test]
   public function stringUrlencodeCallback() {
-    $this->assertEquals('a+%26+b%3F', $this->runTransformation(
+    Assert::equals('a+%26+b%3F', $this->runTransformation(
       '<url>a &amp; b?</url>',
       'xp.string::urlencode',
       ['string(/)']
@@ -199,7 +193,7 @@ public function stringUrlencodeCallback() {
 
   #[Test]
   public function stringUrldecodeCallback() {
-    $this->assertEquals('a & b?', $this->runTransformation(
+    Assert::equals('a & b?', $this->runTransformation(
       '<url>a+%26+b%3F</url>',
       'xp.string::urldecode',
       ['string(/)']
@@ -208,7 +202,7 @@ public function stringUrldecodeCallback() {
 
   #[Test]
   public function stringReplaceCallback() {
-    $this->assertEquals('Hello World!', $this->runTransformation(
+    Assert::equals('Hello World!', $this->runTransformation(
       '<string>Hello Test!</string>',
       'xp.string::replace',
       ['string(/)', "'Test'", "'World'"]
@@ -217,7 +211,7 @@ public function stringReplaceCallback() {
 
   #[Test]
   public function stringNl2BrCallback() {
-    $this->assertEquals("Line 1<br />\nLine 2", $this->runTransformation(
+    Assert::equals("Line 1<br />\nLine 2", $this->runTransformation(
       "<string>Line 1\nLine 2</string>",
       'xp.string::nl2br',
       ['string(/)']
diff --git a/src/test/php/xml/unittest/io/XmlStreamWriterTest.class.php b/src/test/php/xml/unittest/io/XmlStreamWriterTest.class.php
index 13c952c8..4efb0056 100755
--- a/src/test/php/xml/unittest/io/XmlStreamWriterTest.class.php
+++ b/src/test/php/xml/unittest/io/XmlStreamWriterTest.class.php
@@ -2,293 +2,317 @@
 
 use io\streams\MemoryOutputStream;
 use lang\IllegalStateException;
-use unittest\{Expect, Test, TestCase};
+use unittest\{Assert, Before, Expect, Test, TestCase};
 use xml\io\XmlStreamWriter;
 
-class XmlStreamWriterTest extends TestCase {
-  protected $out= null;
-  protected $writer= null;
+class XmlStreamWriterTest {
 
-  /** @return void */
-  public function setUp() {
-    $this->out= new MemoryOutputStream();
-    $this->writer= new XmlStreamWriter($this->out);
+  /** @return xml.io.XmlStreamWriter */
+  private function newFixture() {
+    return new XmlStreamWriter(new MemoryOutputStream());
   }
   
   #[Test]
   public function startIso88591Document() {
-    $this->writer->startDocument('1.0', 'iso-8859-1');
-    $this->assertEquals(
+    $writer= $this->newFixture();
+    $writer->startDocument('1.0', 'iso-8859-1');
+    Assert::equals(
       '<?xml version="1.0" encoding="iso-8859-1"?>', 
-      $this->out->bytes()
+      $writer->out()->bytes()
     );
   }
 
   #[Test]
   public function startUtf8Document() {
-    $this->writer->startDocument('1.0', 'utf-8');
-    $this->assertEquals(
+    $writer= $this->newFixture();
+    $writer->startDocument('1.0', 'utf-8');
+    Assert::equals(
       '<?xml version="1.0" encoding="utf-8"?>', 
-      $this->out->bytes()
+      $writer->out()->bytes()
     );
   }
 
   #[Test]
   public function standaloneDocument() {
-    $this->writer->startDocument('1.0', 'iso-8859-1', true);
-    $this->assertEquals(
+    $writer= $this->newFixture();
+    $writer->startDocument('1.0', 'iso-8859-1', true);
+    Assert::equals(
       '<?xml version="1.0" encoding="iso-8859-1" standalone="yes"?>', 
-      $this->out->bytes()
+      $writer->out()->bytes()
     );
   }
 
   #[Test]
   public function startElement() {
-    $this->writer->startElement('book');
-    $this->assertEquals(
+    $writer= $this->newFixture();
+    $writer->startElement('book');
+    Assert::equals(
       '<book>', 
-      $this->out->bytes()
+      $writer->out()->bytes()
     );
   }
 
   #[Test]
   public function startElementWithAttribute() {
-    $this->writer->startElement('book', ['isbn' => '978-3-86680-192-9']);
-    $this->assertEquals(
+    $writer= $this->newFixture();
+    $writer->startElement('book', ['isbn' => '978-3-86680-192-9']);
+    Assert::equals(
       '<book isbn="978-3-86680-192-9">', 
-      $this->out->bytes()
+      $writer->out()->bytes()
     );
   }
 
   #[Test]
   public function startElementWithAttributes() {
-    $this->writer->startElement('book', ['isbn' => '978-3-86680-192-9', 'authors' => 'Timm & Alex']);
-    $this->assertEquals(
+    $writer= $this->newFixture();
+    $writer->startElement('book', ['isbn' => '978-3-86680-192-9', 'authors' => 'Timm & Alex']);
+    Assert::equals(
       '<book isbn="978-3-86680-192-9" authors="Timm &amp; Alex">', 
-      $this->out->bytes()
+      $writer->out()->bytes()
     );
   }
 
   #[Test]
   public function closeElement() {
-    $this->writer->startElement('book');
-    $this->writer->closeElement();
-    $this->assertEquals(
+    $writer= $this->newFixture();
+    $writer->startElement('book');
+    $writer->closeElement();
+    Assert::equals(
       '<book></book>', 
-      $this->out->bytes()
+      $writer->out()->bytes()
     );
   }
 
   #[Test]
   public function closeElements() {
-    $this->writer->startElement('book');
-    $this->writer->startElement('author');
-    $this->writer->closeElement();
-    $this->writer->closeElement();
-    $this->assertEquals(
+    $writer= $this->newFixture();
+    $writer->startElement('book');
+    $writer->startElement('author');
+    $writer->closeElement();
+    $writer->closeElement();
+    Assert::equals(
       '<book><author></author></book>', 
-      $this->out->bytes()
+      $writer->out()->bytes()
     );
   }
 
   #[Test]
   public function startComment() {
-    $this->writer->startComment();
-    $this->assertEquals(
+    $writer= $this->newFixture();
+    $writer->startComment();
+    Assert::equals(
       '<!--', 
-      $this->out->bytes()
+      $writer->out()->bytes()
     );
   }
 
   #[Test]
   public function closeComment() {
-    $this->writer->startComment();
-    $this->writer->closeComment();
-    $this->assertEquals(
+    $writer= $this->newFixture();
+    $writer->startComment();
+    $writer->closeComment();
+    Assert::equals(
       '<!---->', 
-      $this->out->bytes()
+      $writer->out()->bytes()
     );
   }
 
   #[Test]
   public function startCData() {
-    $this->writer->startCData();
-    $this->assertEquals(
+    $writer= $this->newFixture();
+    $writer->startCData();
+    Assert::equals(
       '<![CDATA[', 
-      $this->out->bytes()
+      $writer->out()->bytes()
     );
   }
 
   #[Test]
   public function closeCData() {
-    $this->writer->startCData();
-    $this->writer->closeCData();
-    $this->assertEquals(
+    $writer= $this->newFixture();
+    $writer->startCData();
+    $writer->closeCData();
+    Assert::equals(
       '<![CDATA[]]>', 
-      $this->out->bytes()
+      $writer->out()->bytes()
     );
   }
 
   #[Test]
   public function startPI() {
-    $this->writer->startPI('php');
-    $this->assertEquals(
+    $writer= $this->newFixture();
+    $writer->startPI('php');
+    Assert::equals(
       '<?php ', 
-      $this->out->bytes()
+      $writer->out()->bytes()
     );
   }
 
   #[Test]
   public function closePI() {
-    $this->writer->startPI('php');
-    $this->writer->closePI();
-    $this->assertEquals(
+    $writer= $this->newFixture();
+    $writer->startPI('php');
+    $writer->closePI();
+    Assert::equals(
       '<?php ?>', 
-      $this->out->bytes()
+      $writer->out()->bytes()
     );
   }
 
   #[Test]
   public function writeText() {
-    $this->writer->startElement('book');
-    $this->writer->writeText('Hello & World');
-    $this->writer->closeElement();
-    $this->assertEquals(
+    $writer= $this->newFixture();
+    $writer->startElement('book');
+    $writer->writeText('Hello & World');
+    $writer->closeElement();
+    Assert::equals(
       '<book>Hello &amp; World</book>', 
-      $this->out->bytes()
+      $writer->out()->bytes()
     );
   }
 
   #[Test]
   public function writeCData() {
-    $this->writer->startElement('book');
-    $this->writer->writeCData('Hello & World');
-    $this->writer->closeElement();
-    $this->assertEquals(
+    $writer= $this->newFixture();
+    $writer->startElement('book');
+    $writer->writeCData('Hello & World');
+    $writer->closeElement();
+    Assert::equals(
       '<book><![CDATA[Hello & World]]></book>', 
-      $this->out->bytes()
+      $writer->out()->bytes()
     );
   }
 
   #[Test]
   public function writeComment() {
-    $this->writer->startElement('book');
-    $this->writer->writeComment('Hello & World');
-    $this->writer->closeElement();
-    $this->assertEquals(
+    $writer= $this->newFixture();
+    $writer->startElement('book');
+    $writer->writeComment('Hello & World');
+    $writer->closeElement();
+    Assert::equals(
       '<book><!--Hello & World--></book>', 
-      $this->out->bytes()
+      $writer->out()->bytes()
     );
   }
 
   #[Test]
   public function writeCommentedNode() {
-    $this->writer->startElement('book');
-    $this->writer->startComment();
-    $this->writer->writeElement('author', 'Timm');
-    $this->writer->closeComment();
-    $this->writer->closeElement();
-    $this->assertEquals(
+    $writer= $this->newFixture();
+    $writer->startElement('book');
+    $writer->startComment();
+    $writer->writeElement('author', 'Timm');
+    $writer->closeComment();
+    $writer->closeElement();
+    Assert::equals(
       '<book><!--<author>Timm</author>--></book>', 
-      $this->out->bytes()
+      $writer->out()->bytes()
     );
   }
 
   #[Test]
   public function writeMarkup() {
-    $this->writer->startElement('markup');
-    $this->writer->writeText('This is ');
-    $this->writer->writeElement('b', 'really');
-    $this->writer->writeText(' important!');
-    $this->writer->closeElement();
-    $this->assertEquals(
+    $writer= $this->newFixture();
+    $writer->startElement('markup');
+    $writer->writeText('This is ');
+    $writer->writeElement('b', 'really');
+    $writer->writeText(' important!');
+    $writer->closeElement();
+    Assert::equals(
       '<markup>This is <b>really</b> important!</markup>', 
-      $this->out->bytes()
+      $writer->out()->bytes()
     );
   }
 
   #[Test]
   public function writePI() {
-    $this->writer->startElement('code');
-    $this->writer->writePI('php', 'echo "Hello World";');
-    $this->writer->closeElement();
-    $this->assertEquals(
+    $writer= $this->newFixture();
+    $writer->startElement('code');
+    $writer->writePI('php', 'echo "Hello World";');
+    $writer->closeElement();
+    Assert::equals(
       '<code><?php echo "Hello World";?></code>', 
-      $this->out->bytes()
+      $writer->out()->bytes()
     );
   }
 
   #[Test]
   public function writePIWithAttributes() {
-    $this->writer->writePI('xml-stylesheet', ['href' => 'template.xsl']);
-    $this->assertEquals(
+    $writer= $this->newFixture();
+    $writer->writePI('xml-stylesheet', ['href' => 'template.xsl']);
+    Assert::equals(
       '<?xml-stylesheet href="template.xsl"?>', 
-      $this->out->bytes()
+      $writer->out()->bytes()
     );
   }
 
   #[Test]
   public function writeCDataAndText() {
-    $this->writer->startElement('book');
-    $this->writer->writeText('Hello');
-    $this->writer->writeCData(' & ');
-    $this->writer->writeText('World');
-    $this->writer->closeElement();
-    $this->assertEquals(
+    $writer= $this->newFixture();
+    $writer->startElement('book');
+    $writer->writeText('Hello');
+    $writer->writeCData(' & ');
+    $writer->writeText('World');
+    $writer->closeElement();
+    Assert::equals(
       '<book>Hello<![CDATA[ & ]]>World</book>', 
-      $this->out->bytes()
+      $writer->out()->bytes()
     );
   }
 
   #[Test]
   public function writElement() {
-    $this->writer->writeElement('book', 'Hello & World', ['isbn' => '978-3-86680-192-9']);
-    $this->assertEquals(
+    $writer= $this->newFixture();
+    $writer->writeElement('book', 'Hello & World', ['isbn' => '978-3-86680-192-9']);
+    Assert::equals(
       '<book isbn="978-3-86680-192-9">Hello &amp; World</book>', 
-      $this->out->bytes()
+      $writer->out()->bytes()
     );
   }
 
   #[Test]
   public function writElementEmptyContent() {
-    $this->writer->writeElement('book');
-    $this->assertEquals(
+    $writer= $this->newFixture();
+    $writer->writeElement('book');
+    Assert::equals(
       '<book/>', 
-      $this->out->bytes()
+      $writer->out()->bytes()
     );
   }
 
   #[Test]
   public function endDocumentClosesAllElements() {
-    $this->writer->startElement('books');
-    $this->writer->startElement('book');
-    $this->writer->startElement('author');
+    $writer= $this->newFixture();
+    $writer->startElement('books');
+    $writer->startElement('book');
+    $writer->startElement('author');
 
-    $this->writer->closeDocument();
-    $this->assertEquals(
+    $writer->closeDocument();
+    Assert::equals(
       '<books><book><author></author></book></books>', 
-      $this->out->bytes()
+      $writer->out()->bytes()
     );
   }
 
   #[Test]
   public function endDocumentClosesComments() {
-    $this->writer->startElement('books');
-    $this->writer->startComment();
-    $this->writer->writeText('Nothing here yet');
+    $writer= $this->newFixture();
+    $writer->startElement('books');
+    $writer->startComment();
+    $writer->writeText('Nothing here yet');
 
-    $this->writer->closeDocument();
-    $this->assertEquals(
+    $writer->closeDocument();
+    Assert::equals(
       '<books><!--Nothing here yet--></books>', 
-      $this->out->bytes()
+      $writer->out()->bytes()
     );
   }
 
   #[Test, Expect(['class' => IllegalStateException::class, 'withMessage' => '/Incorrect nesting/'])]
   public function incorrectNesting() {
-    $this->writer->startElement('books');
-    $this->writer->startComment();
-    $this->writer->writeText('Nothing here yet');
-    $this->writer->closeElement();
+    $writer= $this->newFixture();
+    $writer->startElement('books');
+    $writer->startComment();
+    $writer->writeText('Nothing here yet');
+    $writer->closeElement();
   }
 }
\ No newline at end of file