diff --git a/mozilla/htmlparser/tests/outsinks/TestOutSinks b/mozilla/htmlparser/tests/outsinks/TestOutSinks
index 438b8d0e684..36bd714239b 100755
--- a/mozilla/htmlparser/tests/outsinks/TestOutSinks
+++ b/mozilla/htmlparser/tests/outsinks/TestOutSinks
@@ -28,27 +28,27 @@
 set errmsg = ""
 
 echo "Testing simple html to html ..."
-TestOutput -i text/html -o text/html -c OutTestData/simple.html OutTestData/simple.html
+TestOutput -i text/html -o text/html -f 0 -c OutTestData/simple.html OutTestData/simple.html
 if ($status != 0) then
   echo "Simple html to html failed.\n"
   set errmsg = ($errmsg "simple.html")
 endif
 
-echo "Testing simple copy cases ..."
+echo "Testing simple copy case ..."
 TestOutput -i text/html -o text/plain -f 0 -w 0 -c OutTestData/simplecopy.out OutTestData/simple.html
 if ($status != 0) then
   echo "Simple copy test failed.\n"
-  set errmsg = ($errmsg "simple.out")
+  set errmsg = ($errmsg "simplecopy.out")
 endif
 
 echo "Testing non-wrapped plaintext ..."
-TestOutput -i text/html -o text/plain -w 0 -c OutTestData/plainnowrap.out OutTestData/plain.html
+TestOutput -i text/html -o text/plain -f 0 -w 0 -c OutTestData/plainnowrap.out OutTestData/plain.html
 if ($status != 0) then
   echo "Non-wrapped plaintext test failed."
   set errmsg = ($errmsg "plainnowrap.out")
 endif
 
-echo "Testing wrapped plaintext ..."
+echo "Testing wrapped bug unformatted plaintext ..."
 TestOutput -i text/html -o text/plain -f 32 -w 50 -c OutTestData/plainwrap.out OutTestData/plain.html
 if ($status != 0) then
   echo "Wrapped plaintext test failed."
diff --git a/mozilla/htmlparser/tests/outsinks/simple.html b/mozilla/htmlparser/tests/outsinks/simple.html
index 2df7cbceacb..4a272a672ca 100644
--- a/mozilla/htmlparser/tests/outsinks/simple.html
+++ b/mozilla/htmlparser/tests/outsinks/simple.html
@@ -33,8 +33,7 @@ Here is some <u>underlined and <b>bold</b>ened</u>ified text.
 <p>
 Here is a line ending with a space
 followed by a line break.
-The output should contain only one space (and no line breaks) between "space" and "followed".
+Plaintext output should contain only one space (and no line breaks) between "space" and "followed".
 </p>
 
-</body>
-</html>
+</body></html>
diff --git a/mozilla/htmlparser/tests/outsinks/simplecopy.out b/mozilla/htmlparser/tests/outsinks/simplecopy.out
index 1af024da5e0..38227545f15 100644
--- a/mozilla/htmlparser/tests/outsinks/simplecopy.out
+++ b/mozilla/htmlparser/tests/outsinks/simplecopy.out
@@ -1,3 +1,3 @@
 Simple html page Here is a link to mozilla.org. Here is some underlined and boldenedified text.
-Here is a line ending with a space followed by a line break. The output should contain only one space (and no line breaks) between "space" and "followed".
+Here is a line ending with a space followed by a line break. Plaintext output should contain only one space (and no line breaks) between "space" and "followed".
 
diff --git a/mozilla/htmlparser/tests/outsinks/xifstuff.xif b/mozilla/htmlparser/tests/outsinks/xifstuff.xif
index 26f6e8d3c9a..1471438c0ad 100644
--- a/mozilla/htmlparser/tests/outsinks/xifstuff.xif
+++ b/mozilla/htmlparser/tests/outsinks/xifstuff.xif
@@ -67,7 +67,14 @@
 <content>html</content>
 </container><!--b-->
 <content> to aid in testing features 
-under development.  It's also a great place to not use latin.
+under development.
+</content>
+
+<entity value="lt"/><content>a href="http://www.mozilla.org"</content>
+<entity value="gt"/></content>
+
+<content>
+It's also a great place to not use latin.
 </content>
 
 <comment><content> This is a comment;
diff --git a/mozilla/parser/htmlparser/tests/outsinks/TestOutSinks b/mozilla/parser/htmlparser/tests/outsinks/TestOutSinks
index 438b8d0e684..36bd714239b 100755
--- a/mozilla/parser/htmlparser/tests/outsinks/TestOutSinks
+++ b/mozilla/parser/htmlparser/tests/outsinks/TestOutSinks
@@ -28,27 +28,27 @@
 set errmsg = ""
 
 echo "Testing simple html to html ..."
-TestOutput -i text/html -o text/html -c OutTestData/simple.html OutTestData/simple.html
+TestOutput -i text/html -o text/html -f 0 -c OutTestData/simple.html OutTestData/simple.html
 if ($status != 0) then
   echo "Simple html to html failed.\n"
   set errmsg = ($errmsg "simple.html")
 endif
 
-echo "Testing simple copy cases ..."
+echo "Testing simple copy case ..."
 TestOutput -i text/html -o text/plain -f 0 -w 0 -c OutTestData/simplecopy.out OutTestData/simple.html
 if ($status != 0) then
   echo "Simple copy test failed.\n"
-  set errmsg = ($errmsg "simple.out")
+  set errmsg = ($errmsg "simplecopy.out")
 endif
 
 echo "Testing non-wrapped plaintext ..."
-TestOutput -i text/html -o text/plain -w 0 -c OutTestData/plainnowrap.out OutTestData/plain.html
+TestOutput -i text/html -o text/plain -f 0 -w 0 -c OutTestData/plainnowrap.out OutTestData/plain.html
 if ($status != 0) then
   echo "Non-wrapped plaintext test failed."
   set errmsg = ($errmsg "plainnowrap.out")
 endif
 
-echo "Testing wrapped plaintext ..."
+echo "Testing wrapped bug unformatted plaintext ..."
 TestOutput -i text/html -o text/plain -f 32 -w 50 -c OutTestData/plainwrap.out OutTestData/plain.html
 if ($status != 0) then
   echo "Wrapped plaintext test failed."
diff --git a/mozilla/parser/htmlparser/tests/outsinks/simple.html b/mozilla/parser/htmlparser/tests/outsinks/simple.html
index 2df7cbceacb..4a272a672ca 100644
--- a/mozilla/parser/htmlparser/tests/outsinks/simple.html
+++ b/mozilla/parser/htmlparser/tests/outsinks/simple.html
@@ -33,8 +33,7 @@ Here is some <u>underlined and <b>bold</b>ened</u>ified text.
 <p>
 Here is a line ending with a space
 followed by a line break.
-The output should contain only one space (and no line breaks) between "space" and "followed".
+Plaintext output should contain only one space (and no line breaks) between "space" and "followed".
 </p>
 
-</body>
-</html>
+</body></html>
diff --git a/mozilla/parser/htmlparser/tests/outsinks/simplecopy.out b/mozilla/parser/htmlparser/tests/outsinks/simplecopy.out
index 1af024da5e0..38227545f15 100644
--- a/mozilla/parser/htmlparser/tests/outsinks/simplecopy.out
+++ b/mozilla/parser/htmlparser/tests/outsinks/simplecopy.out
@@ -1,3 +1,3 @@
 Simple html page Here is a link to mozilla.org. Here is some underlined and boldenedified text.
-Here is a line ending with a space followed by a line break. The output should contain only one space (and no line breaks) between "space" and "followed".
+Here is a line ending with a space followed by a line break. Plaintext output should contain only one space (and no line breaks) between "space" and "followed".
 
diff --git a/mozilla/parser/htmlparser/tests/outsinks/xifstuff.xif b/mozilla/parser/htmlparser/tests/outsinks/xifstuff.xif
index 26f6e8d3c9a..1471438c0ad 100644
--- a/mozilla/parser/htmlparser/tests/outsinks/xifstuff.xif
+++ b/mozilla/parser/htmlparser/tests/outsinks/xifstuff.xif
@@ -67,7 +67,14 @@
 <content>html</content>
 </container><!--b-->
 <content> to aid in testing features 
-under development.  It's also a great place to not use latin.
+under development.
+</content>
+
+<entity value="lt"/><content>a href="http://www.mozilla.org"</content>
+<entity value="gt"/></content>
+
+<content>
+It's also a great place to not use latin.
 </content>
 
 <comment><content> This is a comment;