--- DOM-Test-Suite/tests/level3/core/nodereplacechild12.xml	9 Dec 2003 20:29:08 -0000	1.1
+++ DOM-Test-Suite/tests/level3/core/nodereplacechild12.xml	11 Dec 2003 19:59:22 -0000
@@ -33,6 +33,7 @@
 </metadata>
 <implementationAttribute name="namespaceAware" value="true"/>
 <var name="doc" type="Document"/>
+<var name="docEl" type="Element"/>
 <var name="pi" type="ProcessingInstruction"/>
 <var name="replaced" type="Element"/>
 <var name="elem" type="Element"/>
@@ -41,12 +42,13 @@
 <var name="replacedNode" type="Node"/>
 <var name="appendedChild" type="Node"/>
 <load var="doc" href="staffNS" willBeModified="false"/>
+<documentElement var="docEl" obj="doc" interface="Document"/>
 <createElementNS var="elem" obj="doc" namespaceURI='"http://www.w3.org/DOM/Test"' qualifiedName='"dom3:doc"'/>
 <createProcessingInstruction var="pi" obj="doc" target='"PITarget"' data='"PIData"'/>
-<appendChild obj="doc" var="appendedChild" newChild="elem"/>
-<appendChild obj="doc" var="appendedChild" newChild="pi"/>
-<replaceChild obj="doc" var="replacedNode" oldChild="pi" newChild="elem"/>
-<getElementsByTagNameNS var="childList" obj="doc" namespaceURI='"*"' localName='"doc"' interface="Document"/>
+<appendChild obj="docEl" var="appendedChild" newChild="elem"/>
+<appendChild obj="docEl" var="appendedChild" newChild="pi"/>
+<replaceChild obj="docEl" var="replacedNode" oldChild="pi" newChild="elem"/>
+<getElementsByTagNameNS var="childList" obj="docEl" namespaceURI='"*"' localName='"doc"' interface="Document"/>
 <item var="replaced" obj="childList" index="0" interface="NodeList"/>
 <namespaceURI obj="replaced" var="namespaceURI" interface="Node"/>
 <assertEquals actual="namespaceURI" expected='"http://www.w3.org/DOM/Test"' id="nodereplacechild12" ignoreCase="false"/>
--- DOM-Test-Suite/tests/level3/core/documentnormalizedocument04.xml	9 Dec 2003 20:29:09 -0000	1.1
+++ DOM-Test-Suite/tests/level3/core/documentnormalizedocument04.xml	11 Dec 2003 19:59:22 -0000
@@ -24,10 +24,9 @@
 	The normalizeDocument method method acts as if the document was going through a save 
 	and load cycle, putting the document in a "normal" form. 
 
-	Create an Element and a Comment node and verify the nodeName of this node and append these to
-	this Document.  Invoke the setNormalizationFeature method on this document to set the 
-	"cdata-sections"  feature to false.  Invoke the normalizeDocume method and verify if 
-	the CDATASection node has been transformed to a Text node.
+	Create an Element and a Comment node, verify the nodeName of this node and
+	append it to the documentElement. Normalize the document with and without the
+	"comments" feature, check that it is removed in the latter case.
 </description>
 <contributor>Neil Delima</contributor>
 <date qualifier="created">2002-06-10</date>
@@ -35,6 +34,7 @@
 </metadata>
 <implementationAttribute name="namespaceAware" value="true"/>
 <var name="doc" type="Document"/>
+<var name="docEl" type="Element"/>
 <var name="elem" type="Element"/>
 <var name="newComment" type="Comment"/>
 <var name="comment" type="Comment"/>
@@ -46,10 +46,11 @@
 <var name="nullUserData" type="DOMUserData" isNull="true"/>
 -->
 <load var="doc" href="staffNS" willBeModified="false"/>
+<documentElement var="docEl" obj="doc" interface="Document"/>
 <createElement var="elem" obj="doc" tagName='"newElem"'/>
 <createComment var="newComment" obj="doc" data='"COMMENT_NODE"'/>
 <appendChild obj="elem" var="appendedChild" newChild="newComment"/>
-<appendChild obj="doc" var="appendedChild" newChild="elem"/>
+<appendChild obj="docEl" var="appendedChild" newChild="elem"/>
 <firstChild var="comment" obj="elem" interface="Node"/>
 <nodeName var="nodeName" obj="comment"/>
 <assertEquals actual="nodeName" expected='"#comment"' id="documentnormalizedocument04" ignoreCase="false"/>
--- DOM-Test-Suite/tests/level3/core/documentnormalizedocument03.xml	9 Dec 2003 20:29:07 -0000	1.1
+++ DOM-Test-Suite/tests/level3/core/documentnormalizedocument03.xml	11 Dec 2003 19:59:22 -0000
@@ -24,10 +24,9 @@
 	The normalizeDocument method method acts as if the document was going through a save 
 	and load cycle, putting the document in a "normal" form. 
 
-	Create an Element and a CDATASection node and verify the nodeName of this node and append these to
-	this Document.  Invoke the setNormalizationFeature method on this document to set the 
-	"cdata-sections"  feature to false.  Invoke the normalizeDocume method and verify if 
-	the CDATASection node has been transformed to a Text node.
+	Create an Element and a CDATASection node, verify the nodeName of this node
+	and append it to the documentElement. Normalize the document with and without
+	"cdata-sections" feature, check that it is changed to a Text node in the latter case.
 </description>
 <contributor>Neil Delima</contributor>
 <date qualifier="created">2002-06-10</date>
@@ -35,6 +34,7 @@
 </metadata>
 <implementationAttribute name="namespaceAware" value="true"/>
 <var name="doc" type="Document"/>
+<var name="docEl" type="Element"/>
 <var name="elem" type="Element"/>
 <var name="newCdata" type="CDATASection"/>
 <var name="cdata" type="CDATASection"/>
@@ -46,10 +46,11 @@
 <var name="nullUserData" type="DOMUserData" isNull="true"/>
 -->
 <load var="doc" href="staffNS" willBeModified="false"/>
+<documentElement var="docEl" obj="doc" interface="Document"/>
 <createElement var="elem" obj="doc" tagName='"newElem"'/>
 <createCDATASection var="newCdata" obj="doc" data='"CDATA"'/>
 <appendChild obj="elem" var="appendedChild" newChild="newCdata"/>
-<appendChild obj="doc" var="appendedChild" newChild="elem"/>
+<appendChild obj="docEl" var="appendedChild" newChild="elem"/>
 <firstChild var="cdata" obj="elem" interface="Node"/>
 <nodeName var="nodeName" obj="cdata"/>
 <assertEquals actual="nodeName" expected='"#cdata-section"' id="documentnormalizedocument03" ignoreCase="false"/>