          $this->assertEquals('value', $c->getContent());
        }
      }
+@@ -104,7 +102,7 @@
+         <document><node>Some umlauts: </node></document>
+       ');
+       
+-      $this->assertEquals('ISO-8859-1', $tree->getEncoding());
++      $this->assertEquals('iso-8859-1', $tree->getEncoding());
+       $this->assertEquals(1, sizeof($tree->root->children));
+       $this->assertEquals('document', $tree->root->getName());
+       $this->assertEquals('Some umlauts: ', $tree->root->children[0]->getContent());
+@@ -120,7 +118,7 @@
+         <document><node>Some umlauts: öäü</node></document>
+       ');
+       
+-      $this->assertEquals('ISO-8859-1', $tree->getEncoding());
++      $this->assertEquals('iso-8859-1', $tree->getEncoding());
+       $this->assertEquals(1, sizeof($tree->root->children));
+       $this->assertEquals('document', $tree->root->getName());
+       $this->assertEquals('Some umlauts: ', $tree->root->children[0]->getContent());
 @@ -133,7 +131,7 @@
      #[@test]
      public function singleElement() {

-      $_cnt     = NULL,
-      $_cdata   = NULL,
-      $_objs    = NULL;
+    private 
+      $stack    = array();
 
     protected 
       $version  = '1.0',
@@ -97,11 +95,11 @@
     /**
      * Add a child to this tree
      *

===================================================================
--- skeleton/xml/Tree.class.php	(revision 14454)
+++ skeleton/xml/Tree.class.php	(working copy)
@@ -5,9 +5,10 @@
  */
  
   uses(
-    'xml.parser.XMLParser',
-    'xml.Node',
-    'xml.parser.ParserCallback'
+    'xml.parser.TreeParser',
+    'xml.parser.StreamInputSource',
+    'xml.parser.StringInputSource',
+    'xml.Node'
   );
  
   /**
@@ -15,19 +16,14 @@
    * to and imported from an XML document.
    *
    * @test     xp://net.xp_framework.unittest.xml.TreeTest
-   * @see      xp://xml.parser.XMLParser
+   * @see      xp://xml.parser.TreeParser
    * @purpose  Tree
    */
-  class Tree extends Object implements ParserCallback {
+  class Tree extends Object {
     public 
       $root     = NULL,
       $nodeType = NULL;
 
