Index: tests/level3/core/documentnormalizedocument03.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level3/core/documentnormalizedocument03.xml,v
retrieving revision 1.4
diff -u -r1.4 documentnormalizedocument03.xml
--- tests/level3/core/documentnormalizedocument03.xml	5 Jan 2004 08:27:13 -0000	1.4
+++ tests/level3/core/documentnormalizedocument03.xml	6 Jan 2004 18:03:38 -0000
@@ -21,45 +21,47 @@
 <title>documentnormalizedocument03</title>
 <creator>IBM</creator>
 <description>
-	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 
+	Appends a CDATASection to an ekenent.  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.
 </description>
 <contributor>Neil Delima</contributor>
 <date qualifier="created">2002-06-10</date>
 <subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-Core-20031107/core#Document3-normalizeDocument"/>
+<subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=416"/>
 </metadata>
 <implementationAttribute name="namespaceAware" value="true"/>
 <var name="doc" type="Document"/>
 <var name="elem" type="Element"/>
 <var name="newCdata" type="CDATASection"/>
 <var name="cdata" type="CDATASection"/>
-<var name="text" type="Text"/>
+<var name="text" type="Node"/>
 <var name="nodeName" type="DOMString"/>
+<var name="nodeValue" type="DOMString"/>
 <var name="appendedChild" type="Node"/>
 <var name="domConfig" type="DOMConfiguration"/>
-<!--
-<var name="nullUserData" type="DOMUserData" isNull="true"/>
--->
-<load var="doc" href="hc_staff" willBeModified="true"/>
-<createElement var="elem" obj="doc" tagName='"newElem"'/>
+<var name="pList" type="NodeList"/>
+<load var="doc" href="barfoo" willBeModified="true"/>
+<getElementsByTagName var="pList" obj="doc" tagname='"p"' interface="Document"/>
+<item var="elem" obj="pList" index="0" interface="NodeList"/>
 <createCDATASection var="newCdata" obj="doc" data='"CDATA"'/>
 <appendChild obj="elem" var="appendedChild" newChild="newCdata"/>
-<appendChild obj="doc" 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"/>
 <domConfig obj="doc" var="domConfig" interface="Document"/>
 <setParameter obj="domConfig" name='"cdata-sections"' value="true"/>
 <normalizeDocument obj="doc"/>
-<firstChild var="cdata" obj="elem" interface="Node"/>
+<getElementsByTagName var="pList" obj="doc" tagname='"p"' interface="Document"/>
+<item var="elem" obj="pList" index="0" interface="NodeList"/>
+<lastChild var="cdata" obj="elem" interface="Node"/>
 <nodeName var="nodeName" obj="cdata"/>
 <assertEquals actual="nodeName" expected='"#cdata-section"' id="documentnormalizedocument03_true" ignoreCase="false"/>
 <setParameter obj="domConfig" name='"cdata-sections"' value="false"/>
 <normalizeDocument obj="doc"/>
-<firstChild var="text" obj="elem" interface="Node"/>
+<getElementsByTagName var="pList" obj="doc" tagname='"p"' interface="Document"/>
+<item var="elem" obj="pList" index="0" interface="NodeList"/>
+<lastChild var="text" obj="elem" interface="Node"/>
 <nodeName var="nodeName" obj="text"/>
 <assertEquals actual="nodeName" expected='"#text"' id="documentnormalizedocument03_false" ignoreCase="false"/>
+<nodeValue var="nodeValue" obj="text"/>
+<assertEquals actual="nodeValue" expected='"barCDATA"' id="normalizedValue"/>
 </test> 
  
Index: tests/level3/core/documentnormalizedocument04.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level3/core/documentnormalizedocument04.xml,v
retrieving revision 1.5
diff -u -r1.5 documentnormalizedocument04.xml
--- tests/level3/core/documentnormalizedocument04.xml	6 Jan 2004 16:44:31 -0000	1.5
+++ tests/level3/core/documentnormalizedocument04.xml	6 Jan 2004 18:03:38 -0000
@@ -21,44 +21,41 @@
 <title>documentnormalizedocument04</title>
 <creator>IBM</creator>
 <description>
-	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.
+	Append a Comment node and normalize with "comments" set to false.
 </description>
 <contributor>Neil Delima</contributor>
 <date qualifier="created">2002-06-10</date>
 <subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-Core-20031107/core#Document3-normalizeDocument"/>
+<subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=416"/>
 </metadata>
-<implementationAttribute name="namespaceAware" value="true"/>
 <var name="doc" type="Document"/>
 <var name="elem" type="Element"/>
 <var name="newComment" type="Comment"/>
-<var name="comment" type="Comment"/>
+<var name="lastChild" type="Node"/>
 <var name="text" type="Text"/>
 <var name="nodeName" type="DOMString"/>
 <var name="appendedChild" type="Node"/>
 <var name="domConfig" type="DOMConfiguration"/>
-<!--
-<var name="nullUserData" type="DOMUserData" isNull="true"/>
--->
-<load var="doc" href="hc_staff" willBeModified="true"/>
-<createElement var="elem" obj="doc" tagName='"newElem"'/>
+<var name="pList" type="NodeList"/>
+<load var="doc" href="barfoo" willBeModified="true"/>
+<getElementsByTagName var="pList" obj="doc" tagname='"p"' interface="Document"/>
+<item var="elem" obj="pList" index="0" interface="NodeList"/>
 <createComment var="newComment" obj="doc" data='"COMMENT_NODE"'/>
 <appendChild obj="elem" var="appendedChild" newChild="newComment"/>
-<appendChild obj="doc" 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"/>
 <domConfig interface="Document" obj="doc" var="domConfig" />
 <setParameter obj="domConfig" name='"comments"' value="true"/>
 <normalizeDocument obj="doc"/>
-<firstChild var="comment" obj="elem" interface="Node"/>
-<nodeName var="nodeName" obj="comment"/>
+<getElementsByTagName var="pList" obj="doc" tagname='"p"' interface="Document"/>
+<item var="elem" obj="pList" index="0" interface="NodeList"/>
+<lastChild var="lastChild" obj="elem" interface="Node"/>
+<nodeName var="nodeName" obj="lastChild"/>
 <assertEquals actual="nodeName" expected='"#comment"' id="documentnormalizedocument04_true" ignoreCase="false"/>
 <setParameter obj="domConfig" name='"comments"' value="false"/>
 <normalizeDocument obj="doc"/>
-<firstChild var="comment" obj="elem" interface="Node"/>
-<assertNull actual="comment" id="documentnormalizedocument04_false"/>
+<getElementsByTagName var="pList" obj="doc" tagname='"p"' interface="Document"/>
+<item var="elem" obj="pList" index="0" interface="NodeList"/>
+<lastChild var="lastChild" obj="elem" interface="Node"/>
+<nodeName var="nodeName" obj="lastChild"/>
+<assertEquals actual="nodeName" expected='"#text"' id="documentnormalizedocument04_true" ignoreCase="false"/>
 </test> 
  
\ No newline at end of file
Index: tests/level3/core/nodereplacechild12.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level3/core/nodereplacechild12.xml,v
retrieving revision 1.4
diff -u -r1.4 nodereplacechild12.xml
--- tests/level3/core/nodereplacechild12.xml	5 Jan 2004 08:27:13 -0000	1.4
+++ tests/level3/core/nodereplacechild12.xml	6 Jan 2004 18:03:38 -0000
@@ -21,33 +21,33 @@
 <title>nodereplacechild12</title>
 <creator>IBM</creator>
 <description>
-
-
-
-	Using replaceChild on this Document node attempt to replace a new ProcessingInstruction
-	node with new Elemet node and verify if the name of the replaced element Node.
+	Using replaceChild on this Document node, attempt to replace a new ProcessingInstruction
+	node with new Comment node.
 </description>
 <contributor>Neil Delima</contributor>
 <date qualifier="created">2002-06-10</date>
 <subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-Core-20031107/core#ID-785887307"/>
+<subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=416"/>
 </metadata>
-<implementationAttribute name="namespaceAware" value="true"/>
 <var name="doc" type="Document"/>
 <var name="pi" type="ProcessingInstruction"/>
-<var name="replaced" type="Element"/>
-<var name="elem" type="Element"/>
-<var name="childList" type="NodeList"/>
-<var name="namespaceURI" type="DOMString"/>
+<var name="replaced" type="Node"/>
+<var name="comment" type="Comment"/>
+<var name="lastChild" type="Node"/>
+<var name="nodeName" type="DOMString"/>
 <var name="replacedNode" type="Node"/>
 <var name="appendedChild" type="Node"/>
-<load var="doc" href="hc_staff" willBeModified="true"/>
-<createElementNS var="elem" obj="doc" namespaceURI='"http://www.w3.org/DOM/Test"' qualifiedName='"dom3:doc"'/>
+<load var="doc" href="barfoo" willBeModified="true"/>
+<createComment var="comment" obj="doc" data='"dom3:doc"'/>
 <createProcessingInstruction var="pi" obj="doc" target='"PITarget"' data='"PIData"'/>
-<appendChild obj="doc" var="appendedChild" newChild="elem"/>
+<appendChild obj="doc" var="appendedChild" newChild="comment"/>
 <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"/>
-<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"/>
+<replaceChild obj="doc" var="replacedNode" oldChild="pi" newChild="comment"/>
+<assertNotNull actual="replacedNode" id="returnValueNotNull"/>
+<nodeName var="nodeName" obj="replacedNode"/>
+<assertEquals actual="nodeName" expected='"PITarget"' id="returnValueIsPI"/>
+<lastChild var="lastChild" obj="doc" interface="Node"/>
+<assertNotNull actual="lastChild" id="lastChildNotNull"/>
+<nodeName var="nodeName" obj="lastChild"/>
+<assertEquals actual="nodeName" expected='"#comment"' id="lastChildIsComment"/>
 </test>