.

6 files changed, 1708 insertions, 1708 deletions

diff --git a/tests/cut/cut-tests b/tests/cut/cut-tests
index 7ce0d7045..b897f2228 100755
--- a/tests/cut/cut-tests
+++ b/tests/cut/cut-tests
@@ -12,15 +12,15 @@ test "$VERBOSE" && $xx --version 2> /dev/null
 $xx -d: -f1,3- $srcdir/t1.in > t1.out 2> t1.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 1 failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test 1 failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t1.out $srcdir/t1.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 1; fi ;; # equal files
-    1) $echo Test 1 failed: files t1.out and $srcdir/t1.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 1"; fi ;;
+    1) $echo "Test 1 failed: files t1.out and $srcdir/t1.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 1 may have failed. 1>&2;
+    2) $echo "Test 1 may have failed." 1>&2;
        $echo The command "cmp t1.out $srcdir/t1.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -29,15 +29,15 @@ test -s t1.err || rm -f t1.err
 $xx -d: -f1,3- $srcdir/t2.in > t2.out 2> t2.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 2 failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test 2 failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t2.out $srcdir/t2.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 2; fi ;; # equal files
-    1) $echo Test 2 failed: files t2.out and $srcdir/t2.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 2"; fi ;;
+    1) $echo "Test 2 failed: files t2.out and $srcdir/t2.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 2 may have failed. 1>&2;
+    2) $echo "Test 2 may have failed." 1>&2;
        $echo The command "cmp t2.out $srcdir/t2.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -46,15 +46,15 @@ test -s t2.err || rm -f t2.err
 $xx -d: -f2- $srcdir/t3.in > t3.out 2> t3.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3 failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test 3 failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3.out $srcdir/t3.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3; fi ;; # equal files
-    1) $echo Test 3 failed: files t3.out and $srcdir/t3.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3"; fi ;;
+    1) $echo "Test 3 failed: files t3.out and $srcdir/t3.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3 may have failed. 1>&2;
+    2) $echo "Test 3 may have failed." 1>&2;
        $echo The command "cmp t3.out $srcdir/t3.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -63,15 +63,15 @@ test -s t3.err || rm -f t3.err
 $xx -d: -f4 $srcdir/t4.in > t4.out 2> t4.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 4 failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test 4 failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t4.out $srcdir/t4.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 4; fi ;; # equal files
-    1) $echo Test 4 failed: files t4.out and $srcdir/t4.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 4"; fi ;;
+    1) $echo "Test 4 failed: files t4.out and $srcdir/t4.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 4 may have failed. 1>&2;
+    2) $echo "Test 4 may have failed." 1>&2;
        $echo The command "cmp t4.out $srcdir/t4.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -80,15 +80,15 @@ test -s t4.err || rm -f t4.err
 $xx -d: -f4 $srcdir/t5.in > t5.out 2> t5.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5 failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test 5 failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t5.out $srcdir/t5.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5; fi ;; # equal files
-    1) $echo Test 5 failed: files t5.out and $srcdir/t5.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5"; fi ;;
+    1) $echo "Test 5 failed: files t5.out and $srcdir/t5.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 5 may have failed. 1>&2;
+    2) $echo "Test 5 may have failed." 1>&2;
        $echo The command "cmp t5.out $srcdir/t5.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -97,15 +97,15 @@ test -s t5.err || rm -f t5.err
 $xx -c4 $srcdir/t6.in > t6.out 2> t6.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 6 failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test 6 failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t6.out $srcdir/t6.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 6; fi ;; # equal files
-    1) $echo Test 6 failed: files t6.out and $srcdir/t6.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 6"; fi ;;
+    1) $echo "Test 6 failed: files t6.out and $srcdir/t6.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 6 may have failed. 1>&2;
+    2) $echo "Test 6 may have failed." 1>&2;
        $echo The command "cmp t6.out $srcdir/t6.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -114,15 +114,15 @@ test -s t6.err || rm -f t6.err
 $xx -c4 $srcdir/t7.in > t7.out 2> t7.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 7 failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test 7 failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t7.out $srcdir/t7.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 7; fi ;; # equal files
-    1) $echo Test 7 failed: files t7.out and $srcdir/t7.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 7"; fi ;;
+    1) $echo "Test 7 failed: files t7.out and $srcdir/t7.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 7 may have failed. 1>&2;
+    2) $echo "Test 7 may have failed." 1>&2;
        $echo The command "cmp t7.out $srcdir/t7.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -131,15 +131,15 @@ test -s t7.err || rm -f t7.err
 $xx -c4 $srcdir/t8.in > t8.out 2> t8.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 8 failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test 8 failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t8.out $srcdir/t8.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 8; fi ;; # equal files
-    1) $echo Test 8 failed: files t8.out and $srcdir/t8.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 8"; fi ;;
+    1) $echo "Test 8 failed: files t8.out and $srcdir/t8.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 8 may have failed. 1>&2;
+    2) $echo "Test 8 may have failed." 1>&2;
        $echo The command "cmp t8.out $srcdir/t8.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -148,15 +148,15 @@ test -s t8.err || rm -f t8.err
 $xx -c4 $srcdir/t9.in > t9.out 2> t9.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9 failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test 9 failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9.out $srcdir/t9.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9; fi ;; # equal files
-    1) $echo Test 9 failed: files t9.out and $srcdir/t9.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9"; fi ;;
+    1) $echo "Test 9 failed: files t9.out and $srcdir/t9.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9 may have failed. 1>&2;
+    2) $echo "Test 9 may have failed." 1>&2;
        $echo The command "cmp t9.out $srcdir/t9.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -165,15 +165,15 @@ test -s t9.err || rm -f t9.err
 $xx -s -d: -f3- $srcdir/ta.in > ta.out 2> ta.err
 code=$?
 if test $code != 0 ; then
-  $echo Test a failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test a failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ta.out $srcdir/ta.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed a; fi ;; # equal files
-    1) $echo Test a failed: files ta.out and $srcdir/ta.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed a"; fi ;;
+    1) $echo "Test a failed: files ta.out and $srcdir/ta.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test a may have failed. 1>&2;
+    2) $echo "Test a may have failed." 1>&2;
        $echo The command "cmp ta.out $srcdir/ta.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -182,15 +182,15 @@ test -s ta.err || rm -f ta.err
 $xx -s -d: -f2,3 $srcdir/tb.in > tb.out 2> tb.err
 code=$?
 if test $code != 0 ; then
-  $echo Test b failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test b failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tb.out $srcdir/tb.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed b; fi ;; # equal files
-    1) $echo Test b failed: files tb.out and $srcdir/tb.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed b"; fi ;;
+    1) $echo "Test b failed: files tb.out and $srcdir/tb.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test b may have failed. 1>&2;
+    2) $echo "Test b may have failed." 1>&2;
        $echo The command "cmp tb.out $srcdir/tb.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -199,15 +199,15 @@ test -s tb.err || rm -f tb.err
 $xx -s -d: -f1,3 $srcdir/tc.in > tc.out 2> tc.err
 code=$?
 if test $code != 0 ; then
-  $echo Test c failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test c failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tc.out $srcdir/tc.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed c; fi ;; # equal files
-    1) $echo Test c failed: files tc.out and $srcdir/tc.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed c"; fi ;;
+    1) $echo "Test c failed: files tc.out and $srcdir/tc.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test c may have failed. 1>&2;
+    2) $echo "Test c may have failed." 1>&2;
        $echo The command "cmp tc.out $srcdir/tc.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -216,15 +216,15 @@ test -s tc.err || rm -f tc.err
 $xx -s -d: -f1,3 $srcdir/td.in > td.out 2> td.err
 code=$?
 if test $code != 0 ; then
-  $echo Test d failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test d failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp td.out $srcdir/td.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed d; fi ;; # equal files
-    1) $echo Test d failed: files td.out and $srcdir/td.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed d"; fi ;;
+    1) $echo "Test d failed: files td.out and $srcdir/td.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test d may have failed. 1>&2;
+    2) $echo "Test d may have failed." 1>&2;
        $echo The command "cmp td.out $srcdir/td.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -233,15 +233,15 @@ test -s td.err || rm -f td.err
 $xx -s -d: -f3- $srcdir/te.in > te.out 2> te.err
 code=$?
 if test $code != 0 ; then
-  $echo Test e failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test e failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp te.out $srcdir/te.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed e; fi ;; # equal files
-    1) $echo Test e failed: files te.out and $srcdir/te.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed e"; fi ;;
+    1) $echo "Test e failed: files te.out and $srcdir/te.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test e may have failed. 1>&2;
+    2) $echo "Test e may have failed." 1>&2;
        $echo The command "cmp te.out $srcdir/te.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -250,15 +250,15 @@ test -s te.err || rm -f te.err
 $xx -s -d: -f3-4 $srcdir/tf.in > tf.out 2> tf.err
 code=$?
 if test $code != 0 ; then
-  $echo Test f failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test f failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tf.out $srcdir/tf.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed f; fi ;; # equal files
-    1) $echo Test f failed: files tf.out and $srcdir/tf.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed f"; fi ;;
+    1) $echo "Test f failed: files tf.out and $srcdir/tf.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test f may have failed. 1>&2;
+    2) $echo "Test f may have failed." 1>&2;
        $echo The command "cmp tf.out $srcdir/tf.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -267,15 +267,15 @@ test -s tf.err || rm -f tf.err
 $xx -s -d: -f3,4 $srcdir/tg.in > tg.out 2> tg.err
 code=$?
 if test $code != 0 ; then
-  $echo Test g failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test g failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tg.out $srcdir/tg.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed g; fi ;; # equal files
-    1) $echo Test g failed: files tg.out and $srcdir/tg.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed g"; fi ;;
+    1) $echo "Test g failed: files tg.out and $srcdir/tg.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test g may have failed. 1>&2;
+    2) $echo "Test g may have failed." 1>&2;
        $echo The command "cmp tg.out $srcdir/tg.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -284,15 +284,15 @@ test -s tg.err || rm -f tg.err
 $xx -s -d: -f2,3 $srcdir/th.in > th.out 2> th.err
 code=$?
 if test $code != 0 ; then
-  $echo Test h failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test h failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp th.out $srcdir/th.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed h; fi ;; # equal files
-    1) $echo Test h failed: files th.out and $srcdir/th.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed h"; fi ;;
+    1) $echo "Test h failed: files th.out and $srcdir/th.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test h may have failed. 1>&2;
+    2) $echo "Test h may have failed." 1>&2;
        $echo The command "cmp th.out $srcdir/th.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -301,15 +301,15 @@ test -s th.err || rm -f th.err
 $xx -d: -f1-3 $srcdir/ti.in > ti.out 2> ti.err
 code=$?
 if test $code != 0 ; then
-  $echo Test i failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test i failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ti.out $srcdir/ti.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed i; fi ;; # equal files
-    1) $echo Test i failed: files ti.out and $srcdir/ti.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed i"; fi ;;
+    1) $echo "Test i failed: files ti.out and $srcdir/ti.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test i may have failed. 1>&2;
+    2) $echo "Test i may have failed." 1>&2;
        $echo The command "cmp ti.out $srcdir/ti.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -318,15 +318,15 @@ test -s ti.err || rm -f ti.err
 $xx -d: -f1-4 $srcdir/tj.in > tj.out 2> tj.err
 code=$?
 if test $code != 0 ; then
-  $echo Test j failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test j failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tj.out $srcdir/tj.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed j; fi ;; # equal files
-    1) $echo Test j failed: files tj.out and $srcdir/tj.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed j"; fi ;;
+    1) $echo "Test j failed: files tj.out and $srcdir/tj.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test j may have failed. 1>&2;
+    2) $echo "Test j may have failed." 1>&2;
        $echo The command "cmp tj.out $srcdir/tj.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -335,15 +335,15 @@ test -s tj.err || rm -f tj.err
 $xx -d: -f2-3 $srcdir/tk.in > tk.out 2> tk.err
 code=$?
 if test $code != 0 ; then
-  $echo Test k failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test k failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tk.out $srcdir/tk.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed k; fi ;; # equal files
-    1) $echo Test k failed: files tk.out and $srcdir/tk.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed k"; fi ;;
+    1) $echo "Test k failed: files tk.out and $srcdir/tk.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test k may have failed. 1>&2;
+    2) $echo "Test k may have failed." 1>&2;
        $echo The command "cmp tk.out $srcdir/tk.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -352,15 +352,15 @@ test -s tk.err || rm -f tk.err
 $xx -d: -f2-4 $srcdir/tl.in > tl.out 2> tl.err
 code=$?
 if test $code != 0 ; then
-  $echo Test l failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test l failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tl.out $srcdir/tl.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed l; fi ;; # equal files
-    1) $echo Test l failed: files tl.out and $srcdir/tl.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed l"; fi ;;
+    1) $echo "Test l failed: files tl.out and $srcdir/tl.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test l may have failed. 1>&2;
+    2) $echo "Test l may have failed." 1>&2;
        $echo The command "cmp tl.out $srcdir/tl.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -369,15 +369,15 @@ test -s tl.err || rm -f tl.err
 $xx -s -d: -f1-3 $srcdir/tm.in > tm.out 2> tm.err
 code=$?
 if test $code != 0 ; then
-  $echo Test m failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test m failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tm.out $srcdir/tm.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed m; fi ;; # equal files
-    1) $echo Test m failed: files tm.out and $srcdir/tm.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed m"; fi ;;
+    1) $echo "Test m failed: files tm.out and $srcdir/tm.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test m may have failed. 1>&2;
+    2) $echo "Test m may have failed." 1>&2;
        $echo The command "cmp tm.out $srcdir/tm.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -386,15 +386,15 @@ test -s tm.err || rm -f tm.err
 $xx -s -d: -f1-4 $srcdir/tn.in > tn.out 2> tn.err
 code=$?
 if test $code != 0 ; then
-  $echo Test n failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test n failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tn.out $srcdir/tn.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed n; fi ;; # equal files
-    1) $echo Test n failed: files tn.out and $srcdir/tn.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed n"; fi ;;
+    1) $echo "Test n failed: files tn.out and $srcdir/tn.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test n may have failed. 1>&2;
+    2) $echo "Test n may have failed." 1>&2;
        $echo The command "cmp tn.out $srcdir/tn.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -403,15 +403,15 @@ test -s tn.err || rm -f tn.err
 $xx -s -d: -f2-3 $srcdir/to.in > to.out 2> to.err
 code=$?
 if test $code != 0 ; then
-  $echo Test o failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test o failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp to.out $srcdir/to.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed o; fi ;; # equal files
-    1) $echo Test o failed: files to.out and $srcdir/to.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed o"; fi ;;
+    1) $echo "Test o failed: files to.out and $srcdir/to.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test o may have failed. 1>&2;
+    2) $echo "Test o may have failed." 1>&2;
        $echo The command "cmp to.out $srcdir/to.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -420,15 +420,15 @@ test -s to.err || rm -f to.err
 $xx -s -d: -f2-4 $srcdir/tp.in > tp.out 2> tp.err
 code=$?
 if test $code != 0 ; then
-  $echo Test p failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test p failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tp.out $srcdir/tp.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed p; fi ;; # equal files
-    1) $echo Test p failed: files tp.out and $srcdir/tp.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed p"; fi ;;
+    1) $echo "Test p failed: files tp.out and $srcdir/tp.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test p may have failed. 1>&2;
+    2) $echo "Test p may have failed." 1>&2;
        $echo The command "cmp tp.out $srcdir/tp.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -437,15 +437,15 @@ test -s tp.err || rm -f tp.err
 $xx -s -d: -f2-4 $srcdir/tq.in > tq.out 2> tq.err
 code=$?
 if test $code != 0 ; then
-  $echo Test q failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test q failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tq.out $srcdir/tq.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed q; fi ;; # equal files
-    1) $echo Test q failed: files tq.out and $srcdir/tq.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed q"; fi ;;
+    1) $echo "Test q failed: files tq.out and $srcdir/tq.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test q may have failed. 1>&2;
+    2) $echo "Test q may have failed." 1>&2;
        $echo The command "cmp tq.out $srcdir/tq.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -454,15 +454,15 @@ test -s tq.err || rm -f tq.err
 $xx -s -d: -f2-4 $srcdir/tr.in > tr.out 2> tr.err
 code=$?
 if test $code != 0 ; then
-  $echo Test r failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test r failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tr.out $srcdir/tr.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed r; fi ;; # equal files
-    1) $echo Test r failed: files tr.out and $srcdir/tr.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed r"; fi ;;
+    1) $echo "Test r failed: files tr.out and $srcdir/tr.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test r may have failed. 1>&2;
+    2) $echo "Test r may have failed." 1>&2;
        $echo The command "cmp tr.out $srcdir/tr.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -471,15 +471,15 @@ test -s tr.err || rm -f tr.err
 $xx -s -d: -f1-4 $srcdir/ts.in > ts.out 2> ts.err
 code=$?
 if test $code != 0 ; then
-  $echo Test s failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test s failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ts.out $srcdir/ts.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed s; fi ;; # equal files
-    1) $echo Test s failed: files ts.out and $srcdir/ts.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed s"; fi ;;
+    1) $echo "Test s failed: files ts.out and $srcdir/ts.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test s may have failed. 1>&2;
+    2) $echo "Test s may have failed." 1>&2;
        $echo The command "cmp ts.out $srcdir/ts.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -488,15 +488,15 @@ test -s ts.err || rm -f ts.err
 $xx -s -d: -f3- $srcdir/tt.in > tt.out 2> tt.err
 code=$?
 if test $code != 0 ; then
-  $echo Test t failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test t failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tt.out $srcdir/tt.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed t; fi ;; # equal files
-    1) $echo Test t failed: files tt.out and $srcdir/tt.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed t"; fi ;;
+    1) $echo "Test t failed: files tt.out and $srcdir/tt.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test t may have failed. 1>&2;
+    2) $echo "Test t may have failed." 1>&2;
        $echo The command "cmp tt.out $srcdir/tt.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -505,15 +505,15 @@ test -s tt.err || rm -f tt.err
 $xx -s -f3- $srcdir/tu.in > tu.out 2> tu.err
 code=$?
 if test $code != 0 ; then
-  $echo Test u failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test u failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tu.out $srcdir/tu.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed u; fi ;; # equal files
-    1) $echo Test u failed: files tu.out and $srcdir/tu.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed u"; fi ;;
+    1) $echo "Test u failed: files tu.out and $srcdir/tu.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test u may have failed. 1>&2;
+    2) $echo "Test u may have failed." 1>&2;
        $echo The command "cmp tu.out $srcdir/tu.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -522,15 +522,15 @@ test -s tu.err || rm -f tu.err
 $xx -f3- $srcdir/tv.in > tv.out 2> tv.err
 code=$?
 if test $code != 0 ; then
-  $echo Test v failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test v failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tv.out $srcdir/tv.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed v; fi ;; # equal files
-    1) $echo Test v failed: files tv.out and $srcdir/tv.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed v"; fi ;;
+    1) $echo "Test v failed: files tv.out and $srcdir/tv.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test v may have failed. 1>&2;
+    2) $echo "Test v may have failed." 1>&2;
        $echo The command "cmp tv.out $srcdir/tv.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -539,15 +539,15 @@ test -s tv.err || rm -f tv.err
 $xx -b 1 $srcdir/tw.in > tw.out 2> tw.err
 code=$?
 if test $code != 0 ; then
-  $echo Test w failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test w failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tw.out $srcdir/tw.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed w; fi ;; # equal files
-    1) $echo Test w failed: files tw.out and $srcdir/tw.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed w"; fi ;;
+    1) $echo "Test w failed: files tw.out and $srcdir/tw.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test w may have failed. 1>&2;
+    2) $echo "Test w may have failed." 1>&2;
        $echo The command "cmp tw.out $srcdir/tw.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -556,15 +556,15 @@ test -s tw.err || rm -f tw.err
 $xx -s -d: -f2-4 $srcdir/tx.in > tx.out 2> tx.err
 code=$?
 if test $code != 0 ; then
-  $echo Test x failed: ../../src/cut return code $code differs from expected value 0 1>&2
+  $echo "Test x failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tx.out $srcdir/tx.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed x; fi ;; # equal files
-    1) $echo Test x failed: files tx.out and $srcdir/tx.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed x"; fi ;;
+    1) $echo "Test x failed: files tx.out and $srcdir/tx.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test x may have failed. 1>&2;
+    2) $echo "Test x may have failed." 1>&2;
        $echo The command "cmp tx.out $srcdir/tx.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -573,15 +573,15 @@ test -s tx.err || rm -f tx.err
 $xx -s -b4 $srcdir/ty.in > ty.out 2> ty.err
 code=$?
 if test $code != 1 ; then
-  $echo Test y failed: ../../src/cut return code $code differs from expected value 1 1>&2
+  $echo "Test y failed: ../../src/cut return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ty.out $srcdir/ty.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed y; fi ;; # equal files
-    1) $echo Test y failed: files ty.out and $srcdir/ty.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed y"; fi ;;
+    1) $echo "Test y failed: files ty.out and $srcdir/ty.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test y may have failed. 1>&2;
+    2) $echo "Test y may have failed." 1>&2;
        $echo The command "cmp ty.out $srcdir/ty.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -590,15 +590,15 @@ test -s ty.err || rm -f ty.err
 $xx  $srcdir/tz.in > tz.out 2> tz.err
 code=$?
 if test $code != 1 ; then
-  $echo Test z failed: ../../src/cut return code $code differs from expected value 1 1>&2
+  $echo "Test z failed: ../../src/cut return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tz.out $srcdir/tz.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed z; fi ;; # equal files
-    1) $echo Test z failed: files tz.out and $srcdir/tz.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed z"; fi ;;
+    1) $echo "Test z failed: files tz.out and $srcdir/tz.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test z may have failed. 1>&2;
+    2) $echo "Test z may have failed." 1>&2;
        $echo The command "cmp tz.out $srcdir/tz.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -607,15 +607,15 @@ test -s tz.err || rm -f tz.err
 $xx -f '' $srcdir/tempty-fl.in > tempty-fl.out 2> tempty-fl.err
 code=$?
 if test $code != 1 ; then
-  $echo Test empty-fl failed: ../../src/cut return code $code differs from expected value 1 1>&2
+  $echo "Test empty-fl failed: ../../src/cut return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tempty-fl.out $srcdir/tempty-fl.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed empty-fl; fi ;; # equal files
-    1) $echo Test empty-fl failed: files tempty-fl.out and $srcdir/tempty-fl.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed empty-fl"; fi ;;
+    1) $echo "Test empty-fl failed: files tempty-fl.out and $srcdir/tempty-fl.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test empty-fl may have failed. 1>&2;
+    2) $echo "Test empty-fl may have failed." 1>&2;
        $echo The command "cmp tempty-fl.out $srcdir/tempty-fl.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -624,15 +624,15 @@ test -s tempty-fl.err || rm -f tempty-fl.err
 $xx -f $srcdir/tmissing-fl.in > tmissing-fl.out 2> tmissing-fl.err
 code=$?
 if test $code != 1 ; then
-  $echo Test missing-fl failed: ../../src/cut return code $code differs from expected value 1 1>&2
+  $echo "Test missing-fl failed: ../../src/cut return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tmissing-fl.out $srcdir/tmissing-fl.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed missing-fl; fi ;; # equal files
-    1) $echo Test missing-fl failed: files tmissing-fl.out and $srcdir/tmissing-fl.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed missing-fl"; fi ;;
+    1) $echo "Test missing-fl failed: files tmissing-fl.out and $srcdir/tmissing-fl.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test missing-fl may have failed. 1>&2;
+    2) $echo "Test missing-fl may have failed." 1>&2;
        $echo The command "cmp tmissing-fl.out $srcdir/tmissing-fl.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -641,15 +641,15 @@ test -s tmissing-fl.err || rm -f tmissing-fl.err
 $xx -b '' $srcdir/tempty-bl.in > tempty-bl.out 2> tempty-bl.err
 code=$?
 if test $code != 1 ; then
-  $echo Test empty-bl failed: ../../src/cut return code $code differs from expected value 1 1>&2
+  $echo "Test empty-bl failed: ../../src/cut return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tempty-bl.out $srcdir/tempty-bl.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed empty-bl; fi ;; # equal files
-    1) $echo Test empty-bl failed: files tempty-bl.out and $srcdir/tempty-bl.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed empty-bl"; fi ;;
+    1) $echo "Test empty-bl failed: files tempty-bl.out and $srcdir/tempty-bl.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test empty-bl may have failed. 1>&2;
+    2) $echo "Test empty-bl may have failed." 1>&2;
        $echo The command "cmp tempty-bl.out $srcdir/tempty-bl.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -658,15 +658,15 @@ test -s tempty-bl.err || rm -f tempty-bl.err
 $xx -b $srcdir/tmissing-bl.in > tmissing-bl.out 2> tmissing-bl.err
 code=$?
 if test $code != 1 ; then
-  $echo Test missing-bl failed: ../../src/cut return code $code differs from expected value 1 1>&2
+  $echo "Test missing-bl failed: ../../src/cut return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tmissing-bl.out $srcdir/tmissing-bl.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed missing-bl; fi ;; # equal files
-    1) $echo Test missing-bl failed: files tmissing-bl.out and $srcdir/tmissing-bl.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed missing-bl"; fi ;;
+    1) $echo "Test missing-bl failed: files tmissing-bl.out and $srcdir/tmissing-bl.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test missing-bl may have failed. 1>&2;
+    2) $echo "Test missing-bl may have failed." 1>&2;
        $echo The command "cmp tmissing-bl.out $srcdir/tmissing-bl.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
diff --git a/tests/join/join-tests b/tests/join/join-tests
index 04bfdcac7..03e3bee25 100755
--- a/tests/join/join-tests
+++ b/tests/join/join-tests
@@ -12,15 +12,15 @@ test "$VERBOSE" && $xx --version 2> /dev/null
 $xx -a1 $srcdir/t1a.in1 $srcdir/t1a.in2 > t1a.out 2> t1a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 1a failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 1a failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t1a.out $srcdir/t1a.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 1a; fi ;; # equal files
-    1) $echo Test 1a failed: files t1a.out and $srcdir/t1a.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 1a"; fi ;;
+    1) $echo "Test 1a failed: files t1a.out and $srcdir/t1a.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 1a may have failed. 1>&2;
+    2) $echo "Test 1a may have failed." 1>&2;
        $echo The command "cmp t1a.out $srcdir/t1a.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -29,15 +29,15 @@ test -s t1a.err || rm -f t1a.err
 $xx -a2 $srcdir/t1b.in1 $srcdir/t1b.in2 > t1b.out 2> t1b.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 1b failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 1b failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t1b.out $srcdir/t1b.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 1b; fi ;; # equal files
-    1) $echo Test 1b failed: files t1b.out and $srcdir/t1b.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 1b"; fi ;;
+    1) $echo "Test 1b failed: files t1b.out and $srcdir/t1b.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 1b may have failed. 1>&2;
+    2) $echo "Test 1b may have failed." 1>&2;
        $echo The command "cmp t1b.out $srcdir/t1b.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -46,15 +46,15 @@ test -s t1b.err || rm -f t1b.err
 $xx -a1 -a2 $srcdir/t1c.in1 $srcdir/t1c.in2 > t1c.out 2> t1c.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 1c failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 1c failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t1c.out $srcdir/t1c.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 1c; fi ;; # equal files
-    1) $echo Test 1c failed: files t1c.out and $srcdir/t1c.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 1c"; fi ;;
+    1) $echo "Test 1c failed: files t1c.out and $srcdir/t1c.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 1c may have failed. 1>&2;
+    2) $echo "Test 1c may have failed." 1>&2;
        $echo The command "cmp t1c.out $srcdir/t1c.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -63,15 +63,15 @@ test -s t1c.err || rm -f t1c.err
 $xx -a1 $srcdir/t1d.in1 $srcdir/t1d.in2 > t1d.out 2> t1d.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 1d failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 1d failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t1d.out $srcdir/t1d.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 1d; fi ;; # equal files
-    1) $echo Test 1d failed: files t1d.out and $srcdir/t1d.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 1d"; fi ;;
+    1) $echo "Test 1d failed: files t1d.out and $srcdir/t1d.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 1d may have failed. 1>&2;
+    2) $echo "Test 1d may have failed." 1>&2;
        $echo The command "cmp t1d.out $srcdir/t1d.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -80,15 +80,15 @@ test -s t1d.err || rm -f t1d.err
 $xx -a2 $srcdir/t1e.in1 $srcdir/t1e.in2 > t1e.out 2> t1e.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 1e failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 1e failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t1e.out $srcdir/t1e.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 1e; fi ;; # equal files
-    1) $echo Test 1e failed: files t1e.out and $srcdir/t1e.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 1e"; fi ;;
+    1) $echo "Test 1e failed: files t1e.out and $srcdir/t1e.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 1e may have failed. 1>&2;
+    2) $echo "Test 1e may have failed." 1>&2;
        $echo The command "cmp t1e.out $srcdir/t1e.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -97,15 +97,15 @@ test -s t1e.err || rm -f t1e.err
 $xx -a2 $srcdir/t1f.in1 $srcdir/t1f.in2 > t1f.out 2> t1f.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 1f failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 1f failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t1f.out $srcdir/t1f.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 1f; fi ;; # equal files
-    1) $echo Test 1f failed: files t1f.out and $srcdir/t1f.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 1f"; fi ;;
+    1) $echo "Test 1f failed: files t1f.out and $srcdir/t1f.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 1f may have failed. 1>&2;
+    2) $echo "Test 1f may have failed." 1>&2;
        $echo The command "cmp t1f.out $srcdir/t1f.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -114,15 +114,15 @@ test -s t1f.err || rm -f t1f.err
 $xx -a1 -e . $srcdir/t2a.in1 $srcdir/t2a.in2 > t2a.out 2> t2a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 2a failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 2a failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t2a.out $srcdir/t2a.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 2a; fi ;; # equal files
-    1) $echo Test 2a failed: files t2a.out and $srcdir/t2a.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 2a"; fi ;;
+    1) $echo "Test 2a failed: files t2a.out and $srcdir/t2a.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 2a may have failed. 1>&2;
+    2) $echo "Test 2a may have failed." 1>&2;
        $echo The command "cmp t2a.out $srcdir/t2a.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -131,15 +131,15 @@ test -s t2a.err || rm -f t2a.err
 $xx -a1 -e . -o 2.1,2.2,2.3 $srcdir/t2b.in1 $srcdir/t2b.in2 > t2b.out 2> t2b.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 2b failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 2b failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t2b.out $srcdir/t2b.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 2b; fi ;; # equal files
-    1) $echo Test 2b failed: files t2b.out and $srcdir/t2b.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 2b"; fi ;;
+    1) $echo "Test 2b failed: files t2b.out and $srcdir/t2b.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 2b may have failed. 1>&2;
+    2) $echo "Test 2b may have failed." 1>&2;
        $echo The command "cmp t2b.out $srcdir/t2b.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -148,15 +148,15 @@ test -s t2b.err || rm -f t2b.err
 $xx -a1 -e . -o 2.1,2.2,2.3 $srcdir/t2c.in1 $srcdir/t2c.in2 > t2c.out 2> t2c.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 2c failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 2c failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t2c.out $srcdir/t2c.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 2c; fi ;; # equal files
-    1) $echo Test 2c failed: files t2c.out and $srcdir/t2c.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 2c"; fi ;;
+    1) $echo "Test 2c failed: files t2c.out and $srcdir/t2c.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 2c may have failed. 1>&2;
+    2) $echo "Test 2c may have failed." 1>&2;
        $echo The command "cmp t2c.out $srcdir/t2c.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -165,15 +165,15 @@ test -s t2c.err || rm -f t2c.err
 $xx -t: $srcdir/t3a.in1 $srcdir/t3a.in2 > t3a.out 2> t3a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3a failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 3a failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3a.out $srcdir/t3a.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3a; fi ;; # equal files
-    1) $echo Test 3a failed: files t3a.out and $srcdir/t3a.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3a"; fi ;;
+    1) $echo "Test 3a failed: files t3a.out and $srcdir/t3a.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3a may have failed. 1>&2;
+    2) $echo "Test 3a may have failed." 1>&2;
        $echo The command "cmp t3a.out $srcdir/t3a.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -182,15 +182,15 @@ test -s t3a.err || rm -f t3a.err
 $xx -v 1 $srcdir/t4a.in1 $srcdir/t4a.in2 > t4a.out 2> t4a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 4a failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 4a failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t4a.out $srcdir/t4a.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 4a; fi ;; # equal files
-    1) $echo Test 4a failed: files t4a.out and $srcdir/t4a.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 4a"; fi ;;
+    1) $echo "Test 4a failed: files t4a.out and $srcdir/t4a.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 4a may have failed. 1>&2;
+    2) $echo "Test 4a may have failed." 1>&2;
        $echo The command "cmp t4a.out $srcdir/t4a.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -199,15 +199,15 @@ test -s t4a.err || rm -f t4a.err
 $xx -v 2 $srcdir/t4b.in1 $srcdir/t4b.in2 > t4b.out 2> t4b.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 4b failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 4b failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t4b.out $srcdir/t4b.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 4b; fi ;; # equal files
-    1) $echo Test 4b failed: files t4b.out and $srcdir/t4b.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 4b"; fi ;;
+    1) $echo "Test 4b failed: files t4b.out and $srcdir/t4b.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 4b may have failed. 1>&2;
+    2) $echo "Test 4b may have failed." 1>&2;
        $echo The command "cmp t4b.out $srcdir/t4b.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -216,15 +216,15 @@ test -s t4b.err || rm -f t4b.err
 $xx -v 1 $srcdir/t4c.in1 $srcdir/t4c.in2 > t4c.out 2> t4c.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 4c failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 4c failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t4c.out $srcdir/t4c.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 4c; fi ;; # equal files
-    1) $echo Test 4c failed: files t4c.out and $srcdir/t4c.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 4c"; fi ;;
+    1) $echo "Test 4c failed: files t4c.out and $srcdir/t4c.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 4c may have failed. 1>&2;
+    2) $echo "Test 4c may have failed." 1>&2;
        $echo The command "cmp t4c.out $srcdir/t4c.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -233,15 +233,15 @@ test -s t4c.err || rm -f t4c.err
 $xx -v 2 $srcdir/t4d.in1 $srcdir/t4d.in2 > t4d.out 2> t4d.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 4d failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 4d failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t4d.out $srcdir/t4d.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 4d; fi ;; # equal files
-    1) $echo Test 4d failed: files t4d.out and $srcdir/t4d.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 4d"; fi ;;
+    1) $echo "Test 4d failed: files t4d.out and $srcdir/t4d.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 4d may have failed. 1>&2;
+    2) $echo "Test 4d may have failed." 1>&2;
        $echo The command "cmp t4d.out $srcdir/t4d.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -250,15 +250,15 @@ test -s t4d.err || rm -f t4d.err
 $xx -v 2 $srcdir/t4e.in1 $srcdir/t4e.in2 > t4e.out 2> t4e.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 4e failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 4e failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t4e.out $srcdir/t4e.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 4e; fi ;; # equal files
-    1) $echo Test 4e failed: files t4e.out and $srcdir/t4e.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 4e"; fi ;;
+    1) $echo "Test 4e failed: files t4e.out and $srcdir/t4e.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 4e may have failed. 1>&2;
+    2) $echo "Test 4e may have failed." 1>&2;
        $echo The command "cmp t4e.out $srcdir/t4e.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -267,15 +267,15 @@ test -s t4e.err || rm -f t4e.err
 $xx -a1 -e - -o 1.1 2.2 $srcdir/t5a.in1 $srcdir/t5a.in2 > t5a.out 2> t5a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5a failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 5a failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t5a.out $srcdir/t5a.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5a; fi ;; # equal files
-    1) $echo Test 5a failed: files t5a.out and $srcdir/t5a.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5a"; fi ;;
+    1) $echo "Test 5a failed: files t5a.out and $srcdir/t5a.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 5a may have failed. 1>&2;
+    2) $echo "Test 5a may have failed." 1>&2;
        $echo The command "cmp t5a.out $srcdir/t5a.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -284,15 +284,15 @@ test -s t5a.err || rm -f t5a.err
 $xx -a1 -e - -o 1.1 2.2 $srcdir/t5b.in1 $srcdir/t5b.in2 > t5b.out 2> t5b.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5b failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 5b failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t5b.out $srcdir/t5b.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5b; fi ;; # equal files
-    1) $echo Test 5b failed: files t5b.out and $srcdir/t5b.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5b"; fi ;;
+    1) $echo "Test 5b failed: files t5b.out and $srcdir/t5b.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 5b may have failed. 1>&2;
+    2) $echo "Test 5b may have failed." 1>&2;
        $echo The command "cmp t5b.out $srcdir/t5b.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -301,15 +301,15 @@ test -s t5b.err || rm -f t5b.err
 $xx -a1 -e - -o 1.1 2.2 $srcdir/t5c.in1 $srcdir/t5c.in2 > t5c.out 2> t5c.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5c failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 5c failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t5c.out $srcdir/t5c.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5c; fi ;; # equal files
-    1) $echo Test 5c failed: files t5c.out and $srcdir/t5c.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5c"; fi ;;
+    1) $echo "Test 5c failed: files t5c.out and $srcdir/t5c.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 5c may have failed. 1>&2;
+    2) $echo "Test 5c may have failed." 1>&2;
        $echo The command "cmp t5c.out $srcdir/t5c.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -318,15 +318,15 @@ test -s t5c.err || rm -f t5c.err
 $xx -a1 -e - -o 1.1 2.2 $srcdir/t5d.in1 $srcdir/t5d.in2 > t5d.out 2> t5d.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5d failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 5d failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t5d.out $srcdir/t5d.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5d; fi ;; # equal files
-    1) $echo Test 5d failed: files t5d.out and $srcdir/t5d.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5d"; fi ;;
+    1) $echo "Test 5d failed: files t5d.out and $srcdir/t5d.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 5d may have failed. 1>&2;
+    2) $echo "Test 5d may have failed." 1>&2;
        $echo The command "cmp t5d.out $srcdir/t5d.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -335,15 +335,15 @@ test -s t5d.err || rm -f t5d.err
 $xx -a2 -e - -o 1.1 2.2 $srcdir/t5e.in1 $srcdir/t5e.in2 > t5e.out 2> t5e.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5e failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 5e failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t5e.out $srcdir/t5e.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5e; fi ;; # equal files
-    1) $echo Test 5e failed: files t5e.out and $srcdir/t5e.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5e"; fi ;;
+    1) $echo "Test 5e failed: files t5e.out and $srcdir/t5e.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 5e may have failed. 1>&2;
+    2) $echo "Test 5e may have failed." 1>&2;
        $echo The command "cmp t5e.out $srcdir/t5e.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -352,15 +352,15 @@ test -s t5e.err || rm -f t5e.err
 $xx -a2 -e - -o 2.2 1.1 $srcdir/t5f.in1 $srcdir/t5f.in2 > t5f.out 2> t5f.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5f failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 5f failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t5f.out $srcdir/t5f.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5f; fi ;; # equal files
-    1) $echo Test 5f failed: files t5f.out and $srcdir/t5f.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5f"; fi ;;
+    1) $echo "Test 5f failed: files t5f.out and $srcdir/t5f.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 5f may have failed. 1>&2;
+    2) $echo "Test 5f may have failed." 1>&2;
        $echo The command "cmp t5f.out $srcdir/t5f.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -369,15 +369,15 @@ test -s t5f.err || rm -f t5f.err
 $xx -a1 -e - -o 2.2 1.1 $srcdir/t5g.in1 $srcdir/t5g.in2 > t5g.out 2> t5g.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5g failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 5g failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t5g.out $srcdir/t5g.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5g; fi ;; # equal files
-    1) $echo Test 5g failed: files t5g.out and $srcdir/t5g.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5g"; fi ;;
+    1) $echo "Test 5g failed: files t5g.out and $srcdir/t5g.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 5g may have failed. 1>&2;
+    2) $echo "Test 5g may have failed." 1>&2;
        $echo The command "cmp t5g.out $srcdir/t5g.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -386,15 +386,15 @@ test -s t5g.err || rm -f t5g.err
 $xx -a1 -e - -o 2.2 1.1 $srcdir/t5h.in1 $srcdir/t5h.in2 > t5h.out 2> t5h.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5h failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 5h failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t5h.out $srcdir/t5h.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5h; fi ;; # equal files
-    1) $echo Test 5h failed: files t5h.out and $srcdir/t5h.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5h"; fi ;;
+    1) $echo "Test 5h failed: files t5h.out and $srcdir/t5h.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 5h may have failed. 1>&2;
+    2) $echo "Test 5h may have failed." 1>&2;
        $echo The command "cmp t5h.out $srcdir/t5h.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -403,15 +403,15 @@ test -s t5h.err || rm -f t5h.err
 $xx -a1 -e - -o 1.1 2.2 $srcdir/t5i.in1 $srcdir/t5i.in2 > t5i.out 2> t5i.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5i failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 5i failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t5i.out $srcdir/t5i.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5i; fi ;; # equal files
-    1) $echo Test 5i failed: files t5i.out and $srcdir/t5i.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5i"; fi ;;
+    1) $echo "Test 5i failed: files t5i.out and $srcdir/t5i.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 5i may have failed. 1>&2;
+    2) $echo "Test 5i may have failed." 1>&2;
        $echo The command "cmp t5i.out $srcdir/t5i.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -420,15 +420,15 @@ test -s t5i.err || rm -f t5i.err
 $xx -a2 -e - -o 2.2 1.1 $srcdir/t5j.in1 $srcdir/t5j.in2 > t5j.out 2> t5j.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5j failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 5j failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t5j.out $srcdir/t5j.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5j; fi ;; # equal files
-    1) $echo Test 5j failed: files t5j.out and $srcdir/t5j.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5j"; fi ;;
+    1) $echo "Test 5j failed: files t5j.out and $srcdir/t5j.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 5j may have failed. 1>&2;
+    2) $echo "Test 5j may have failed." 1>&2;
        $echo The command "cmp t5j.out $srcdir/t5j.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -437,15 +437,15 @@ test -s t5j.err || rm -f t5j.err
 $xx -a2 -e - -o 2.2 1.1 $srcdir/t5k.in1 $srcdir/t5k.in2 > t5k.out 2> t5k.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5k failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 5k failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t5k.out $srcdir/t5k.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5k; fi ;; # equal files
-    1) $echo Test 5k failed: files t5k.out and $srcdir/t5k.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5k"; fi ;;
+    1) $echo "Test 5k failed: files t5k.out and $srcdir/t5k.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 5k may have failed. 1>&2;
+    2) $echo "Test 5k may have failed." 1>&2;
        $echo The command "cmp t5k.out $srcdir/t5k.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -454,15 +454,15 @@ test -s t5k.err || rm -f t5k.err
 $xx -a1 -e - -o 2.2 1.1 $srcdir/t5l.in1 $srcdir/t5l.in2 > t5l.out 2> t5l.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5l failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 5l failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t5l.out $srcdir/t5l.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5l; fi ;; # equal files
-    1) $echo Test 5l failed: files t5l.out and $srcdir/t5l.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5l"; fi ;;
+    1) $echo "Test 5l failed: files t5l.out and $srcdir/t5l.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 5l may have failed. 1>&2;
+    2) $echo "Test 5l may have failed." 1>&2;
        $echo The command "cmp t5l.out $srcdir/t5l.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -471,15 +471,15 @@ test -s t5l.err || rm -f t5l.err
 $xx -a2 -e - -o 2.2 1.1 $srcdir/t5m.in1 $srcdir/t5m.in2 > t5m.out 2> t5m.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5m failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 5m failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t5m.out $srcdir/t5m.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5m; fi ;; # equal files
-    1) $echo Test 5m failed: files t5m.out and $srcdir/t5m.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5m"; fi ;;
+    1) $echo "Test 5m failed: files t5m.out and $srcdir/t5m.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 5m may have failed. 1>&2;
+    2) $echo "Test 5m may have failed." 1>&2;
        $echo The command "cmp t5m.out $srcdir/t5m.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -488,15 +488,15 @@ test -s t5m.err || rm -f t5m.err
 $xx -e - $srcdir/t6a.in1 $srcdir/t6a.in2 > t6a.out 2> t6a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 6a failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 6a failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t6a.out $srcdir/t6a.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 6a; fi ;; # equal files
-    1) $echo Test 6a failed: files t6a.out and $srcdir/t6a.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 6a"; fi ;;
+    1) $echo "Test 6a failed: files t6a.out and $srcdir/t6a.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 6a may have failed. 1>&2;
+    2) $echo "Test 6a may have failed." 1>&2;
        $echo The command "cmp t6a.out $srcdir/t6a.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -505,15 +505,15 @@ test -s t6a.err || rm -f t6a.err
 $xx -a1 -e - $srcdir/t6b.in1 $srcdir/t6b.in2 > t6b.out 2> t6b.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 6b failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 6b failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t6b.out $srcdir/t6b.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 6b; fi ;; # equal files
-    1) $echo Test 6b failed: files t6b.out and $srcdir/t6b.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 6b"; fi ;;
+    1) $echo "Test 6b failed: files t6b.out and $srcdir/t6b.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 6b may have failed. 1>&2;
+    2) $echo "Test 6b may have failed." 1>&2;
        $echo The command "cmp t6b.out $srcdir/t6b.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -522,15 +522,15 @@ test -s t6b.err || rm -f t6b.err
 $xx -a1 -e - $srcdir/t6c.in1 $srcdir/t6c.in2 > t6c.out 2> t6c.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 6c failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 6c failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t6c.out $srcdir/t6c.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 6c; fi ;; # equal files
-    1) $echo Test 6c failed: files t6c.out and $srcdir/t6c.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 6c"; fi ;;
+    1) $echo "Test 6c failed: files t6c.out and $srcdir/t6c.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 6c may have failed. 1>&2;
+    2) $echo "Test 6c may have failed." 1>&2;
        $echo The command "cmp t6c.out $srcdir/t6c.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -539,15 +539,15 @@ test -s t6c.err || rm -f t6c.err
 $xx -a1 -e . -o 2.7 $srcdir/t7a.in1 $srcdir/t7a.in2 > t7a.out 2> t7a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 7a failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 7a failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t7a.out $srcdir/t7a.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 7a; fi ;; # equal files
-    1) $echo Test 7a failed: files t7a.out and $srcdir/t7a.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 7a"; fi ;;
+    1) $echo "Test 7a failed: files t7a.out and $srcdir/t7a.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 7a may have failed. 1>&2;
+    2) $echo "Test 7a may have failed." 1>&2;
        $echo The command "cmp t7a.out $srcdir/t7a.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -556,15 +556,15 @@ test -s t7a.err || rm -f t7a.err
 $xx -a1 -e . -o 0,1.2 $srcdir/t8a.in1 $srcdir/t8a.in2 > t8a.out 2> t8a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 8a failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 8a failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t8a.out $srcdir/t8a.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 8a; fi ;; # equal files
-    1) $echo Test 8a failed: files t8a.out and $srcdir/t8a.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 8a"; fi ;;
+    1) $echo "Test 8a failed: files t8a.out and $srcdir/t8a.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 8a may have failed. 1>&2;
+    2) $echo "Test 8a may have failed." 1>&2;
        $echo The command "cmp t8a.out $srcdir/t8a.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -573,15 +573,15 @@ test -s t8a.err || rm -f t8a.err
 $xx -a1 -a2 -e . -o 0,1.2 $srcdir/t8b.in1 $srcdir/t8b.in2 > t8b.out 2> t8b.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 8b failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 8b failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t8b.out $srcdir/t8b.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 8b; fi ;; # equal files
-    1) $echo Test 8b failed: files t8b.out and $srcdir/t8b.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 8b"; fi ;;
+    1) $echo "Test 8b failed: files t8b.out and $srcdir/t8b.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 8b may have failed. 1>&2;
+    2) $echo "Test 8b may have failed." 1>&2;
        $echo The command "cmp t8b.out $srcdir/t8b.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -590,15 +590,15 @@ test -s t8b.err || rm -f t8b.err
 $xx  $srcdir/t9a.in1 $srcdir/t9a.in2 > t9a.out 2> t9a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9a failed: ../../src/join return code $code differs from expected value 0 1>&2
+  $echo "Test 9a failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9a.out $srcdir/t9a.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9a; fi ;; # equal files
-    1) $echo Test 9a failed: files t9a.out and $srcdir/t9a.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9a"; fi ;;
+    1) $echo "Test 9a failed: files t9a.out and $srcdir/t9a.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9a may have failed. 1>&2;
+    2) $echo "Test 9a may have failed." 1>&2;
        $echo The command "cmp t9a.out $srcdir/t9a.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
diff --git a/tests/md5sum/md5sum-tests b/tests/md5sum/md5sum-tests
index 1211a6ea3..b3b7db0e3 100755
--- a/tests/md5sum/md5sum-tests
+++ b/tests/md5sum/md5sum-tests
@@ -12,15 +12,15 @@ test "$VERBOSE" && $xx --version 2> /dev/null
 $xx  < $srcdir/t1.in > t1.out 2> t1.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 1 failed: ../../src/md5sum return code $code differs from expected value 0 1>&2
+  $echo "Test 1 failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t1.out $srcdir/t1.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 1; fi ;; # equal files
-    1) $echo Test 1 failed: files t1.out and $srcdir/t1.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 1"; fi ;;
+    1) $echo "Test 1 failed: files t1.out and $srcdir/t1.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 1 may have failed. 1>&2;
+    2) $echo "Test 1 may have failed." 1>&2;
        $echo The command "cmp t1.out $srcdir/t1.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -29,15 +29,15 @@ test -s t1.err || rm -f t1.err
 $xx  < $srcdir/t2.in > t2.out 2> t2.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 2 failed: ../../src/md5sum return code $code differs from expected value 0 1>&2
+  $echo "Test 2 failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t2.out $srcdir/t2.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 2; fi ;; # equal files
-    1) $echo Test 2 failed: files t2.out and $srcdir/t2.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 2"; fi ;;
+    1) $echo "Test 2 failed: files t2.out and $srcdir/t2.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 2 may have failed. 1>&2;
+    2) $echo "Test 2 may have failed." 1>&2;
        $echo The command "cmp t2.out $srcdir/t2.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -46,15 +46,15 @@ test -s t2.err || rm -f t2.err
 $xx  < $srcdir/t3.in > t3.out 2> t3.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3 failed: ../../src/md5sum return code $code differs from expected value 0 1>&2
+  $echo "Test 3 failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3.out $srcdir/t3.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3; fi ;; # equal files
-    1) $echo Test 3 failed: files t3.out and $srcdir/t3.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3"; fi ;;
+    1) $echo "Test 3 failed: files t3.out and $srcdir/t3.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3 may have failed. 1>&2;
+    2) $echo "Test 3 may have failed." 1>&2;
        $echo The command "cmp t3.out $srcdir/t3.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -63,15 +63,15 @@ test -s t3.err || rm -f t3.err
 $xx  < $srcdir/t4.in > t4.out 2> t4.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 4 failed: ../../src/md5sum return code $code differs from expected value 0 1>&2
+  $echo "Test 4 failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t4.out $srcdir/t4.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 4; fi ;; # equal files
-    1) $echo Test 4 failed: files t4.out and $srcdir/t4.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 4"; fi ;;
+    1) $echo "Test 4 failed: files t4.out and $srcdir/t4.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 4 may have failed. 1>&2;
+    2) $echo "Test 4 may have failed." 1>&2;
        $echo The command "cmp t4.out $srcdir/t4.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -80,15 +80,15 @@ test -s t4.err || rm -f t4.err
 $xx  < $srcdir/t5.in > t5.out 2> t5.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5 failed: ../../src/md5sum return code $code differs from expected value 0 1>&2
+  $echo "Test 5 failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t5.out $srcdir/t5.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5; fi ;; # equal files
-    1) $echo Test 5 failed: files t5.out and $srcdir/t5.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5"; fi ;;
+    1) $echo "Test 5 failed: files t5.out and $srcdir/t5.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 5 may have failed. 1>&2;
+    2) $echo "Test 5 may have failed." 1>&2;
        $echo The command "cmp t5.out $srcdir/t5.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -97,15 +97,15 @@ test -s t5.err || rm -f t5.err
 $xx  < $srcdir/t6.in > t6.out 2> t6.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 6 failed: ../../src/md5sum return code $code differs from expected value 0 1>&2
+  $echo "Test 6 failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t6.out $srcdir/t6.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 6; fi ;; # equal files
-    1) $echo Test 6 failed: files t6.out and $srcdir/t6.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 6"; fi ;;
+    1) $echo "Test 6 failed: files t6.out and $srcdir/t6.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 6 may have failed. 1>&2;
+    2) $echo "Test 6 may have failed." 1>&2;
        $echo The command "cmp t6.out $srcdir/t6.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -114,15 +114,15 @@ test -s t6.err || rm -f t6.err
 $xx  < $srcdir/t7.in > t7.out 2> t7.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 7 failed: ../../src/md5sum return code $code differs from expected value 0 1>&2
+  $echo "Test 7 failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t7.out $srcdir/t7.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 7; fi ;; # equal files
-    1) $echo Test 7 failed: files t7.out and $srcdir/t7.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 7"; fi ;;
+    1) $echo "Test 7 failed: files t7.out and $srcdir/t7.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 7 may have failed. 1>&2;
+    2) $echo "Test 7 may have failed." 1>&2;
        $echo The command "cmp t7.out $srcdir/t7.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
diff --git a/tests/pr/pr-tests b/tests/pr/pr-tests
index fd5541ede..eedbe3cb4 100755
--- a/tests/pr/pr-tests
+++ b/tests/pr/pr-tests
@@ -12,15 +12,15 @@ test "$VERBOSE" && $xx --version 2> /dev/null
 $xx --test -h x  $srcdir/0Ft > t1a.out 2> t1a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 1a failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 1a failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t1a.out $srcdir/0F
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 1a; fi ;; # equal files
-    1) $echo Test 1a failed: files t1a.out and $srcdir/0F differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 1a"; fi ;;
+    1) $echo "Test 1a failed: files t1a.out and $srcdir/0F differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 1a may have failed. 1>&2;
+    2) $echo "Test 1a may have failed." 1>&2;
        $echo The command "cmp t1a.out $srcdir/0F" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -29,15 +29,15 @@ test -s t1a.err || rm -f t1a.err
 $xx --test -h x  $srcdir/0Fnt > t1b.out 2> t1b.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 1b failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 1b failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t1b.out $srcdir/0F
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 1b; fi ;; # equal files
-    1) $echo Test 1b failed: files t1b.out and $srcdir/0F differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 1b"; fi ;;
+    1) $echo "Test 1b failed: files t1b.out and $srcdir/0F differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 1b may have failed. 1>&2;
+    2) $echo "Test 1b may have failed." 1>&2;
        $echo The command "cmp t1b.out $srcdir/0F" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -46,15 +46,15 @@ test -s t1b.err || rm -f t1b.err
 $xx --test -h x +3 $srcdir/0Ft > t1c.out 2> t1c.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 1c failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 1c failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t1c.out $srcdir/3-0F
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 1c; fi ;; # equal files
-    1) $echo Test 1c failed: files t1c.out and $srcdir/3-0F differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 1c"; fi ;;
+    1) $echo "Test 1c failed: files t1c.out and $srcdir/3-0F differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 1c may have failed. 1>&2;
+    2) $echo "Test 1c may have failed." 1>&2;
        $echo The command "cmp t1c.out $srcdir/3-0F" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -63,15 +63,15 @@ test -s t1c.err || rm -f t1c.err
 $xx --test -h x +3 -f $srcdir/0Ft > t1d.out 2> t1d.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 1d failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 1d failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t1d.out $srcdir/3f-0F
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 1d; fi ;; # equal files
-    1) $echo Test 1d failed: files t1d.out and $srcdir/3f-0F differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 1d"; fi ;;
+    1) $echo "Test 1d failed: files t1d.out and $srcdir/3f-0F differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 1d may have failed. 1>&2;
+    2) $echo "Test 1d may have failed." 1>&2;
        $echo The command "cmp t1d.out $srcdir/3f-0F" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -80,15 +80,15 @@ test -s t1d.err || rm -f t1d.err
 $xx --test -h x -a -3 $srcdir/0Ft > t1e.out 2> t1e.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 1e failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 1e failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t1e.out $srcdir/a3-0F
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 1e; fi ;; # equal files
-    1) $echo Test 1e failed: files t1e.out and $srcdir/a3-0F differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 1e"; fi ;;
+    1) $echo "Test 1e failed: files t1e.out and $srcdir/a3-0F differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 1e may have failed. 1>&2;
+    2) $echo "Test 1e may have failed." 1>&2;
        $echo The command "cmp t1e.out $srcdir/a3-0F" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -97,15 +97,15 @@ test -s t1e.err || rm -f t1e.err
 $xx --test -h x -a -3 -f $srcdir/0Ft > t1f.out 2> t1f.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 1f failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 1f failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t1f.out $srcdir/a3f-0F
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 1f; fi ;; # equal files
-    1) $echo Test 1f failed: files t1f.out and $srcdir/a3f-0F differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 1f"; fi ;;
+    1) $echo "Test 1f failed: files t1f.out and $srcdir/a3f-0F differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 1f may have failed. 1>&2;
+    2) $echo "Test 1f may have failed." 1>&2;
        $echo The command "cmp t1f.out $srcdir/a3f-0F" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -114,15 +114,15 @@ test -s t1f.err || rm -f t1f.err
 $xx --test -h x -a -3 -f $srcdir/0Fnt > t1g.out 2> t1g.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 1g failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 1g failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t1g.out $srcdir/a3f-0F
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 1g; fi ;; # equal files
-    1) $echo Test 1g failed: files t1g.out and $srcdir/a3f-0F differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 1g"; fi ;;
+    1) $echo "Test 1g failed: files t1g.out and $srcdir/a3f-0F differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 1g may have failed. 1>&2;
+    2) $echo "Test 1g may have failed." 1>&2;
        $echo The command "cmp t1g.out $srcdir/a3f-0F" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -131,15 +131,15 @@ test -s t1g.err || rm -f t1g.err
 $xx --test -h x +3 -a -3 -f $srcdir/0Ft > t1h.out 2> t1h.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 1h failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 1h failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t1h.out $srcdir/3a3f-0F
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 1h; fi ;; # equal files
-    1) $echo Test 1h failed: files t1h.out and $srcdir/3a3f-0F differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 1h"; fi ;;
+    1) $echo "Test 1h failed: files t1h.out and $srcdir/3a3f-0F differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 1h may have failed. 1>&2;
+    2) $echo "Test 1h may have failed." 1>&2;
        $echo The command "cmp t1h.out $srcdir/3a3f-0F" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -148,15 +148,15 @@ test -s t1h.err || rm -f t1h.err
 $xx --test -h x -b -3 $srcdir/0Ft > t1i.out 2> t1i.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 1i failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 1i failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t1i.out $srcdir/b3-0F
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 1i; fi ;; # equal files
-    1) $echo Test 1i failed: files t1i.out and $srcdir/b3-0F differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 1i"; fi ;;
+    1) $echo "Test 1i failed: files t1i.out and $srcdir/b3-0F differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 1i may have failed. 1>&2;
+    2) $echo "Test 1i may have failed." 1>&2;
        $echo The command "cmp t1i.out $srcdir/b3-0F" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -165,15 +165,15 @@ test -s t1i.err || rm -f t1i.err
 $xx --test -h x -b -3 -f $srcdir/0Ft > t1j.out 2> t1j.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 1j failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 1j failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t1j.out $srcdir/b3f-0F
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 1j; fi ;; # equal files
-    1) $echo Test 1j failed: files t1j.out and $srcdir/b3f-0F differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 1j"; fi ;;
+    1) $echo "Test 1j failed: files t1j.out and $srcdir/b3f-0F differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 1j may have failed. 1>&2;
+    2) $echo "Test 1j may have failed." 1>&2;
        $echo The command "cmp t1j.out $srcdir/b3f-0F" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -182,15 +182,15 @@ test -s t1j.err || rm -f t1j.err
 $xx --test -h x -b -3 -f $srcdir/0Fnt > t1k.out 2> t1k.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 1k failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 1k failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t1k.out $srcdir/b3f-0F
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 1k; fi ;; # equal files
-    1) $echo Test 1k failed: files t1k.out and $srcdir/b3f-0F differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 1k"; fi ;;
+    1) $echo "Test 1k failed: files t1k.out and $srcdir/b3f-0F differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 1k may have failed. 1>&2;
+    2) $echo "Test 1k may have failed." 1>&2;
        $echo The command "cmp t1k.out $srcdir/b3f-0F" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -199,15 +199,15 @@ test -s t1k.err || rm -f t1k.err
 $xx --test -h x +3 -b -3 -f $srcdir/0Ft > t1l.out 2> t1l.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 1l failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 1l failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t1l.out $srcdir/3b3f-0F
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 1l; fi ;; # equal files
-    1) $echo Test 1l failed: files t1l.out and $srcdir/3b3f-0F differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 1l"; fi ;;
+    1) $echo "Test 1l failed: files t1l.out and $srcdir/3b3f-0F differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 1l may have failed. 1>&2;
+    2) $echo "Test 1l may have failed." 1>&2;
        $echo The command "cmp t1l.out $srcdir/3b3f-0F" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -216,15 +216,15 @@ test -s t1l.err || rm -f t1l.err
 $xx --test -h x  $srcdir/0FFt > t2a.out 2> t2a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 2a failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 2a failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t2a.out $srcdir/0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 2a; fi ;; # equal files
-    1) $echo Test 2a failed: files t2a.out and $srcdir/0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 2a"; fi ;;
+    1) $echo "Test 2a failed: files t2a.out and $srcdir/0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 2a may have failed. 1>&2;
+    2) $echo "Test 2a may have failed." 1>&2;
        $echo The command "cmp t2a.out $srcdir/0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -233,15 +233,15 @@ test -s t2a.err || rm -f t2a.err
 $xx --test -h x  $srcdir/0FnFnt > t2b.out 2> t2b.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 2b failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 2b failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t2b.out $srcdir/0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 2b; fi ;; # equal files
-    1) $echo Test 2b failed: files t2b.out and $srcdir/0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 2b"; fi ;;
+    1) $echo "Test 2b failed: files t2b.out and $srcdir/0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 2b may have failed. 1>&2;
+    2) $echo "Test 2b may have failed." 1>&2;
        $echo The command "cmp t2b.out $srcdir/0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -250,15 +250,15 @@ test -s t2b.err || rm -f t2b.err
 $xx --test -h x -a -3 -f $srcdir/0FFt > t2c.out 2> t2c.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 2c failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 2c failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t2c.out $srcdir/a3f-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 2c; fi ;; # equal files
-    1) $echo Test 2c failed: files t2c.out and $srcdir/a3f-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 2c"; fi ;;
+    1) $echo "Test 2c failed: files t2c.out and $srcdir/a3f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 2c may have failed. 1>&2;
+    2) $echo "Test 2c may have failed." 1>&2;
        $echo The command "cmp t2c.out $srcdir/a3f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -267,15 +267,15 @@ test -s t2c.err || rm -f t2c.err
 $xx --test -h x -a -3 -f $srcdir/0FFnt > t2d.out 2> t2d.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 2d failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 2d failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t2d.out $srcdir/a3f-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 2d; fi ;; # equal files
-    1) $echo Test 2d failed: files t2d.out and $srcdir/a3f-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 2d"; fi ;;
+    1) $echo "Test 2d failed: files t2d.out and $srcdir/a3f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 2d may have failed. 1>&2;
+    2) $echo "Test 2d may have failed." 1>&2;
        $echo The command "cmp t2d.out $srcdir/a3f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -284,15 +284,15 @@ test -s t2d.err || rm -f t2d.err
 $xx --test -h x -b -3 -f $srcdir/0FFt > t2e.out 2> t2e.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 2e failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 2e failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t2e.out $srcdir/b3f-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 2e; fi ;; # equal files
-    1) $echo Test 2e failed: files t2e.out and $srcdir/b3f-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 2e"; fi ;;
+    1) $echo "Test 2e failed: files t2e.out and $srcdir/b3f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 2e may have failed. 1>&2;
+    2) $echo "Test 2e may have failed." 1>&2;
        $echo The command "cmp t2e.out $srcdir/b3f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -301,15 +301,15 @@ test -s t2e.err || rm -f t2e.err
 $xx --test -h x -b -3 -f $srcdir/0FFnt > t2f.out 2> t2f.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 2f failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 2f failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t2f.out $srcdir/b3f-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 2f; fi ;; # equal files
-    1) $echo Test 2f failed: files t2f.out and $srcdir/b3f-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 2f"; fi ;;
+    1) $echo "Test 2f failed: files t2f.out and $srcdir/b3f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 2f may have failed. 1>&2;
+    2) $echo "Test 2f may have failed." 1>&2;
        $echo The command "cmp t2f.out $srcdir/b3f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -318,15 +318,15 @@ test -s t2f.err || rm -f t2f.err
 $xx --test -h x -b -3 -f $srcdir/0FnFt > t2g.out 2> t2g.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 2g failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 2g failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t2g.out $srcdir/b3f-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 2g; fi ;; # equal files
-    1) $echo Test 2g failed: files t2g.out and $srcdir/b3f-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 2g"; fi ;;
+    1) $echo "Test 2g failed: files t2g.out and $srcdir/b3f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 2g may have failed. 1>&2;
+    2) $echo "Test 2g may have failed." 1>&2;
        $echo The command "cmp t2g.out $srcdir/b3f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -335,15 +335,15 @@ test -s t2g.err || rm -f t2g.err
 $xx --test -h x -b -3 -f $srcdir/0FnFnt > t2h.out 2> t2h.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 2h failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 2h failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t2h.out $srcdir/b3f-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 2h; fi ;; # equal files
-    1) $echo Test 2h failed: files t2h.out and $srcdir/b3f-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 2h"; fi ;;
+    1) $echo "Test 2h failed: files t2h.out and $srcdir/b3f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 2h may have failed. 1>&2;
+    2) $echo "Test 2h may have failed." 1>&2;
        $echo The command "cmp t2h.out $srcdir/b3f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -352,15 +352,15 @@ test -s t2h.err || rm -f t2h.err
 $xx --test -h x +3 -b -3 -f $srcdir/0FFt > t2i.out 2> t2i.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 2i failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 2i failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t2i.out $srcdir/3b3f-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 2i; fi ;; # equal files
-    1) $echo Test 2i failed: files t2i.out and $srcdir/3b3f-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 2i"; fi ;;
+    1) $echo "Test 2i failed: files t2i.out and $srcdir/3b3f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 2i may have failed. 1>&2;
+    2) $echo "Test 2i may have failed." 1>&2;
        $echo The command "cmp t2i.out $srcdir/3b3f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -369,15 +369,15 @@ test -s t2i.err || rm -f t2i.err
 $xx --test -h x +3 -b -3 -f $srcdir/0FFnt > t2j.out 2> t2j.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 2j failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 2j failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t2j.out $srcdir/3b3f-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 2j; fi ;; # equal files
-    1) $echo Test 2j failed: files t2j.out and $srcdir/3b3f-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 2j"; fi ;;
+    1) $echo "Test 2j failed: files t2j.out and $srcdir/3b3f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 2j may have failed. 1>&2;
+    2) $echo "Test 2j may have failed." 1>&2;
        $echo The command "cmp t2j.out $srcdir/3b3f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -386,15 +386,15 @@ test -s t2j.err || rm -f t2j.err
 $xx --test -h x  $srcdir/FFn > t3a.out 2> t3a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3a failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3a failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3a.out $srcdir/FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3a; fi ;; # equal files
-    1) $echo Test 3a failed: files t3a.out and $srcdir/FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3a"; fi ;;
+    1) $echo "Test 3a failed: files t3a.out and $srcdir/FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3a may have failed. 1>&2;
+    2) $echo "Test 3a may have failed." 1>&2;
        $echo The command "cmp t3a.out $srcdir/FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -403,15 +403,15 @@ test -s t3a.err || rm -f t3a.err
 $xx --test -h x  $srcdir/FnFn > t3b.out 2> t3b.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3b failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3b failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3b.out $srcdir/FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3b; fi ;; # equal files
-    1) $echo Test 3b failed: files t3b.out and $srcdir/FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3b"; fi ;;
+    1) $echo "Test 3b failed: files t3b.out and $srcdir/FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3b may have failed. 1>&2;
+    2) $echo "Test 3b may have failed." 1>&2;
        $echo The command "cmp t3b.out $srcdir/FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -420,15 +420,15 @@ test -s t3b.err || rm -f t3b.err
 $xx --test -h x +3 $srcdir/FFn > t3c.out 2> t3c.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3c failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3c failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3c.out $srcdir/3-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3c; fi ;; # equal files
-    1) $echo Test 3c failed: files t3c.out and $srcdir/3-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3c"; fi ;;
+    1) $echo "Test 3c failed: files t3c.out and $srcdir/3-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3c may have failed. 1>&2;
+    2) $echo "Test 3c may have failed." 1>&2;
        $echo The command "cmp t3c.out $srcdir/3-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -437,15 +437,15 @@ test -s t3c.err || rm -f t3c.err
 $xx --test -h x +3 -f $srcdir/FFn > t3d.out 2> t3d.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3d failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3d failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3d.out $srcdir/3f-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3d; fi ;; # equal files
-    1) $echo Test 3d failed: files t3d.out and $srcdir/3f-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3d"; fi ;;
+    1) $echo "Test 3d failed: files t3d.out and $srcdir/3f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3d may have failed. 1>&2;
+    2) $echo "Test 3d may have failed." 1>&2;
        $echo The command "cmp t3d.out $srcdir/3f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -454,15 +454,15 @@ test -s t3d.err || rm -f t3d.err
 $xx --test -h x -a -3 -f $srcdir/FFn > t3e.out 2> t3e.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3e failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3e failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3e.out $srcdir/a3f-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3e; fi ;; # equal files
-    1) $echo Test 3e failed: files t3e.out and $srcdir/a3f-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3e"; fi ;;
+    1) $echo "Test 3e failed: files t3e.out and $srcdir/a3f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3e may have failed. 1>&2;
+    2) $echo "Test 3e may have failed." 1>&2;
        $echo The command "cmp t3e.out $srcdir/a3f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -471,15 +471,15 @@ test -s t3e.err || rm -f t3e.err
 $xx --test -h x -a -3 -f $srcdir/FFtn > t3f.out 2> t3f.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3f failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3f failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3f.out $srcdir/a3f-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3f; fi ;; # equal files
-    1) $echo Test 3f failed: files t3f.out and $srcdir/a3f-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3f"; fi ;;
+    1) $echo "Test 3f failed: files t3f.out and $srcdir/a3f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3f may have failed. 1>&2;
+    2) $echo "Test 3f may have failed." 1>&2;
        $echo The command "cmp t3f.out $srcdir/a3f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -488,15 +488,15 @@ test -s t3f.err || rm -f t3f.err
 $xx --test -h x -b -3 -f $srcdir/FFn > t3g.out 2> t3g.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3g failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3g failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3g.out $srcdir/b3f-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3g; fi ;; # equal files
-    1) $echo Test 3g failed: files t3g.out and $srcdir/b3f-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3g"; fi ;;
+    1) $echo "Test 3g failed: files t3g.out and $srcdir/b3f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3g may have failed. 1>&2;
+    2) $echo "Test 3g may have failed." 1>&2;
        $echo The command "cmp t3g.out $srcdir/b3f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -505,15 +505,15 @@ test -s t3g.err || rm -f t3g.err
 $xx --test -h x -b -3 -f $srcdir/FFtn > t3h.out 2> t3h.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3h failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3h failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3h.out $srcdir/b3f-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3h; fi ;; # equal files
-    1) $echo Test 3h failed: files t3h.out and $srcdir/b3f-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3h"; fi ;;
+    1) $echo "Test 3h failed: files t3h.out and $srcdir/b3f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3h may have failed. 1>&2;
+    2) $echo "Test 3h may have failed." 1>&2;
        $echo The command "cmp t3h.out $srcdir/b3f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -522,15 +522,15 @@ test -s t3h.err || rm -f t3h.err
 $xx --test -h x -b -3 -f $srcdir/FnFn > t3i.out 2> t3i.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3i failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3i failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3i.out $srcdir/b3f-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3i; fi ;; # equal files
-    1) $echo Test 3i failed: files t3i.out and $srcdir/b3f-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3i"; fi ;;
+    1) $echo "Test 3i failed: files t3i.out and $srcdir/b3f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3i may have failed. 1>&2;
+    2) $echo "Test 3i may have failed." 1>&2;
        $echo The command "cmp t3i.out $srcdir/b3f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -539,15 +539,15 @@ test -s t3i.err || rm -f t3i.err
 $xx --test -h x -b -3 -f $srcdir/tFFn > t3j.out 2> t3j.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3j failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3j failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3j.out $srcdir/b3f-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3j; fi ;; # equal files
-    1) $echo Test 3j failed: files t3j.out and $srcdir/b3f-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3j"; fi ;;
+    1) $echo "Test 3j failed: files t3j.out and $srcdir/b3f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3j may have failed. 1>&2;
+    2) $echo "Test 3j may have failed." 1>&2;
        $echo The command "cmp t3j.out $srcdir/b3f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -556,15 +556,15 @@ test -s t3j.err || rm -f t3j.err
 $xx --test -h x -b -3 -f $srcdir/tFnFt > t3k.out 2> t3k.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3k failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3k failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3k.out $srcdir/b3f-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3k; fi ;; # equal files
-    1) $echo Test 3k failed: files t3k.out and $srcdir/b3f-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3k"; fi ;;
+    1) $echo "Test 3k failed: files t3k.out and $srcdir/b3f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3k may have failed. 1>&2;
+    2) $echo "Test 3k may have failed." 1>&2;
        $echo The command "cmp t3k.out $srcdir/b3f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -573,15 +573,15 @@ test -s t3k.err || rm -f t3k.err
 $xx --test -h x +3 -b -3 -f $srcdir/FFn > t3l.out 2> t3l.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3l failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3l failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3l.out $srcdir/3b3f-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3l; fi ;; # equal files
-    1) $echo Test 3l failed: files t3l.out and $srcdir/3b3f-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3l"; fi ;;
+    1) $echo "Test 3l failed: files t3l.out and $srcdir/3b3f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3l may have failed. 1>&2;
+    2) $echo "Test 3l may have failed." 1>&2;
        $echo The command "cmp t3l.out $srcdir/3b3f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -590,15 +590,15 @@ test -s t3l.err || rm -f t3l.err
 $xx --test -h x +3 -b -3 -f $srcdir/FFtn > t3m.out 2> t3m.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3m failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3m failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3m.out $srcdir/3b3f-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3m; fi ;; # equal files
-    1) $echo Test 3m failed: files t3m.out and $srcdir/3b3f-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3m"; fi ;;
+    1) $echo "Test 3m failed: files t3m.out and $srcdir/3b3f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3m may have failed. 1>&2;
+    2) $echo "Test 3m may have failed." 1>&2;
        $echo The command "cmp t3m.out $srcdir/3b3f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -607,15 +607,15 @@ test -s t3m.err || rm -f t3m.err
 $xx --test -h x -l 24 $srcdir/FFn > t3la.out 2> t3la.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3la failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3la failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3la.out $srcdir/l24-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3la; fi ;; # equal files
-    1) $echo Test 3la failed: files t3la.out and $srcdir/l24-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3la"; fi ;;
+    1) $echo "Test 3la failed: files t3la.out and $srcdir/l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3la may have failed. 1>&2;
+    2) $echo "Test 3la may have failed." 1>&2;
        $echo The command "cmp t3la.out $srcdir/l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -624,15 +624,15 @@ test -s t3la.err || rm -f t3la.err
 $xx --test -h x -l 24 $srcdir/FFtn > t3lb.out 2> t3lb.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3lb failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3lb failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3lb.out $srcdir/l24-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3lb; fi ;; # equal files
-    1) $echo Test 3lb failed: files t3lb.out and $srcdir/l24-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3lb"; fi ;;
+    1) $echo "Test 3lb failed: files t3lb.out and $srcdir/l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3lb may have failed. 1>&2;
+    2) $echo "Test 3lb may have failed." 1>&2;
        $echo The command "cmp t3lb.out $srcdir/l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -641,15 +641,15 @@ test -s t3lb.err || rm -f t3lb.err
 $xx --test -h x -l 24 $srcdir/FnFn > t3lc.out 2> t3lc.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3lc failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3lc failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3lc.out $srcdir/l24-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3lc; fi ;; # equal files
-    1) $echo Test 3lc failed: files t3lc.out and $srcdir/l24-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3lc"; fi ;;
+    1) $echo "Test 3lc failed: files t3lc.out and $srcdir/l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3lc may have failed. 1>&2;
+    2) $echo "Test 3lc may have failed." 1>&2;
        $echo The command "cmp t3lc.out $srcdir/l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -658,15 +658,15 @@ test -s t3lc.err || rm -f t3lc.err
 $xx --test -h x -l 24 $srcdir/tFFn > t3ld.out 2> t3ld.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3ld failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3ld failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3ld.out $srcdir/l24-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3ld; fi ;; # equal files
-    1) $echo Test 3ld failed: files t3ld.out and $srcdir/l24-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3ld"; fi ;;
+    1) $echo "Test 3ld failed: files t3ld.out and $srcdir/l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3ld may have failed. 1>&2;
+    2) $echo "Test 3ld may have failed." 1>&2;
        $echo The command "cmp t3ld.out $srcdir/l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -675,15 +675,15 @@ test -s t3ld.err || rm -f t3ld.err
 $xx --test -h x -l 24 $srcdir/tFnFt > t3le.out 2> t3le.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3le failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3le failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3le.out $srcdir/l24-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3le; fi ;; # equal files
-    1) $echo Test 3le failed: files t3le.out and $srcdir/l24-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3le"; fi ;;
+    1) $echo "Test 3le failed: files t3le.out and $srcdir/l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3le may have failed. 1>&2;
+    2) $echo "Test 3le may have failed." 1>&2;
        $echo The command "cmp t3le.out $srcdir/l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -692,15 +692,15 @@ test -s t3le.err || rm -f t3le.err
 $xx --test -h x -l 24 $srcdir/tFFt > t3lf.out 2> t3lf.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3lf failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3lf failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3lf.out $srcdir/l24-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3lf; fi ;; # equal files
-    1) $echo Test 3lf failed: files t3lf.out and $srcdir/l24-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3lf"; fi ;;
+    1) $echo "Test 3lf failed: files t3lf.out and $srcdir/l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3lf may have failed. 1>&2;
+    2) $echo "Test 3lf may have failed." 1>&2;
        $echo The command "cmp t3lf.out $srcdir/l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -709,15 +709,15 @@ test -s t3lf.err || rm -f t3lf.err
 $xx --test -h x -a -2 -l 17 $srcdir/FFn > t3aa.out 2> t3aa.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3aa failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3aa failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3aa.out $srcdir/a2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3aa; fi ;; # equal files
-    1) $echo Test 3aa failed: files t3aa.out and $srcdir/a2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3aa"; fi ;;
+    1) $echo "Test 3aa failed: files t3aa.out and $srcdir/a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3aa may have failed. 1>&2;
+    2) $echo "Test 3aa may have failed." 1>&2;
        $echo The command "cmp t3aa.out $srcdir/a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -726,15 +726,15 @@ test -s t3aa.err || rm -f t3aa.err
 $xx --test -h x -a -2 -l 17 $srcdir/FFtn > t3ab.out 2> t3ab.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3ab failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3ab failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3ab.out $srcdir/a2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3ab; fi ;; # equal files
-    1) $echo Test 3ab failed: files t3ab.out and $srcdir/a2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3ab"; fi ;;
+    1) $echo "Test 3ab failed: files t3ab.out and $srcdir/a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3ab may have failed. 1>&2;
+    2) $echo "Test 3ab may have failed." 1>&2;
        $echo The command "cmp t3ab.out $srcdir/a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -743,15 +743,15 @@ test -s t3ab.err || rm -f t3ab.err
 $xx --test -h x -a -2 -l 17 $srcdir/FnFn > t3ac.out 2> t3ac.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3ac failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3ac failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3ac.out $srcdir/a2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3ac; fi ;; # equal files
-    1) $echo Test 3ac failed: files t3ac.out and $srcdir/a2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3ac"; fi ;;
+    1) $echo "Test 3ac failed: files t3ac.out and $srcdir/a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3ac may have failed. 1>&2;
+    2) $echo "Test 3ac may have failed." 1>&2;
        $echo The command "cmp t3ac.out $srcdir/a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -760,15 +760,15 @@ test -s t3ac.err || rm -f t3ac.err
 $xx --test -h x -a -2 -l 17 $srcdir/tFFn > t3ad.out 2> t3ad.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3ad failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3ad failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3ad.out $srcdir/a2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3ad; fi ;; # equal files
-    1) $echo Test 3ad failed: files t3ad.out and $srcdir/a2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3ad"; fi ;;
+    1) $echo "Test 3ad failed: files t3ad.out and $srcdir/a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3ad may have failed. 1>&2;
+    2) $echo "Test 3ad may have failed." 1>&2;
        $echo The command "cmp t3ad.out $srcdir/a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -777,15 +777,15 @@ test -s t3ad.err || rm -f t3ad.err
 $xx --test -h x -a -2 -l 17 $srcdir/tFnFt > t3ae.out 2> t3ae.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3ae failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3ae failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3ae.out $srcdir/a2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3ae; fi ;; # equal files
-    1) $echo Test 3ae failed: files t3ae.out and $srcdir/a2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3ae"; fi ;;
+    1) $echo "Test 3ae failed: files t3ae.out and $srcdir/a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3ae may have failed. 1>&2;
+    2) $echo "Test 3ae may have failed." 1>&2;
        $echo The command "cmp t3ae.out $srcdir/a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -794,15 +794,15 @@ test -s t3ae.err || rm -f t3ae.err
 $xx --test -h x -a -2 -l 17 $srcdir/tFFt > t3af.out 2> t3af.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3af failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3af failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3af.out $srcdir/a2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3af; fi ;; # equal files
-    1) $echo Test 3af failed: files t3af.out and $srcdir/a2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3af"; fi ;;
+    1) $echo "Test 3af failed: files t3af.out and $srcdir/a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3af may have failed. 1>&2;
+    2) $echo "Test 3af may have failed." 1>&2;
        $echo The command "cmp t3af.out $srcdir/a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -811,15 +811,15 @@ test -s t3af.err || rm -f t3af.err
 $xx --test -h x -a -2 -l 15 $srcdir/FFn > t3ag.out 2> t3ag.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3ag failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3ag failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3ag.out $srcdir/a2l15-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3ag; fi ;; # equal files
-    1) $echo Test 3ag failed: files t3ag.out and $srcdir/a2l15-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3ag"; fi ;;
+    1) $echo "Test 3ag failed: files t3ag.out and $srcdir/a2l15-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3ag may have failed. 1>&2;
+    2) $echo "Test 3ag may have failed." 1>&2;
        $echo The command "cmp t3ag.out $srcdir/a2l15-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -828,15 +828,15 @@ test -s t3ag.err || rm -f t3ag.err
 $xx --test -h x -a -2 -l 15 $srcdir/FFtn > t3ah.out 2> t3ah.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3ah failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3ah failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3ah.out $srcdir/a2l15-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3ah; fi ;; # equal files
-    1) $echo Test 3ah failed: files t3ah.out and $srcdir/a2l15-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3ah"; fi ;;
+    1) $echo "Test 3ah failed: files t3ah.out and $srcdir/a2l15-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3ah may have failed. 1>&2;
+    2) $echo "Test 3ah may have failed." 1>&2;
        $echo The command "cmp t3ah.out $srcdir/a2l15-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -845,15 +845,15 @@ test -s t3ah.err || rm -f t3ah.err
 $xx --test -h x -a -2 -l 15 $srcdir/FnFn > t3ai.out 2> t3ai.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3ai failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3ai failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3ai.out $srcdir/a2l15-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3ai; fi ;; # equal files
-    1) $echo Test 3ai failed: files t3ai.out and $srcdir/a2l15-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3ai"; fi ;;
+    1) $echo "Test 3ai failed: files t3ai.out and $srcdir/a2l15-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3ai may have failed. 1>&2;
+    2) $echo "Test 3ai may have failed." 1>&2;
        $echo The command "cmp t3ai.out $srcdir/a2l15-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -862,15 +862,15 @@ test -s t3ai.err || rm -f t3ai.err
 $xx --test -h x -a -2 -l 15 $srcdir/tFFn > t3aj.out 2> t3aj.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3aj failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3aj failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3aj.out $srcdir/a2l15-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3aj; fi ;; # equal files
-    1) $echo Test 3aj failed: files t3aj.out and $srcdir/a2l15-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3aj"; fi ;;
+    1) $echo "Test 3aj failed: files t3aj.out and $srcdir/a2l15-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3aj may have failed. 1>&2;
+    2) $echo "Test 3aj may have failed." 1>&2;
        $echo The command "cmp t3aj.out $srcdir/a2l15-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -879,15 +879,15 @@ test -s t3aj.err || rm -f t3aj.err
 $xx --test -h x -a -2 -l 15 $srcdir/tFnFt > t3ak.out 2> t3ak.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3ak failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3ak failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3ak.out $srcdir/a2l15-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3ak; fi ;; # equal files
-    1) $echo Test 3ak failed: files t3ak.out and $srcdir/a2l15-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3ak"; fi ;;
+    1) $echo "Test 3ak failed: files t3ak.out and $srcdir/a2l15-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3ak may have failed. 1>&2;
+    2) $echo "Test 3ak may have failed." 1>&2;
        $echo The command "cmp t3ak.out $srcdir/a2l15-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -896,15 +896,15 @@ test -s t3ak.err || rm -f t3ak.err
 $xx --test -h x -b -2 -l 17 $srcdir/FFn > t3ba.out 2> t3ba.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3ba failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3ba failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3ba.out $srcdir/b2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3ba; fi ;; # equal files
-    1) $echo Test 3ba failed: files t3ba.out and $srcdir/b2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3ba"; fi ;;
+    1) $echo "Test 3ba failed: files t3ba.out and $srcdir/b2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3ba may have failed. 1>&2;
+    2) $echo "Test 3ba may have failed." 1>&2;
        $echo The command "cmp t3ba.out $srcdir/b2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -913,15 +913,15 @@ test -s t3ba.err || rm -f t3ba.err
 $xx --test -h x -b -2 -l 17 $srcdir/FFtn > t3bb.out 2> t3bb.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3bb failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3bb failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3bb.out $srcdir/b2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3bb; fi ;; # equal files
-    1) $echo Test 3bb failed: files t3bb.out and $srcdir/b2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3bb"; fi ;;
+    1) $echo "Test 3bb failed: files t3bb.out and $srcdir/b2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3bb may have failed. 1>&2;
+    2) $echo "Test 3bb may have failed." 1>&2;
        $echo The command "cmp t3bb.out $srcdir/b2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -930,15 +930,15 @@ test -s t3bb.err || rm -f t3bb.err
 $xx --test -h x -b -2 -l 17 $srcdir/FnFn > t3bc.out 2> t3bc.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3bc failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3bc failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3bc.out $srcdir/b2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3bc; fi ;; # equal files
-    1) $echo Test 3bc failed: files t3bc.out and $srcdir/b2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3bc"; fi ;;
+    1) $echo "Test 3bc failed: files t3bc.out and $srcdir/b2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3bc may have failed. 1>&2;
+    2) $echo "Test 3bc may have failed." 1>&2;
        $echo The command "cmp t3bc.out $srcdir/b2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -947,15 +947,15 @@ test -s t3bc.err || rm -f t3bc.err
 $xx --test -h x -b -2 -l 17 $srcdir/tFFn > t3bd.out 2> t3bd.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3bd failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3bd failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3bd.out $srcdir/b2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3bd; fi ;; # equal files
-    1) $echo Test 3bd failed: files t3bd.out and $srcdir/b2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3bd"; fi ;;
+    1) $echo "Test 3bd failed: files t3bd.out and $srcdir/b2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3bd may have failed. 1>&2;
+    2) $echo "Test 3bd may have failed." 1>&2;
        $echo The command "cmp t3bd.out $srcdir/b2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -964,15 +964,15 @@ test -s t3bd.err || rm -f t3bd.err
 $xx --test -h x -b -2 -l 17 $srcdir/tFnFt > t3be.out 2> t3be.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3be failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3be failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3be.out $srcdir/b2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3be; fi ;; # equal files
-    1) $echo Test 3be failed: files t3be.out and $srcdir/b2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3be"; fi ;;
+    1) $echo "Test 3be failed: files t3be.out and $srcdir/b2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3be may have failed. 1>&2;
+    2) $echo "Test 3be may have failed." 1>&2;
        $echo The command "cmp t3be.out $srcdir/b2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -981,15 +981,15 @@ test -s t3be.err || rm -f t3be.err
 $xx --test -h x -b -2 -l 17 $srcdir/tFFt > t3bf.out 2> t3bf.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3bf failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3bf failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3bf.out $srcdir/b2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3bf; fi ;; # equal files
-    1) $echo Test 3bf failed: files t3bf.out and $srcdir/b2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3bf"; fi ;;
+    1) $echo "Test 3bf failed: files t3bf.out and $srcdir/b2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3bf may have failed. 1>&2;
+    2) $echo "Test 3bf may have failed." 1>&2;
        $echo The command "cmp t3bf.out $srcdir/b2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -998,15 +998,15 @@ test -s t3bf.err || rm -f t3bf.err
 $xx --test -h x -b -2 -l 15 $srcdir/FFn > t3bg.out 2> t3bg.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3bg failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3bg failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3bg.out $srcdir/b2l15-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3bg; fi ;; # equal files
-    1) $echo Test 3bg failed: files t3bg.out and $srcdir/b2l15-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3bg"; fi ;;
+    1) $echo "Test 3bg failed: files t3bg.out and $srcdir/b2l15-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3bg may have failed. 1>&2;
+    2) $echo "Test 3bg may have failed." 1>&2;
        $echo The command "cmp t3bg.out $srcdir/b2l15-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1015,15 +1015,15 @@ test -s t3bg.err || rm -f t3bg.err
 $xx --test -h x -b -2 -l 15 $srcdir/FFtn > t3bh.out 2> t3bh.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3bh failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3bh failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3bh.out $srcdir/b2l15-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3bh; fi ;; # equal files
-    1) $echo Test 3bh failed: files t3bh.out and $srcdir/b2l15-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3bh"; fi ;;
+    1) $echo "Test 3bh failed: files t3bh.out and $srcdir/b2l15-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3bh may have failed. 1>&2;
+    2) $echo "Test 3bh may have failed." 1>&2;
        $echo The command "cmp t3bh.out $srcdir/b2l15-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1032,15 +1032,15 @@ test -s t3bh.err || rm -f t3bh.err
 $xx --test -h x -b -2 -l 15 $srcdir/FnFn > t3bi.out 2> t3bi.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3bi failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3bi failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3bi.out $srcdir/b2l15-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3bi; fi ;; # equal files
-    1) $echo Test 3bi failed: files t3bi.out and $srcdir/b2l15-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3bi"; fi ;;
+    1) $echo "Test 3bi failed: files t3bi.out and $srcdir/b2l15-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3bi may have failed. 1>&2;
+    2) $echo "Test 3bi may have failed." 1>&2;
        $echo The command "cmp t3bi.out $srcdir/b2l15-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1049,15 +1049,15 @@ test -s t3bi.err || rm -f t3bi.err
 $xx --test -h x -b -2 -l 15 $srcdir/tFFn > t3bj.out 2> t3bj.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3bj failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3bj failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3bj.out $srcdir/b2l15-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3bj; fi ;; # equal files
-    1) $echo Test 3bj failed: files t3bj.out and $srcdir/b2l15-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3bj"; fi ;;
+    1) $echo "Test 3bj failed: files t3bj.out and $srcdir/b2l15-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3bj may have failed. 1>&2;
+    2) $echo "Test 3bj may have failed." 1>&2;
        $echo The command "cmp t3bj.out $srcdir/b2l15-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1066,15 +1066,15 @@ test -s t3bj.err || rm -f t3bj.err
 $xx --test -h x -b -2 -l 15 $srcdir/tFnFt > t3bk.out 2> t3bk.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3bk failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3bk failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3bk.out $srcdir/b2l15-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3bk; fi ;; # equal files
-    1) $echo Test 3bk failed: files t3bk.out and $srcdir/b2l15-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3bk"; fi ;;
+    1) $echo "Test 3bk failed: files t3bk.out and $srcdir/b2l15-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3bk may have failed. 1>&2;
+    2) $echo "Test 3bk may have failed." 1>&2;
        $echo The command "cmp t3bk.out $srcdir/b2l15-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1083,15 +1083,15 @@ test -s t3bk.err || rm -f t3bk.err
 $xx --test -h x +4 -l 24 $srcdir/FFn > t3Pa.out 2> t3Pa.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3Pa failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3Pa failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3Pa.out $srcdir/4l24-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3Pa; fi ;; # equal files
-    1) $echo Test 3Pa failed: files t3Pa.out and $srcdir/4l24-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3Pa"; fi ;;
+    1) $echo "Test 3Pa failed: files t3Pa.out and $srcdir/4l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3Pa may have failed. 1>&2;
+    2) $echo "Test 3Pa may have failed." 1>&2;
        $echo The command "cmp t3Pa.out $srcdir/4l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1100,15 +1100,15 @@ test -s t3Pa.err || rm -f t3Pa.err
 $xx --test -h x +4 -l 24 $srcdir/FFtn > t3Pb.out 2> t3Pb.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3Pb failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3Pb failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3Pb.out $srcdir/4l24-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3Pb; fi ;; # equal files
-    1) $echo Test 3Pb failed: files t3Pb.out and $srcdir/4l24-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3Pb"; fi ;;
+    1) $echo "Test 3Pb failed: files t3Pb.out and $srcdir/4l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3Pb may have failed. 1>&2;
+    2) $echo "Test 3Pb may have failed." 1>&2;
        $echo The command "cmp t3Pb.out $srcdir/4l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1117,15 +1117,15 @@ test -s t3Pb.err || rm -f t3Pb.err
 $xx --test -h x +4 -l 24 $srcdir/FnFn > t3Pc.out 2> t3Pc.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3Pc failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3Pc failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3Pc.out $srcdir/4l24-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3Pc; fi ;; # equal files
-    1) $echo Test 3Pc failed: files t3Pc.out and $srcdir/4l24-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3Pc"; fi ;;
+    1) $echo "Test 3Pc failed: files t3Pc.out and $srcdir/4l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3Pc may have failed. 1>&2;
+    2) $echo "Test 3Pc may have failed." 1>&2;
        $echo The command "cmp t3Pc.out $srcdir/4l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1134,15 +1134,15 @@ test -s t3Pc.err || rm -f t3Pc.err
 $xx --test -h x +4 -l 24 $srcdir/tFFn > t3Pd.out 2> t3Pd.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3Pd failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3Pd failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3Pd.out $srcdir/4l24-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3Pd; fi ;; # equal files
-    1) $echo Test 3Pd failed: files t3Pd.out and $srcdir/4l24-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3Pd"; fi ;;
+    1) $echo "Test 3Pd failed: files t3Pd.out and $srcdir/4l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3Pd may have failed. 1>&2;
+    2) $echo "Test 3Pd may have failed." 1>&2;
        $echo The command "cmp t3Pd.out $srcdir/4l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1151,15 +1151,15 @@ test -s t3Pd.err || rm -f t3Pd.err
 $xx --test -h x +4 -l 24 $srcdir/tFnFt > t3Pe.out 2> t3Pe.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3Pe failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3Pe failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3Pe.out $srcdir/4l24-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3Pe; fi ;; # equal files
-    1) $echo Test 3Pe failed: files t3Pe.out and $srcdir/4l24-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3Pe"; fi ;;
+    1) $echo "Test 3Pe failed: files t3Pe.out and $srcdir/4l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3Pe may have failed. 1>&2;
+    2) $echo "Test 3Pe may have failed." 1>&2;
        $echo The command "cmp t3Pe.out $srcdir/4l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1168,15 +1168,15 @@ test -s t3Pe.err || rm -f t3Pe.err
 $xx --test -h x +4 -l 24 $srcdir/tFFt > t3Pf.out 2> t3Pf.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3Pf failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3Pf failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3Pf.out $srcdir/4l24-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3Pf; fi ;; # equal files
-    1) $echo Test 3Pf failed: files t3Pf.out and $srcdir/4l24-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3Pf"; fi ;;
+    1) $echo "Test 3Pf failed: files t3Pf.out and $srcdir/4l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3Pf may have failed. 1>&2;
+    2) $echo "Test 3Pf may have failed." 1>&2;
        $echo The command "cmp t3Pf.out $srcdir/4l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1185,15 +1185,15 @@ test -s t3Pf.err || rm -f t3Pf.err
 $xx --test -h x +4:7 -l 24 $srcdir/tFFt > t3Pg.out 2> t3Pg.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3Pg failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3Pg failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3Pg.out $srcdir/4-7l24-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3Pg; fi ;; # equal files
-    1) $echo Test 3Pg failed: files t3Pg.out and $srcdir/4-7l24-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3Pg"; fi ;;
+    1) $echo "Test 3Pg failed: files t3Pg.out and $srcdir/4-7l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3Pg may have failed. 1>&2;
+    2) $echo "Test 3Pg may have failed." 1>&2;
        $echo The command "cmp t3Pg.out $srcdir/4-7l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1202,15 +1202,15 @@ test -s t3Pg.err || rm -f t3Pg.err
 $xx --test -h x +3 -a -2 -l 17 $srcdir/FFn > t3Paa.out 2> t3Paa.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3Paa failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3Paa failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3Paa.out $srcdir/3a2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3Paa; fi ;; # equal files
-    1) $echo Test 3Paa failed: files t3Paa.out and $srcdir/3a2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3Paa"; fi ;;
+    1) $echo "Test 3Paa failed: files t3Paa.out and $srcdir/3a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3Paa may have failed. 1>&2;
+    2) $echo "Test 3Paa may have failed." 1>&2;
        $echo The command "cmp t3Paa.out $srcdir/3a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1219,15 +1219,15 @@ test -s t3Paa.err || rm -f t3Paa.err
 $xx --test -h x +3 -a -2 -l 17 $srcdir/FFtn > t3Pab.out 2> t3Pab.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3Pab failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3Pab failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3Pab.out $srcdir/3a2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3Pab; fi ;; # equal files
-    1) $echo Test 3Pab failed: files t3Pab.out and $srcdir/3a2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3Pab"; fi ;;
+    1) $echo "Test 3Pab failed: files t3Pab.out and $srcdir/3a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3Pab may have failed. 1>&2;
+    2) $echo "Test 3Pab may have failed." 1>&2;
        $echo The command "cmp t3Pab.out $srcdir/3a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1236,15 +1236,15 @@ test -s t3Pab.err || rm -f t3Pab.err
 $xx --test -h x +3 -a -2 -l 17 $srcdir/FnFn > t3Pac.out 2> t3Pac.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3Pac failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3Pac failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3Pac.out $srcdir/3a2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3Pac; fi ;; # equal files
-    1) $echo Test 3Pac failed: files t3Pac.out and $srcdir/3a2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3Pac"; fi ;;
+    1) $echo "Test 3Pac failed: files t3Pac.out and $srcdir/3a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3Pac may have failed. 1>&2;
+    2) $echo "Test 3Pac may have failed." 1>&2;
        $echo The command "cmp t3Pac.out $srcdir/3a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1253,15 +1253,15 @@ test -s t3Pac.err || rm -f t3Pac.err
 $xx --test -h x +3 -a -2 -l 17 $srcdir/tFFn > t3Pad.out 2> t3Pad.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3Pad failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3Pad failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3Pad.out $srcdir/3a2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3Pad; fi ;; # equal files
-    1) $echo Test 3Pad failed: files t3Pad.out and $srcdir/3a2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3Pad"; fi ;;
+    1) $echo "Test 3Pad failed: files t3Pad.out and $srcdir/3a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3Pad may have failed. 1>&2;
+    2) $echo "Test 3Pad may have failed." 1>&2;
        $echo The command "cmp t3Pad.out $srcdir/3a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1270,15 +1270,15 @@ test -s t3Pad.err || rm -f t3Pad.err
 $xx --test -h x +3 -a -2 -l 17 $srcdir/tFnFt > t3Pae.out 2> t3Pae.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3Pae failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3Pae failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3Pae.out $srcdir/3a2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3Pae; fi ;; # equal files
-    1) $echo Test 3Pae failed: files t3Pae.out and $srcdir/3a2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3Pae"; fi ;;
+    1) $echo "Test 3Pae failed: files t3Pae.out and $srcdir/3a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3Pae may have failed. 1>&2;
+    2) $echo "Test 3Pae may have failed." 1>&2;
        $echo The command "cmp t3Pae.out $srcdir/3a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1287,15 +1287,15 @@ test -s t3Pae.err || rm -f t3Pae.err
 $xx --test -h x +3 -a -2 -l 17 $srcdir/tFFt > t3Paf.out 2> t3Paf.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3Paf failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3Paf failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3Paf.out $srcdir/3a2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3Paf; fi ;; # equal files
-    1) $echo Test 3Paf failed: files t3Paf.out and $srcdir/3a2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3Paf"; fi ;;
+    1) $echo "Test 3Paf failed: files t3Paf.out and $srcdir/3a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3Paf may have failed. 1>&2;
+    2) $echo "Test 3Paf may have failed." 1>&2;
        $echo The command "cmp t3Paf.out $srcdir/3a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1304,15 +1304,15 @@ test -s t3Paf.err || rm -f t3Paf.err
 $xx --test -h x +3 -b -2 -l 17 $srcdir/FFn > t3Pba.out 2> t3Pba.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3Pba failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3Pba failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3Pba.out $srcdir/3b2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3Pba; fi ;; # equal files
-    1) $echo Test 3Pba failed: files t3Pba.out and $srcdir/3b2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3Pba"; fi ;;
+    1) $echo "Test 3Pba failed: files t3Pba.out and $srcdir/3b2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3Pba may have failed. 1>&2;
+    2) $echo "Test 3Pba may have failed." 1>&2;
        $echo The command "cmp t3Pba.out $srcdir/3b2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1321,15 +1321,15 @@ test -s t3Pba.err || rm -f t3Pba.err
 $xx --test -h x +3 -b -2 -l 17 $srcdir/FFtn > t3Pbb.out 2> t3Pbb.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3Pbb failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3Pbb failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3Pbb.out $srcdir/3b2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3Pbb; fi ;; # equal files
-    1) $echo Test 3Pbb failed: files t3Pbb.out and $srcdir/3b2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3Pbb"; fi ;;
+    1) $echo "Test 3Pbb failed: files t3Pbb.out and $srcdir/3b2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3Pbb may have failed. 1>&2;
+    2) $echo "Test 3Pbb may have failed." 1>&2;
        $echo The command "cmp t3Pbb.out $srcdir/3b2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1338,15 +1338,15 @@ test -s t3Pbb.err || rm -f t3Pbb.err
 $xx --test -h x +3 -b -2 -l 17 $srcdir/FnFn > t3Pbc.out 2> t3Pbc.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3Pbc failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3Pbc failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3Pbc.out $srcdir/3b2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3Pbc; fi ;; # equal files
-    1) $echo Test 3Pbc failed: files t3Pbc.out and $srcdir/3b2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3Pbc"; fi ;;
+    1) $echo "Test 3Pbc failed: files t3Pbc.out and $srcdir/3b2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3Pbc may have failed. 1>&2;
+    2) $echo "Test 3Pbc may have failed." 1>&2;
        $echo The command "cmp t3Pbc.out $srcdir/3b2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1355,15 +1355,15 @@ test -s t3Pbc.err || rm -f t3Pbc.err
 $xx --test -h x +3 -b -2 -l 17 $srcdir/tFFn > t3Pbd.out 2> t3Pbd.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3Pbd failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3Pbd failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3Pbd.out $srcdir/3b2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3Pbd; fi ;; # equal files
-    1) $echo Test 3Pbd failed: files t3Pbd.out and $srcdir/3b2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3Pbd"; fi ;;
+    1) $echo "Test 3Pbd failed: files t3Pbd.out and $srcdir/3b2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3Pbd may have failed. 1>&2;
+    2) $echo "Test 3Pbd may have failed." 1>&2;
        $echo The command "cmp t3Pbd.out $srcdir/3b2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1372,15 +1372,15 @@ test -s t3Pbd.err || rm -f t3Pbd.err
 $xx --test -h x +3 -b -2 -l 17 $srcdir/tFnFt > t3Pbe.out 2> t3Pbe.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3Pbe failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3Pbe failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3Pbe.out $srcdir/3b2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3Pbe; fi ;; # equal files
-    1) $echo Test 3Pbe failed: files t3Pbe.out and $srcdir/3b2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3Pbe"; fi ;;
+    1) $echo "Test 3Pbe failed: files t3Pbe.out and $srcdir/3b2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3Pbe may have failed. 1>&2;
+    2) $echo "Test 3Pbe may have failed." 1>&2;
        $echo The command "cmp t3Pbe.out $srcdir/3b2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1389,15 +1389,15 @@ test -s t3Pbe.err || rm -f t3Pbe.err
 $xx --test -h x +3 -b -2 -l 17 $srcdir/tFFt > t3Pbf.out 2> t3Pbf.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3Pbf failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 3Pbf failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3Pbf.out $srcdir/3b2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3Pbf; fi ;; # equal files
-    1) $echo Test 3Pbf failed: files t3Pbf.out and $srcdir/3b2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3Pbf"; fi ;;
+    1) $echo "Test 3Pbf failed: files t3Pbf.out and $srcdir/3b2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3Pbf may have failed. 1>&2;
+    2) $echo "Test 3Pbf may have failed." 1>&2;
        $echo The command "cmp t3Pbf.out $srcdir/3b2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1406,15 +1406,15 @@ test -s t3Pbf.err || rm -f t3Pbf.err
 $xx --test -h x -l 24 $srcdir/tn > t4a.out 2> t4a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 4a failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 4a failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t4a.out $srcdir/l24-t
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 4a; fi ;; # equal files
-    1) $echo Test 4a failed: files t4a.out and $srcdir/l24-t differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 4a"; fi ;;
+    1) $echo "Test 4a failed: files t4a.out and $srcdir/l24-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 4a may have failed. 1>&2;
+    2) $echo "Test 4a may have failed." 1>&2;
        $echo The command "cmp t4a.out $srcdir/l24-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1423,15 +1423,15 @@ test -s t4a.err || rm -f t4a.err
 $xx --test -h x -l 17 -f $srcdir/tn > t4b.out 2> t4b.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 4b failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 4b failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t4b.out $srcdir/l17f-t
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 4b; fi ;; # equal files
-    1) $echo Test 4b failed: files t4b.out and $srcdir/l17f-t differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 4b"; fi ;;
+    1) $echo "Test 4b failed: files t4b.out and $srcdir/l17f-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 4b may have failed. 1>&2;
+    2) $echo "Test 4b may have failed." 1>&2;
        $echo The command "cmp t4b.out $srcdir/l17f-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1440,15 +1440,15 @@ test -s t4b.err || rm -f t4b.err
 $xx --test -h x +3 -l 24 $srcdir/tn > t4c.out 2> t4c.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 4c failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 4c failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t4c.out $srcdir/3l24-t
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 4c; fi ;; # equal files
-    1) $echo Test 4c failed: files t4c.out and $srcdir/3l24-t differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 4c"; fi ;;
+    1) $echo "Test 4c failed: files t4c.out and $srcdir/3l24-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 4c may have failed. 1>&2;
+    2) $echo "Test 4c may have failed." 1>&2;
        $echo The command "cmp t4c.out $srcdir/3l24-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1457,15 +1457,15 @@ test -s t4c.err || rm -f t4c.err
 $xx --test -h x +3 -l 17 -f $srcdir/tn > t4d.out 2> t4d.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 4d failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 4d failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t4d.out $srcdir/3l17f-t
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 4d; fi ;; # equal files
-    1) $echo Test 4d failed: files t4d.out and $srcdir/3l17f-t differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 4d"; fi ;;
+    1) $echo "Test 4d failed: files t4d.out and $srcdir/3l17f-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 4d may have failed. 1>&2;
+    2) $echo "Test 4d may have failed." 1>&2;
        $echo The command "cmp t4d.out $srcdir/3l17f-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1474,15 +1474,15 @@ test -s t4d.err || rm -f t4d.err
 $xx --test -h x +3:5 -l 17 -f $srcdir/tn > t4e.out 2> t4e.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 4e failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 4e failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t4e.out $srcdir/3-5l17f-t
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 4e; fi ;; # equal files
-    1) $echo Test 4e failed: files t4e.out and $srcdir/3-5l17f-t differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 4e"; fi ;;
+    1) $echo "Test 4e failed: files t4e.out and $srcdir/3-5l17f-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 4e may have failed. 1>&2;
+    2) $echo "Test 4e may have failed." 1>&2;
        $echo The command "cmp t4e.out $srcdir/3-5l17f-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1491,15 +1491,15 @@ test -s t4e.err || rm -f t4e.err
 $xx --test -h x -a -3 -l 15 $srcdir/tn > t4f.out 2> t4f.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 4f failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 4f failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t4f.out $srcdir/a3l15-t
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 4f; fi ;; # equal files
-    1) $echo Test 4f failed: files t4f.out and $srcdir/a3l15-t differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 4f"; fi ;;
+    1) $echo "Test 4f failed: files t4f.out and $srcdir/a3l15-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 4f may have failed. 1>&2;
+    2) $echo "Test 4f may have failed." 1>&2;
        $echo The command "cmp t4f.out $srcdir/a3l15-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1508,15 +1508,15 @@ test -s t4f.err || rm -f t4f.err
 $xx --test -h x -a -3 -l 8 -f $srcdir/tn > t4g.out 2> t4g.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 4g failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 4g failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t4g.out $srcdir/a3l8f-t
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 4g; fi ;; # equal files
-    1) $echo Test 4g failed: files t4g.out and $srcdir/a3l8f-t differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 4g"; fi ;;
+    1) $echo "Test 4g failed: files t4g.out and $srcdir/a3l8f-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 4g may have failed. 1>&2;
+    2) $echo "Test 4g may have failed." 1>&2;
        $echo The command "cmp t4g.out $srcdir/a3l8f-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1525,15 +1525,15 @@ test -s t4g.err || rm -f t4g.err
 $xx --test -h x +3 -a -3 -l 15 $srcdir/tn > t4h.out 2> t4h.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 4h failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 4h failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t4h.out $srcdir/3a3l15-t
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 4h; fi ;; # equal files
-    1) $echo Test 4h failed: files t4h.out and $srcdir/3a3l15-t differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 4h"; fi ;;
+    1) $echo "Test 4h failed: files t4h.out and $srcdir/3a3l15-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 4h may have failed. 1>&2;
+    2) $echo "Test 4h may have failed." 1>&2;
        $echo The command "cmp t4h.out $srcdir/3a3l15-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1542,15 +1542,15 @@ test -s t4h.err || rm -f t4h.err
 $xx --test -h x +3 -a -3 -l 8 -f $srcdir/tn > t4i.out 2> t4i.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 4i failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 4i failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t4i.out $srcdir/3a3l8f-t
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 4i; fi ;; # equal files
-    1) $echo Test 4i failed: files t4i.out and $srcdir/3a3l8f-t differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 4i"; fi ;;
+    1) $echo "Test 4i failed: files t4i.out and $srcdir/3a3l8f-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 4i may have failed. 1>&2;
+    2) $echo "Test 4i may have failed." 1>&2;
        $echo The command "cmp t4i.out $srcdir/3a3l8f-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1559,15 +1559,15 @@ test -s t4i.err || rm -f t4i.err
 $xx --test -h x -b -3 -l 15 $srcdir/tn > t4j.out 2> t4j.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 4j failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 4j failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t4j.out $srcdir/b3l15-t
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 4j; fi ;; # equal files
-    1) $echo Test 4j failed: files t4j.out and $srcdir/b3l15-t differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 4j"; fi ;;
+    1) $echo "Test 4j failed: files t4j.out and $srcdir/b3l15-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 4j may have failed. 1>&2;
+    2) $echo "Test 4j may have failed." 1>&2;
        $echo The command "cmp t4j.out $srcdir/b3l15-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1576,15 +1576,15 @@ test -s t4j.err || rm -f t4j.err
 $xx --test -h x -b -3 -l 8 -f $srcdir/tn > t4k.out 2> t4k.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 4k failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 4k failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t4k.out $srcdir/b3l8f-t
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 4k; fi ;; # equal files
-    1) $echo Test 4k failed: files t4k.out and $srcdir/b3l8f-t differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 4k"; fi ;;
+    1) $echo "Test 4k failed: files t4k.out and $srcdir/b3l8f-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 4k may have failed. 1>&2;
+    2) $echo "Test 4k may have failed." 1>&2;
        $echo The command "cmp t4k.out $srcdir/b3l8f-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1593,15 +1593,15 @@ test -s t4k.err || rm -f t4k.err
 $xx --test -h x +3 -b -3 -l 15 $srcdir/tn > t4l.out 2> t4l.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 4l failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 4l failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t4l.out $srcdir/3b3l15-t
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 4l; fi ;; # equal files
-    1) $echo Test 4l failed: files t4l.out and $srcdir/3b3l15-t differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 4l"; fi ;;
+    1) $echo "Test 4l failed: files t4l.out and $srcdir/3b3l15-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 4l may have failed. 1>&2;
+    2) $echo "Test 4l may have failed." 1>&2;
        $echo The command "cmp t4l.out $srcdir/3b3l15-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1610,15 +1610,15 @@ test -s t4l.err || rm -f t4l.err
 $xx --test -h x +3 -b -3 -l 8 -f $srcdir/tn > t4m.out 2> t4m.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 4m failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 4m failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t4m.out $srcdir/3b3l8f-t
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 4m; fi ;; # equal files
-    1) $echo Test 4m failed: files t4m.out and $srcdir/3b3l8f-t differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 4m"; fi ;;
+    1) $echo "Test 4m failed: files t4m.out and $srcdir/3b3l8f-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 4m may have failed. 1>&2;
+    2) $echo "Test 4m may have failed." 1>&2;
        $echo The command "cmp t4m.out $srcdir/3b3l8f-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1627,15 +1627,15 @@ test -s t4m.err || rm -f t4m.err
 $xx --test -h x -m -l 24 $srcdir/tn $srcdir/tn > t5a.out 2> t5a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5a failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 5a failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t5a.out $srcdir/ml24-t
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5a; fi ;; # equal files
-    1) $echo Test 5a failed: files t5a.out and $srcdir/ml24-t differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5a"; fi ;;
+    1) $echo "Test 5a failed: files t5a.out and $srcdir/ml24-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 5a may have failed. 1>&2;
+    2) $echo "Test 5a may have failed." 1>&2;
        $echo The command "cmp t5a.out $srcdir/ml24-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1644,15 +1644,15 @@ test -s t5a.err || rm -f t5a.err
 $xx --test -h x -m -l 17 -f $srcdir/tn $srcdir/tn > t5b.out 2> t5b.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5b failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 5b failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t5b.out $srcdir/ml17f-t
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5b; fi ;; # equal files
-    1) $echo Test 5b failed: files t5b.out and $srcdir/ml17f-t differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5b"; fi ;;
+    1) $echo "Test 5b failed: files t5b.out and $srcdir/ml17f-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 5b may have failed. 1>&2;
+    2) $echo "Test 5b may have failed." 1>&2;
        $echo The command "cmp t5b.out $srcdir/ml17f-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1661,15 +1661,15 @@ test -s t5b.err || rm -f t5b.err
 $xx --test -h x +3 -m -l 24 $srcdir/tn $srcdir/tn > t5c.out 2> t5c.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5c failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 5c failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t5c.out $srcdir/3ml24-t
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5c; fi ;; # equal files
-    1) $echo Test 5c failed: files t5c.out and $srcdir/3ml24-t differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5c"; fi ;;
+    1) $echo "Test 5c failed: files t5c.out and $srcdir/3ml24-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 5c may have failed. 1>&2;
+    2) $echo "Test 5c may have failed." 1>&2;
        $echo The command "cmp t5c.out $srcdir/3ml24-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1678,15 +1678,15 @@ test -s t5c.err || rm -f t5c.err
 $xx --test -h x +3 -m -l 17 -f $srcdir/tn $srcdir/tn > t5d.out 2> t5d.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5d failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 5d failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t5d.out $srcdir/3ml17f-t
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5d; fi ;; # equal files
-    1) $echo Test 5d failed: files t5d.out and $srcdir/3ml17f-t differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5d"; fi ;;
+    1) $echo "Test 5d failed: files t5d.out and $srcdir/3ml17f-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 5d may have failed. 1>&2;
+    2) $echo "Test 5d may have failed." 1>&2;
        $echo The command "cmp t5d.out $srcdir/3ml17f-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1695,15 +1695,15 @@ test -s t5d.err || rm -f t5d.err
 $xx --test -h x -m -l 17 -f $srcdir/0Ft $srcdir/0Ft > t5e.out 2> t5e.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5e failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 5e failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t5e.out $srcdir/ml17f-0F
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5e; fi ;; # equal files
-    1) $echo Test 5e failed: files t5e.out and $srcdir/ml17f-0F differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5e"; fi ;;
+    1) $echo "Test 5e failed: files t5e.out and $srcdir/ml17f-0F differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 5e may have failed. 1>&2;
+    2) $echo "Test 5e may have failed." 1>&2;
        $echo The command "cmp t5e.out $srcdir/ml17f-0F" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1712,15 +1712,15 @@ test -s t5e.err || rm -f t5e.err
 $xx --test -h x -m -l 17 -f $srcdir/0Ft $srcdir/0Fnt > t5f.out 2> t5f.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5f failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 5f failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t5f.out $srcdir/ml17f-0F
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5f; fi ;; # equal files
-    1) $echo Test 5f failed: files t5f.out and $srcdir/ml17f-0F differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5f"; fi ;;
+    1) $echo "Test 5f failed: files t5f.out and $srcdir/ml17f-0F differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 5f may have failed. 1>&2;
+    2) $echo "Test 5f may have failed." 1>&2;
        $echo The command "cmp t5f.out $srcdir/ml17f-0F" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1729,15 +1729,15 @@ test -s t5f.err || rm -f t5f.err
 $xx --test -h x -m -l 17 -f $srcdir/tn $srcdir/0Ft > t5g.out 2> t5g.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5g failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 5g failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t5g.out $srcdir/ml17f-t-0F
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5g; fi ;; # equal files
-    1) $echo Test 5g failed: files t5g.out and $srcdir/ml17f-t-0F differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5g"; fi ;;
+    1) $echo "Test 5g failed: files t5g.out and $srcdir/ml17f-t-0F differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 5g may have failed. 1>&2;
+    2) $echo "Test 5g may have failed." 1>&2;
        $echo The command "cmp t5g.out $srcdir/ml17f-t-0F" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1746,15 +1746,15 @@ test -s t5g.err || rm -f t5g.err
 $xx --test -h x -m -l 24 $srcdir/tFFn $srcdir/tFnFt > t5ma.out 2> t5ma.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5ma failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 5ma failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t5ma.out $srcdir/ml24-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5ma; fi ;; # equal files
-    1) $echo Test 5ma failed: files t5ma.out and $srcdir/ml24-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5ma"; fi ;;
+    1) $echo "Test 5ma failed: files t5ma.out and $srcdir/ml24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 5ma may have failed. 1>&2;
+    2) $echo "Test 5ma may have failed." 1>&2;
        $echo The command "cmp t5ma.out $srcdir/ml24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1763,15 +1763,15 @@ test -s t5ma.err || rm -f t5ma.err
 $xx --test -h x -m -l 24 $srcdir/tFFn $srcdir/FFn > t5mb.out 2> t5mb.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5mb failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 5mb failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t5mb.out $srcdir/ml24-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5mb; fi ;; # equal files
-    1) $echo Test 5mb failed: files t5mb.out and $srcdir/ml24-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5mb"; fi ;;
+    1) $echo "Test 5mb failed: files t5mb.out and $srcdir/ml24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 5mb may have failed. 1>&2;
+    2) $echo "Test 5mb may have failed." 1>&2;
        $echo The command "cmp t5mb.out $srcdir/ml24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1780,15 +1780,15 @@ test -s t5mb.err || rm -f t5mb.err
 $xx --test -h x -m -l 24 $srcdir/tn $srcdir/FFn > t5mc.out 2> t5mc.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5mc failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 5mc failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t5mc.out $srcdir/ml24-t-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5mc; fi ;; # equal files
-    1) $echo Test 5mc failed: files t5mc.out and $srcdir/ml24-t-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5mc"; fi ;;
+    1) $echo "Test 5mc failed: files t5mc.out and $srcdir/ml24-t-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 5mc may have failed. 1>&2;
+    2) $echo "Test 5mc may have failed." 1>&2;
        $echo The command "cmp t5mc.out $srcdir/ml24-t-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1797,15 +1797,15 @@ test -s t5mc.err || rm -f t5mc.err
 $xx --test -h x -m -l 20 $srcdir/FFn $srcdir/tn > t5md.out 2> t5md.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5md failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 5md failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t5md.out $srcdir/ml20-FF-t
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5md; fi ;; # equal files
-    1) $echo Test 5md failed: files t5md.out and $srcdir/ml20-FF-t differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5md"; fi ;;
+    1) $echo "Test 5md failed: files t5md.out and $srcdir/ml20-FF-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 5md may have failed. 1>&2;
+    2) $echo "Test 5md may have failed." 1>&2;
        $echo The command "cmp t5md.out $srcdir/ml20-FF-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1814,15 +1814,15 @@ test -s t5md.err || rm -f t5md.err
 $xx --test -h x +3 -m -l 24 $srcdir/FFn $srcdir/FnFn > t5Pma.out 2> t5Pma.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5Pma failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 5Pma failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t5Pma.out $srcdir/3ml24-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5Pma; fi ;; # equal files
-    1) $echo Test 5Pma failed: files t5Pma.out and $srcdir/3ml24-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5Pma"; fi ;;
+    1) $echo "Test 5Pma failed: files t5Pma.out and $srcdir/3ml24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 5Pma may have failed. 1>&2;
+    2) $echo "Test 5Pma may have failed." 1>&2;
        $echo The command "cmp t5Pma.out $srcdir/3ml24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1831,15 +1831,15 @@ test -s t5Pma.err || rm -f t5Pma.err
 $xx --test -h x +3 -m -l 24 $srcdir/tFFn $srcdir/FFn > t5Pmb.out 2> t5Pmb.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5Pmb failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 5Pmb failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t5Pmb.out $srcdir/3ml24-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5Pmb; fi ;; # equal files
-    1) $echo Test 5Pmb failed: files t5Pmb.out and $srcdir/3ml24-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5Pmb"; fi ;;
+    1) $echo "Test 5Pmb failed: files t5Pmb.out and $srcdir/3ml24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 5Pmb may have failed. 1>&2;
+    2) $echo "Test 5Pmb may have failed." 1>&2;
        $echo The command "cmp t5Pmb.out $srcdir/3ml24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1848,15 +1848,15 @@ test -s t5Pmb.err || rm -f t5Pmb.err
 $xx --test -h x +3 -m -l 24 $srcdir/tn $srcdir/FFn > t5Pmc.out 2> t5Pmc.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5Pmc failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 5Pmc failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t5Pmc.out $srcdir/3ml24-t-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5Pmc; fi ;; # equal files
-    1) $echo Test 5Pmc failed: files t5Pmc.out and $srcdir/3ml24-t-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5Pmc"; fi ;;
+    1) $echo "Test 5Pmc failed: files t5Pmc.out and $srcdir/3ml24-t-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 5Pmc may have failed. 1>&2;
+    2) $echo "Test 5Pmc may have failed." 1>&2;
        $echo The command "cmp t5Pmc.out $srcdir/3ml24-t-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1865,15 +1865,15 @@ test -s t5Pmc.err || rm -f t5Pmc.err
 $xx --test -h x -t -l 24 $srcdir/tn > t6a.out 2> t6a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 6a failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 6a failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t6a.out $srcdir/t-t
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 6a; fi ;; # equal files
-    1) $echo Test 6a failed: files t6a.out and $srcdir/t-t differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 6a"; fi ;;
+    1) $echo "Test 6a failed: files t6a.out and $srcdir/t-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 6a may have failed. 1>&2;
+    2) $echo "Test 6a may have failed." 1>&2;
        $echo The command "cmp t6a.out $srcdir/t-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1882,15 +1882,15 @@ test -s t6a.err || rm -f t6a.err
 $xx --test -h x -t -l 17 -f $srcdir/tn > t6b.out 2> t6b.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 6b failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 6b failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t6b.out $srcdir/t-t
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 6b; fi ;; # equal files
-    1) $echo Test 6b failed: files t6b.out and $srcdir/t-t differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 6b"; fi ;;
+    1) $echo "Test 6b failed: files t6b.out and $srcdir/t-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 6b may have failed. 1>&2;
+    2) $echo "Test 6b may have failed." 1>&2;
        $echo The command "cmp t6b.out $srcdir/t-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1899,15 +1899,15 @@ test -s t6b.err || rm -f t6b.err
 $xx --test -h x -t -l 17 -f $srcdir/tFFt-bl > t6c.out 2> t6c.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 6c failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 6c failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t6c.out $srcdir/t-bl
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 6c; fi ;; # equal files
-    1) $echo Test 6c failed: files t6c.out and $srcdir/t-bl differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 6c"; fi ;;
+    1) $echo "Test 6c failed: files t6c.out and $srcdir/t-bl differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 6c may have failed. 1>&2;
+    2) $echo "Test 6c may have failed." 1>&2;
        $echo The command "cmp t6c.out $srcdir/t-bl" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1916,15 +1916,15 @@ test -s t6c.err || rm -f t6c.err
 $xx --test -h x -t -l 24 $srcdir/0FnFnt > t6d.out 2> t6d.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 6d failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 6d failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t6d.out $srcdir/t-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 6d; fi ;; # equal files
-    1) $echo Test 6d failed: files t6d.out and $srcdir/t-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 6d"; fi ;;
+    1) $echo "Test 6d failed: files t6d.out and $srcdir/t-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 6d may have failed. 1>&2;
+    2) $echo "Test 6d may have failed." 1>&2;
        $echo The command "cmp t6d.out $srcdir/t-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1933,15 +1933,15 @@ test -s t6d.err || rm -f t6d.err
 $xx --test -h x -t -l 24 $srcdir/FFn > t6e.out 2> t6e.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 6e failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 6e failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t6e.out $srcdir/t-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 6e; fi ;; # equal files
-    1) $echo Test 6e failed: files t6e.out and $srcdir/t-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 6e"; fi ;;
+    1) $echo "Test 6e failed: files t6e.out and $srcdir/t-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 6e may have failed. 1>&2;
+    2) $echo "Test 6e may have failed." 1>&2;
        $echo The command "cmp t6e.out $srcdir/t-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1950,15 +1950,15 @@ test -s t6e.err || rm -f t6e.err
 $xx --test -h x -t -l 24 $srcdir/FnFn > t6f.out 2> t6f.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 6f failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 6f failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t6f.out $srcdir/t-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 6f; fi ;; # equal files
-    1) $echo Test 6f failed: files t6f.out and $srcdir/t-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 6f"; fi ;;
+    1) $echo "Test 6f failed: files t6f.out and $srcdir/t-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 6f may have failed. 1>&2;
+    2) $echo "Test 6f may have failed." 1>&2;
        $echo The command "cmp t6f.out $srcdir/t-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1967,15 +1967,15 @@ test -s t6f.err || rm -f t6f.err
 $xx --test -h x -t -l 17 -f $srcdir/FFn > t6g.out 2> t6g.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 6g failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 6g failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t6g.out $srcdir/t-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 6g; fi ;; # equal files
-    1) $echo Test 6g failed: files t6g.out and $srcdir/t-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 6g"; fi ;;
+    1) $echo "Test 6g failed: files t6g.out and $srcdir/t-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 6g may have failed. 1>&2;
+    2) $echo "Test 6g may have failed." 1>&2;
        $echo The command "cmp t6g.out $srcdir/t-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1984,15 +1984,15 @@ test -s t6g.err || rm -f t6g.err
 $xx --test -h x -t -a -3 $srcdir/0FnFnt > t6aa.out 2> t6aa.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 6aa failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 6aa failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t6aa.out $srcdir/ta3-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 6aa; fi ;; # equal files
-    1) $echo Test 6aa failed: files t6aa.out and $srcdir/ta3-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 6aa"; fi ;;
+    1) $echo "Test 6aa failed: files t6aa.out and $srcdir/ta3-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 6aa may have failed. 1>&2;
+    2) $echo "Test 6aa may have failed." 1>&2;
        $echo The command "cmp t6aa.out $srcdir/ta3-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2001,15 +2001,15 @@ test -s t6aa.err || rm -f t6aa.err
 $xx --test -h x -t -a -3 $srcdir/FFn > t6ab.out 2> t6ab.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 6ab failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 6ab failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t6ab.out $srcdir/ta3-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 6ab; fi ;; # equal files
-    1) $echo Test 6ab failed: files t6ab.out and $srcdir/ta3-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 6ab"; fi ;;
+    1) $echo "Test 6ab failed: files t6ab.out and $srcdir/ta3-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 6ab may have failed. 1>&2;
+    2) $echo "Test 6ab may have failed." 1>&2;
        $echo The command "cmp t6ab.out $srcdir/ta3-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2018,15 +2018,15 @@ test -s t6ab.err || rm -f t6ab.err
 $xx --test -h x -t -a -3 -l 24 $srcdir/FnFn > t6ac.out 2> t6ac.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 6ac failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 6ac failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t6ac.out $srcdir/ta3-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 6ac; fi ;; # equal files
-    1) $echo Test 6ac failed: files t6ac.out and $srcdir/ta3-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 6ac"; fi ;;
+    1) $echo "Test 6ac failed: files t6ac.out and $srcdir/ta3-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 6ac may have failed. 1>&2;
+    2) $echo "Test 6ac may have failed." 1>&2;
        $echo The command "cmp t6ac.out $srcdir/ta3-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2035,15 +2035,15 @@ test -s t6ac.err || rm -f t6ac.err
 $xx --test -h x -t -b -3 $srcdir/0FnFnt > t6ba.out 2> t6ba.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 6ba failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 6ba failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t6ba.out $srcdir/tb3-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 6ba; fi ;; # equal files
-    1) $echo Test 6ba failed: files t6ba.out and $srcdir/tb3-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 6ba"; fi ;;
+    1) $echo "Test 6ba failed: files t6ba.out and $srcdir/tb3-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 6ba may have failed. 1>&2;
+    2) $echo "Test 6ba may have failed." 1>&2;
        $echo The command "cmp t6ba.out $srcdir/tb3-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2052,15 +2052,15 @@ test -s t6ba.err || rm -f t6ba.err
 $xx --test -h x -t -b -3 $srcdir/FFn > t6bb.out 2> t6bb.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 6bb failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 6bb failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t6bb.out $srcdir/tb3-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 6bb; fi ;; # equal files
-    1) $echo Test 6bb failed: files t6bb.out and $srcdir/tb3-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 6bb"; fi ;;
+    1) $echo "Test 6bb failed: files t6bb.out and $srcdir/tb3-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 6bb may have failed. 1>&2;
+    2) $echo "Test 6bb may have failed." 1>&2;
        $echo The command "cmp t6bb.out $srcdir/tb3-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2069,15 +2069,15 @@ test -s t6bb.err || rm -f t6bb.err
 $xx --test -h x -t -b -3 -l 24 $srcdir/FnFn > t6bc.out 2> t6bc.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 6bc failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 6bc failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t6bc.out $srcdir/tb3-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 6bc; fi ;; # equal files
-    1) $echo Test 6bc failed: files t6bc.out and $srcdir/tb3-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 6bc"; fi ;;
+    1) $echo "Test 6bc failed: files t6bc.out and $srcdir/tb3-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 6bc may have failed. 1>&2;
+    2) $echo "Test 6bc may have failed." 1>&2;
        $echo The command "cmp t6bc.out $srcdir/tb3-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2086,15 +2086,15 @@ test -s t6bc.err || rm -f t6bc.err
 $xx --test -h x -T -l 24 $srcdir/tn > t7a.out 2> t7a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 7a failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 7a failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t7a.out $srcdir/T-t
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 7a; fi ;; # equal files
-    1) $echo Test 7a failed: files t7a.out and $srcdir/T-t differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 7a"; fi ;;
+    1) $echo "Test 7a failed: files t7a.out and $srcdir/T-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 7a may have failed. 1>&2;
+    2) $echo "Test 7a may have failed." 1>&2;
        $echo The command "cmp t7a.out $srcdir/T-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2103,15 +2103,15 @@ test -s t7a.err || rm -f t7a.err
 $xx --test -h x -T -l 17 -f $srcdir/tn > t7b.out 2> t7b.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 7b failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 7b failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t7b.out $srcdir/T-t
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 7b; fi ;; # equal files
-    1) $echo Test 7b failed: files t7b.out and $srcdir/T-t differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 7b"; fi ;;
+    1) $echo "Test 7b failed: files t7b.out and $srcdir/T-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 7b may have failed. 1>&2;
+    2) $echo "Test 7b may have failed." 1>&2;
        $echo The command "cmp t7b.out $srcdir/T-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2120,15 +2120,15 @@ test -s t7b.err || rm -f t7b.err
 $xx --test -h x -T -l 17 -f $srcdir/tFFt-bl > t7c.out 2> t7c.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 7c failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 7c failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t7c.out $srcdir/T-bl
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 7c; fi ;; # equal files
-    1) $echo Test 7c failed: files t7c.out and $srcdir/T-bl differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 7c"; fi ;;
+    1) $echo "Test 7c failed: files t7c.out and $srcdir/T-bl differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 7c may have failed. 1>&2;
+    2) $echo "Test 7c may have failed." 1>&2;
        $echo The command "cmp t7c.out $srcdir/T-bl" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2137,15 +2137,15 @@ test -s t7c.err || rm -f t7c.err
 $xx --test -h x -T -l 24 $srcdir/0FnFnt > t7d.out 2> t7d.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 7d failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 7d failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t7d.out $srcdir/T-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 7d; fi ;; # equal files
-    1) $echo Test 7d failed: files t7d.out and $srcdir/T-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 7d"; fi ;;
+    1) $echo "Test 7d failed: files t7d.out and $srcdir/T-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 7d may have failed. 1>&2;
+    2) $echo "Test 7d may have failed." 1>&2;
        $echo The command "cmp t7d.out $srcdir/T-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2154,15 +2154,15 @@ test -s t7d.err || rm -f t7d.err
 $xx --test -h x -T -l 24 $srcdir/FFn > t7e.out 2> t7e.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 7e failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 7e failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t7e.out $srcdir/T-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 7e; fi ;; # equal files
-    1) $echo Test 7e failed: files t7e.out and $srcdir/T-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 7e"; fi ;;
+    1) $echo "Test 7e failed: files t7e.out and $srcdir/T-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 7e may have failed. 1>&2;
+    2) $echo "Test 7e may have failed." 1>&2;
        $echo The command "cmp t7e.out $srcdir/T-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2171,15 +2171,15 @@ test -s t7e.err || rm -f t7e.err
 $xx --test -h x -T -l 24 $srcdir/FnFn > t7f.out 2> t7f.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 7f failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 7f failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t7f.out $srcdir/T-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 7f; fi ;; # equal files
-    1) $echo Test 7f failed: files t7f.out and $srcdir/T-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 7f"; fi ;;
+    1) $echo "Test 7f failed: files t7f.out and $srcdir/T-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 7f may have failed. 1>&2;
+    2) $echo "Test 7f may have failed." 1>&2;
        $echo The command "cmp t7f.out $srcdir/T-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2188,15 +2188,15 @@ test -s t7f.err || rm -f t7f.err
 $xx --test -h x -T -l 17 -f $srcdir/FFn > t7g.out 2> t7g.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 7g failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 7g failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t7g.out $srcdir/T-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 7g; fi ;; # equal files
-    1) $echo Test 7g failed: files t7g.out and $srcdir/T-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 7g"; fi ;;
+    1) $echo "Test 7g failed: files t7g.out and $srcdir/T-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 7g may have failed. 1>&2;
+    2) $echo "Test 7g may have failed." 1>&2;
        $echo The command "cmp t7g.out $srcdir/T-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2205,15 +2205,15 @@ test -s t7g.err || rm -f t7g.err
 $xx --test -h x -T -a -3 $srcdir/0FnFnt > t7aa.out 2> t7aa.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 7aa failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 7aa failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t7aa.out $srcdir/Ta3-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 7aa; fi ;; # equal files
-    1) $echo Test 7aa failed: files t7aa.out and $srcdir/Ta3-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 7aa"; fi ;;
+    1) $echo "Test 7aa failed: files t7aa.out and $srcdir/Ta3-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 7aa may have failed. 1>&2;
+    2) $echo "Test 7aa may have failed." 1>&2;
        $echo The command "cmp t7aa.out $srcdir/Ta3-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2222,15 +2222,15 @@ test -s t7aa.err || rm -f t7aa.err
 $xx --test -h x -T -a -3 $srcdir/FFn > t7ab.out 2> t7ab.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 7ab failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 7ab failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t7ab.out $srcdir/Ta3-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 7ab; fi ;; # equal files
-    1) $echo Test 7ab failed: files t7ab.out and $srcdir/Ta3-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 7ab"; fi ;;
+    1) $echo "Test 7ab failed: files t7ab.out and $srcdir/Ta3-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 7ab may have failed. 1>&2;
+    2) $echo "Test 7ab may have failed." 1>&2;
        $echo The command "cmp t7ab.out $srcdir/Ta3-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2239,15 +2239,15 @@ test -s t7ab.err || rm -f t7ab.err
 $xx --test -h x -T -a -3 -l 24 $srcdir/FnFn > t7ac.out 2> t7ac.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 7ac failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 7ac failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t7ac.out $srcdir/Ta3-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 7ac; fi ;; # equal files
-    1) $echo Test 7ac failed: files t7ac.out and $srcdir/Ta3-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 7ac"; fi ;;
+    1) $echo "Test 7ac failed: files t7ac.out and $srcdir/Ta3-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 7ac may have failed. 1>&2;
+    2) $echo "Test 7ac may have failed." 1>&2;
        $echo The command "cmp t7ac.out $srcdir/Ta3-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2256,15 +2256,15 @@ test -s t7ac.err || rm -f t7ac.err
 $xx --test -h x -T -b -3 $srcdir/0FnFnt > t7ba.out 2> t7ba.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 7ba failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 7ba failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t7ba.out $srcdir/Tb3-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 7ba; fi ;; # equal files
-    1) $echo Test 7ba failed: files t7ba.out and $srcdir/Tb3-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 7ba"; fi ;;
+    1) $echo "Test 7ba failed: files t7ba.out and $srcdir/Tb3-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 7ba may have failed. 1>&2;
+    2) $echo "Test 7ba may have failed." 1>&2;
        $echo The command "cmp t7ba.out $srcdir/Tb3-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2273,15 +2273,15 @@ test -s t7ba.err || rm -f t7ba.err
 $xx --test -h x -T -b -3 $srcdir/FFn > t7bb.out 2> t7bb.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 7bb failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 7bb failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t7bb.out $srcdir/Tb3-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 7bb; fi ;; # equal files
-    1) $echo Test 7bb failed: files t7bb.out and $srcdir/Tb3-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 7bb"; fi ;;
+    1) $echo "Test 7bb failed: files t7bb.out and $srcdir/Tb3-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 7bb may have failed. 1>&2;
+    2) $echo "Test 7bb may have failed." 1>&2;
        $echo The command "cmp t7bb.out $srcdir/Tb3-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2290,15 +2290,15 @@ test -s t7bb.err || rm -f t7bb.err
 $xx --test -h x -T -b -3 -l 24 $srcdir/FnFn > t7bc.out 2> t7bc.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 7bc failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 7bc failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t7bc.out $srcdir/Tb3-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 7bc; fi ;; # equal files
-    1) $echo Test 7bc failed: files t7bc.out and $srcdir/Tb3-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 7bc"; fi ;;
+    1) $echo "Test 7bc failed: files t7bc.out and $srcdir/Tb3-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 7bc may have failed. 1>&2;
+    2) $echo "Test 7bc may have failed." 1>&2;
        $echo The command "cmp t7bc.out $srcdir/Tb3-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2307,15 +2307,15 @@ test -s t7bc.err || rm -f t7bc.err
 $xx --test -h x -n.3 -l 17 -f $srcdir/tFFt-bl > t9a.out 2> t9a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9a failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9a failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9a.out $srcdir/nl17f-bl
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9a; fi ;; # equal files
-    1) $echo Test 9a failed: files t9a.out and $srcdir/nl17f-bl differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9a"; fi ;;
+    1) $echo "Test 9a failed: files t9a.out and $srcdir/nl17f-bl differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9a may have failed. 1>&2;
+    2) $echo "Test 9a may have failed." 1>&2;
        $echo The command "cmp t9a.out $srcdir/nl17f-bl" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2324,15 +2324,15 @@ test -s t9a.err || rm -f t9a.err
 $xx --test -h x -n.3 -N 15 -l 17 -f $srcdir/tFFt-bl > t9b.out 2> t9b.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9b failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9b failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9b.out $srcdir/nN15l17f-bl
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9b; fi ;; # equal files
-    1) $echo Test 9b failed: files t9b.out and $srcdir/nN15l17f-bl differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9b"; fi ;;
+    1) $echo "Test 9b failed: files t9b.out and $srcdir/nN15l17f-bl differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9b may have failed. 1>&2;
+    2) $echo "Test 9b may have failed." 1>&2;
        $echo The command "cmp t9b.out $srcdir/nN15l17f-bl" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2341,15 +2341,15 @@ test -s t9b.err || rm -f t9b.err
 $xx --test -h x -n.3 +2 -l 17 -f $srcdir/tFFt-bl > t9Pa.out 2> t9Pa.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pa failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pa failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pa.out $srcdir/n+2l17f-bl
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pa; fi ;; # equal files
-    1) $echo Test 9Pa failed: files t9Pa.out and $srcdir/n+2l17f-bl differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pa"; fi ;;
+    1) $echo "Test 9Pa failed: files t9Pa.out and $srcdir/n+2l17f-bl differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pa may have failed. 1>&2;
+    2) $echo "Test 9Pa may have failed." 1>&2;
        $echo The command "cmp t9Pa.out $srcdir/n+2l17f-bl" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2358,15 +2358,15 @@ test -s t9Pa.err || rm -f t9Pa.err
 $xx --test -h x -n.3 +3 -l 17 -f $srcdir/tFFt-bl > t9Pb.out 2> t9Pb.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pb failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pb failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pb.out $srcdir/n+3l17f-bl
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pb; fi ;; # equal files
-    1) $echo Test 9Pb failed: files t9Pb.out and $srcdir/n+3l17f-bl differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pb"; fi ;;
+    1) $echo "Test 9Pb failed: files t9Pb.out and $srcdir/n+3l17f-bl differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pb may have failed. 1>&2;
+    2) $echo "Test 9Pb may have failed." 1>&2;
        $echo The command "cmp t9Pb.out $srcdir/n+3l17f-bl" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2375,15 +2375,15 @@ test -s t9Pb.err || rm -f t9Pb.err
 $xx --test -h x -n.3 -N 1 +3 -l 17 -f $srcdir/tFFt-bl > t9Pc.out 2> t9Pc.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pc failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pc failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pc.out $srcdir/nN1+3l17f-bl
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pc; fi ;; # equal files
-    1) $echo Test 9Pc failed: files t9Pc.out and $srcdir/nN1+3l17f-bl differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pc"; fi ;;
+    1) $echo "Test 9Pc failed: files t9Pc.out and $srcdir/nN1+3l17f-bl differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pc may have failed. 1>&2;
+    2) $echo "Test 9Pc may have failed." 1>&2;
        $echo The command "cmp t9Pc.out $srcdir/nN1+3l17f-bl" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2392,15 +2392,15 @@ test -s t9Pc.err || rm -f t9Pc.err
 $xx --test -h x -n.3 +2 -l 17 -f $srcdir/0FFt > t9Pe.out 2> t9Pe.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pe failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pe failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pe.out $srcdir/n+2l17f-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pe; fi ;; # equal files
-    1) $echo Test 9Pe failed: files t9Pe.out and $srcdir/n+2l17f-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pe"; fi ;;
+    1) $echo "Test 9Pe failed: files t9Pe.out and $srcdir/n+2l17f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pe may have failed. 1>&2;
+    2) $echo "Test 9Pe may have failed." 1>&2;
        $echo The command "cmp t9Pe.out $srcdir/n+2l17f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2409,15 +2409,15 @@ test -s t9Pe.err || rm -f t9Pe.err
 $xx --test -h x -n.3 +2 -l 17 -f $srcdir/0FFnt > t9Pf.out 2> t9Pf.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pf failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pf failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pf.out $srcdir/n+2l17f-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pf; fi ;; # equal files
-    1) $echo Test 9Pf failed: files t9Pf.out and $srcdir/n+2l17f-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pf"; fi ;;
+    1) $echo "Test 9Pf failed: files t9Pf.out and $srcdir/n+2l17f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pf may have failed. 1>&2;
+    2) $echo "Test 9Pf may have failed." 1>&2;
        $echo The command "cmp t9Pf.out $srcdir/n+2l17f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2426,15 +2426,15 @@ test -s t9Pf.err || rm -f t9Pf.err
 $xx --test -h x -n.3 +2 -l 17 -f $srcdir/0FnFt > t9Pg.out 2> t9Pg.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pg failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pg failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pg.out $srcdir/n+2l17f-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pg; fi ;; # equal files
-    1) $echo Test 9Pg failed: files t9Pg.out and $srcdir/n+2l17f-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pg"; fi ;;
+    1) $echo "Test 9Pg failed: files t9Pg.out and $srcdir/n+2l17f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pg may have failed. 1>&2;
+    2) $echo "Test 9Pg may have failed." 1>&2;
        $echo The command "cmp t9Pg.out $srcdir/n+2l17f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2443,15 +2443,15 @@ test -s t9Pg.err || rm -f t9Pg.err
 $xx --test -h x -n.3 +2 -l 17 -f $srcdir/0FnFnt > t9Ph.out 2> t9Ph.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Ph failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Ph failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Ph.out $srcdir/n+2l17f-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Ph; fi ;; # equal files
-    1) $echo Test 9Ph failed: files t9Ph.out and $srcdir/n+2l17f-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Ph"; fi ;;
+    1) $echo "Test 9Ph failed: files t9Ph.out and $srcdir/n+2l17f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Ph may have failed. 1>&2;
+    2) $echo "Test 9Ph may have failed." 1>&2;
        $echo The command "cmp t9Ph.out $srcdir/n+2l17f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2460,15 +2460,15 @@ test -s t9Ph.err || rm -f t9Ph.err
 $xx --test -h x -n.3 +2:5 -l 17 -f $srcdir/0FFt > t9Pi.out 2> t9Pi.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pi failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pi failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pi.out $srcdir/n+2-5l17f-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pi; fi ;; # equal files
-    1) $echo Test 9Pi failed: files t9Pi.out and $srcdir/n+2-5l17f-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pi"; fi ;;
+    1) $echo "Test 9Pi failed: files t9Pi.out and $srcdir/n+2-5l17f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pi may have failed. 1>&2;
+    2) $echo "Test 9Pi may have failed." 1>&2;
        $echo The command "cmp t9Pi.out $srcdir/n+2-5l17f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2477,15 +2477,15 @@ test -s t9Pi.err || rm -f t9Pi.err
 $xx --test -h x -n.3 +3 -l 17 -f $srcdir/0FFt > t9Pj.out 2> t9Pj.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pj failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pj failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pj.out $srcdir/n+3l17f-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pj; fi ;; # equal files
-    1) $echo Test 9Pj failed: files t9Pj.out and $srcdir/n+3l17f-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pj"; fi ;;
+    1) $echo "Test 9Pj failed: files t9Pj.out and $srcdir/n+3l17f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pj may have failed. 1>&2;
+    2) $echo "Test 9Pj may have failed." 1>&2;
        $echo The command "cmp t9Pj.out $srcdir/n+3l17f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2494,15 +2494,15 @@ test -s t9Pj.err || rm -f t9Pj.err
 $xx --test -h x -n.3 +3 -l 17 -f $srcdir/0FFnt > t9Pk.out 2> t9Pk.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pk failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pk failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pk.out $srcdir/n+3l17f-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pk; fi ;; # equal files
-    1) $echo Test 9Pk failed: files t9Pk.out and $srcdir/n+3l17f-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pk"; fi ;;
+    1) $echo "Test 9Pk failed: files t9Pk.out and $srcdir/n+3l17f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pk may have failed. 1>&2;
+    2) $echo "Test 9Pk may have failed." 1>&2;
        $echo The command "cmp t9Pk.out $srcdir/n+3l17f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2511,15 +2511,15 @@ test -s t9Pk.err || rm -f t9Pk.err
 $xx --test -h x -n.3 +3 -l 17 -f $srcdir/0FnFt > t9Pl.out 2> t9Pl.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pl failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pl failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pl.out $srcdir/n+3l17f-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pl; fi ;; # equal files
-    1) $echo Test 9Pl failed: files t9Pl.out and $srcdir/n+3l17f-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pl"; fi ;;
+    1) $echo "Test 9Pl failed: files t9Pl.out and $srcdir/n+3l17f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pl may have failed. 1>&2;
+    2) $echo "Test 9Pl may have failed." 1>&2;
        $echo The command "cmp t9Pl.out $srcdir/n+3l17f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2528,15 +2528,15 @@ test -s t9Pl.err || rm -f t9Pl.err
 $xx --test -h x -n.3 +3 -l 17 -f $srcdir/0FnFnt > t9Pm.out 2> t9Pm.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pm failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pm failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pm.out $srcdir/n+3l17f-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pm; fi ;; # equal files
-    1) $echo Test 9Pm failed: files t9Pm.out and $srcdir/n+3l17f-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pm"; fi ;;
+    1) $echo "Test 9Pm failed: files t9Pm.out and $srcdir/n+3l17f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pm may have failed. 1>&2;
+    2) $echo "Test 9Pm may have failed." 1>&2;
        $echo The command "cmp t9Pm.out $srcdir/n+3l17f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2545,15 +2545,15 @@ test -s t9Pm.err || rm -f t9Pm.err
 $xx --test -h x -n.3 +7 -l 24 $srcdir/FFn > t9Pn.out 2> t9Pn.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pn failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pn failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pn.out $srcdir/n+7l24-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pn; fi ;; # equal files
-    1) $echo Test 9Pn failed: files t9Pn.out and $srcdir/n+7l24-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pn"; fi ;;
+    1) $echo "Test 9Pn failed: files t9Pn.out and $srcdir/n+7l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pn may have failed. 1>&2;
+    2) $echo "Test 9Pn may have failed." 1>&2;
        $echo The command "cmp t9Pn.out $srcdir/n+7l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2562,15 +2562,15 @@ test -s t9Pn.err || rm -f t9Pn.err
 $xx --test -h x -n.3 +7 -l 24 $srcdir/FFtn > t9Po.out 2> t9Po.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Po failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Po failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Po.out $srcdir/n+7l24-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Po; fi ;; # equal files
-    1) $echo Test 9Po failed: files t9Po.out and $srcdir/n+7l24-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Po"; fi ;;
+    1) $echo "Test 9Po failed: files t9Po.out and $srcdir/n+7l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Po may have failed. 1>&2;
+    2) $echo "Test 9Po may have failed." 1>&2;
        $echo The command "cmp t9Po.out $srcdir/n+7l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2579,15 +2579,15 @@ test -s t9Po.err || rm -f t9Po.err
 $xx --test -h x -n.3 +7 -l 24 $srcdir/FnFn > t9Pp.out 2> t9Pp.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pp failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pp failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pp.out $srcdir/n+7l24-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pp; fi ;; # equal files
-    1) $echo Test 9Pp failed: files t9Pp.out and $srcdir/n+7l24-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pp"; fi ;;
+    1) $echo "Test 9Pp failed: files t9Pp.out and $srcdir/n+7l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pp may have failed. 1>&2;
+    2) $echo "Test 9Pp may have failed." 1>&2;
        $echo The command "cmp t9Pp.out $srcdir/n+7l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2596,15 +2596,15 @@ test -s t9Pp.err || rm -f t9Pp.err
 $xx --test -h x -n.3 +3:7 -l 24 $srcdir/FnFn > t9Pq.out 2> t9Pq.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pq failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pq failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pq.out $srcdir/n+3-7l24-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pq; fi ;; # equal files
-    1) $echo Test 9Pq failed: files t9Pq.out and $srcdir/n+3-7l24-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pq"; fi ;;
+    1) $echo "Test 9Pq failed: files t9Pq.out and $srcdir/n+3-7l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pq may have failed. 1>&2;
+    2) $echo "Test 9Pq may have failed." 1>&2;
        $echo The command "cmp t9Pq.out $srcdir/n+3-7l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2613,15 +2613,15 @@ test -s t9Pq.err || rm -f t9Pq.err
 $xx --test -h x -n.3 +8 -l 20 $srcdir/tFFn > t9Pr.out 2> t9Pr.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pr failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pr failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pr.out $srcdir/n+8l20-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pr; fi ;; # equal files
-    1) $echo Test 9Pr failed: files t9Pr.out and $srcdir/n+8l20-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pr"; fi ;;
+    1) $echo "Test 9Pr failed: files t9Pr.out and $srcdir/n+8l20-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pr may have failed. 1>&2;
+    2) $echo "Test 9Pr may have failed." 1>&2;
        $echo The command "cmp t9Pr.out $srcdir/n+8l20-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2630,15 +2630,15 @@ test -s t9Pr.err || rm -f t9Pr.err
 $xx --test -h x -n.3 +8 -l 20 $srcdir/tFnFt > t9Ps.out 2> t9Ps.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Ps failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Ps failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Ps.out $srcdir/n+8l20-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Ps; fi ;; # equal files
-    1) $echo Test 9Ps failed: files t9Ps.out and $srcdir/n+8l20-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Ps"; fi ;;
+    1) $echo "Test 9Ps failed: files t9Ps.out and $srcdir/n+8l20-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Ps may have failed. 1>&2;
+    2) $echo "Test 9Ps may have failed." 1>&2;
        $echo The command "cmp t9Ps.out $srcdir/n+8l20-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2647,15 +2647,15 @@ test -s t9Ps.err || rm -f t9Ps.err
 $xx --test -h x -n.3 +8 -l 20 $srcdir/tFFt > t9Pt.out 2> t9Pt.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pt failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pt failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pt.out $srcdir/n+8l20-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pt; fi ;; # equal files
-    1) $echo Test 9Pt failed: files t9Pt.out and $srcdir/n+8l20-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pt"; fi ;;
+    1) $echo "Test 9Pt failed: files t9Pt.out and $srcdir/n+8l20-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pt may have failed. 1>&2;
+    2) $echo "Test 9Pt may have failed." 1>&2;
        $echo The command "cmp t9Pt.out $srcdir/n+8l20-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2664,15 +2664,15 @@ test -s t9Pt.err || rm -f t9Pt.err
 $xx --test -h x -n.3 +5 -a -3 -l 6 -f $srcdir/0FFt > t9Paa.out 2> t9Paa.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Paa failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Paa failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Paa.out $srcdir/n+5a3l6f-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Paa; fi ;; # equal files
-    1) $echo Test 9Paa failed: files t9Paa.out and $srcdir/n+5a3l6f-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Paa"; fi ;;
+    1) $echo "Test 9Paa failed: files t9Paa.out and $srcdir/n+5a3l6f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Paa may have failed. 1>&2;
+    2) $echo "Test 9Paa may have failed." 1>&2;
        $echo The command "cmp t9Paa.out $srcdir/n+5a3l6f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2681,15 +2681,15 @@ test -s t9Paa.err || rm -f t9Paa.err
 $xx --test -h x -n.3 +5 -a -3 -l 6 -f $srcdir/0FFnt > t9Pab.out 2> t9Pab.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pab failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pab failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pab.out $srcdir/n+5a3l6f-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pab; fi ;; # equal files
-    1) $echo Test 9Pab failed: files t9Pab.out and $srcdir/n+5a3l6f-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pab"; fi ;;
+    1) $echo "Test 9Pab failed: files t9Pab.out and $srcdir/n+5a3l6f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pab may have failed. 1>&2;
+    2) $echo "Test 9Pab may have failed." 1>&2;
        $echo The command "cmp t9Pab.out $srcdir/n+5a3l6f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2698,15 +2698,15 @@ test -s t9Pab.err || rm -f t9Pab.err
 $xx --test -h x -n.3 +5 -a -3 -l 6 -f $srcdir/0FnFt > t9Pac.out 2> t9Pac.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pac failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pac failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pac.out $srcdir/n+5a3l6f-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pac; fi ;; # equal files
-    1) $echo Test 9Pac failed: files t9Pac.out and $srcdir/n+5a3l6f-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pac"; fi ;;
+    1) $echo "Test 9Pac failed: files t9Pac.out and $srcdir/n+5a3l6f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pac may have failed. 1>&2;
+    2) $echo "Test 9Pac may have failed." 1>&2;
        $echo The command "cmp t9Pac.out $srcdir/n+5a3l6f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2715,15 +2715,15 @@ test -s t9Pac.err || rm -f t9Pac.err
 $xx --test -h x -n.3 +5 -a -3 -l 6 -f $srcdir/0FnFnt > t9Pad.out 2> t9Pad.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pad failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pad failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pad.out $srcdir/n+5a3l6f-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pad; fi ;; # equal files
-    1) $echo Test 9Pad failed: files t9Pad.out and $srcdir/n+5a3l6f-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pad"; fi ;;
+    1) $echo "Test 9Pad failed: files t9Pad.out and $srcdir/n+5a3l6f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pad may have failed. 1>&2;
+    2) $echo "Test 9Pad may have failed." 1>&2;
        $echo The command "cmp t9Pad.out $srcdir/n+5a3l6f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2732,15 +2732,15 @@ test -s t9Pad.err || rm -f t9Pad.err
 $xx --test -h x -n.3 +6 -a -2 -l 17 $srcdir/FFn > t9Pae.out 2> t9Pae.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pae failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pae failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pae.out $srcdir/n+6a2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pae; fi ;; # equal files
-    1) $echo Test 9Pae failed: files t9Pae.out and $srcdir/n+6a2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pae"; fi ;;
+    1) $echo "Test 9Pae failed: files t9Pae.out and $srcdir/n+6a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pae may have failed. 1>&2;
+    2) $echo "Test 9Pae may have failed." 1>&2;
        $echo The command "cmp t9Pae.out $srcdir/n+6a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2749,15 +2749,15 @@ test -s t9Pae.err || rm -f t9Pae.err
 $xx --test -h x -n.3 +6 -a -2 -l 17 $srcdir/FFtn > t9Paf.out 2> t9Paf.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Paf failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Paf failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Paf.out $srcdir/n+6a2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Paf; fi ;; # equal files
-    1) $echo Test 9Paf failed: files t9Paf.out and $srcdir/n+6a2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Paf"; fi ;;
+    1) $echo "Test 9Paf failed: files t9Paf.out and $srcdir/n+6a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Paf may have failed. 1>&2;
+    2) $echo "Test 9Paf may have failed." 1>&2;
        $echo The command "cmp t9Paf.out $srcdir/n+6a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2766,15 +2766,15 @@ test -s t9Paf.err || rm -f t9Paf.err
 $xx --test -h x -n.3 +6 -a -2 -l 17 $srcdir/FnFn > t9Pag.out 2> t9Pag.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pag failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pag failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pag.out $srcdir/n+6a2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pag; fi ;; # equal files
-    1) $echo Test 9Pag failed: files t9Pag.out and $srcdir/n+6a2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pag"; fi ;;
+    1) $echo "Test 9Pag failed: files t9Pag.out and $srcdir/n+6a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pag may have failed. 1>&2;
+    2) $echo "Test 9Pag may have failed." 1>&2;
        $echo The command "cmp t9Pag.out $srcdir/n+6a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2783,15 +2783,15 @@ test -s t9Pag.err || rm -f t9Pag.err
 $xx --test -h x -n.3 +6 -a -2 -l 17 $srcdir/tFFn > t9Pah.out 2> t9Pah.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pah failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pah failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pah.out $srcdir/n+6a2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pah; fi ;; # equal files
-    1) $echo Test 9Pah failed: files t9Pah.out and $srcdir/n+6a2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pah"; fi ;;
+    1) $echo "Test 9Pah failed: files t9Pah.out and $srcdir/n+6a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pah may have failed. 1>&2;
+    2) $echo "Test 9Pah may have failed." 1>&2;
        $echo The command "cmp t9Pah.out $srcdir/n+6a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2800,15 +2800,15 @@ test -s t9Pah.err || rm -f t9Pah.err
 $xx --test -h x -n.3 +6 -a -2 -l 17 $srcdir/tFnFt > t9Pai.out 2> t9Pai.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pai failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pai failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pai.out $srcdir/n+6a2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pai; fi ;; # equal files
-    1) $echo Test 9Pai failed: files t9Pai.out and $srcdir/n+6a2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pai"; fi ;;
+    1) $echo "Test 9Pai failed: files t9Pai.out and $srcdir/n+6a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pai may have failed. 1>&2;
+    2) $echo "Test 9Pai may have failed." 1>&2;
        $echo The command "cmp t9Pai.out $srcdir/n+6a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2817,15 +2817,15 @@ test -s t9Pai.err || rm -f t9Pai.err
 $xx --test -h x -n.3 +6 -a -2 -l 17 $srcdir/tFFt > t9Paj.out 2> t9Paj.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Paj failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Paj failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Paj.out $srcdir/n+6a2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Paj; fi ;; # equal files
-    1) $echo Test 9Paj failed: files t9Paj.out and $srcdir/n+6a2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Paj"; fi ;;
+    1) $echo "Test 9Paj failed: files t9Paj.out and $srcdir/n+6a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Paj may have failed. 1>&2;
+    2) $echo "Test 9Paj may have failed." 1>&2;
        $echo The command "cmp t9Paj.out $srcdir/n+6a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2834,15 +2834,15 @@ test -s t9Paj.err || rm -f t9Paj.err
 $xx --test -h x -n.3 +4:8 -a -2 -l 17 $srcdir/tFFt > t9Pak.out 2> t9Pak.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pak failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pak failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pak.out $srcdir/n+4-8a2l17-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pak; fi ;; # equal files
-    1) $echo Test 9Pak failed: files t9Pak.out and $srcdir/n+4-8a2l17-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pak"; fi ;;
+    1) $echo "Test 9Pak failed: files t9Pak.out and $srcdir/n+4-8a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pak may have failed. 1>&2;
+    2) $echo "Test 9Pak may have failed." 1>&2;
        $echo The command "cmp t9Pak.out $srcdir/n+4-8a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2851,15 +2851,15 @@ test -s t9Pak.err || rm -f t9Pak.err
 $xx --test -h x -n.3 +4 -b -2 -l 10 -f $srcdir/0FFt > t9Pba.out 2> t9Pba.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pba failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pba failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pba.out $srcdir/n+4b2l10f-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pba; fi ;; # equal files
-    1) $echo Test 9Pba failed: files t9Pba.out and $srcdir/n+4b2l10f-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pba"; fi ;;
+    1) $echo "Test 9Pba failed: files t9Pba.out and $srcdir/n+4b2l10f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pba may have failed. 1>&2;
+    2) $echo "Test 9Pba may have failed." 1>&2;
        $echo The command "cmp t9Pba.out $srcdir/n+4b2l10f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2868,15 +2868,15 @@ test -s t9Pba.err || rm -f t9Pba.err
 $xx --test -h x -n.3 +4 -b -2 -l 10 -f $srcdir/0FFnt > t9Pbb.out 2> t9Pbb.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pbb failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pbb failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pbb.out $srcdir/n+4b2l10f-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pbb; fi ;; # equal files
-    1) $echo Test 9Pbb failed: files t9Pbb.out and $srcdir/n+4b2l10f-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pbb"; fi ;;
+    1) $echo "Test 9Pbb failed: files t9Pbb.out and $srcdir/n+4b2l10f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pbb may have failed. 1>&2;
+    2) $echo "Test 9Pbb may have failed." 1>&2;
        $echo The command "cmp t9Pbb.out $srcdir/n+4b2l10f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2885,15 +2885,15 @@ test -s t9Pbb.err || rm -f t9Pbb.err
 $xx --test -h x -n.3 +4 -b -2 -l 10 -f $srcdir/0FnFt > t9Pbc.out 2> t9Pbc.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pbc failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pbc failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pbc.out $srcdir/n+4b2l10f-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pbc; fi ;; # equal files
-    1) $echo Test 9Pbc failed: files t9Pbc.out and $srcdir/n+4b2l10f-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pbc"; fi ;;
+    1) $echo "Test 9Pbc failed: files t9Pbc.out and $srcdir/n+4b2l10f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pbc may have failed. 1>&2;
+    2) $echo "Test 9Pbc may have failed." 1>&2;
        $echo The command "cmp t9Pbc.out $srcdir/n+4b2l10f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2902,15 +2902,15 @@ test -s t9Pbc.err || rm -f t9Pbc.err
 $xx --test -h x -n.3 +4 -b -2 -l 10 -f $srcdir/0FnFnt > t9Pbd.out 2> t9Pbd.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pbd failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pbd failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pbd.out $srcdir/n+4b2l10f-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pbd; fi ;; # equal files
-    1) $echo Test 9Pbd failed: files t9Pbd.out and $srcdir/n+4b2l10f-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pbd"; fi ;;
+    1) $echo "Test 9Pbd failed: files t9Pbd.out and $srcdir/n+4b2l10f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pbd may have failed. 1>&2;
+    2) $echo "Test 9Pbd may have failed." 1>&2;
        $echo The command "cmp t9Pbd.out $srcdir/n+4b2l10f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2919,15 +2919,15 @@ test -s t9Pbd.err || rm -f t9Pbd.err
 $xx --test -h x -n.3 +6 -b -3 -l 6 -f $srcdir/FFn > t9Pbe.out 2> t9Pbe.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pbe failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pbe failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pbe.out $srcdir/n+6b3l6f-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pbe; fi ;; # equal files
-    1) $echo Test 9Pbe failed: files t9Pbe.out and $srcdir/n+6b3l6f-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pbe"; fi ;;
+    1) $echo "Test 9Pbe failed: files t9Pbe.out and $srcdir/n+6b3l6f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pbe may have failed. 1>&2;
+    2) $echo "Test 9Pbe may have failed." 1>&2;
        $echo The command "cmp t9Pbe.out $srcdir/n+6b3l6f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2936,15 +2936,15 @@ test -s t9Pbe.err || rm -f t9Pbe.err
 $xx --test -h x -n.3 +6 -b -3 -l 6 -f $srcdir/FFtn > t9Pbf.out 2> t9Pbf.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pbf failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pbf failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pbf.out $srcdir/n+6b3l6f-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pbf; fi ;; # equal files
-    1) $echo Test 9Pbf failed: files t9Pbf.out and $srcdir/n+6b3l6f-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pbf"; fi ;;
+    1) $echo "Test 9Pbf failed: files t9Pbf.out and $srcdir/n+6b3l6f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pbf may have failed. 1>&2;
+    2) $echo "Test 9Pbf may have failed." 1>&2;
        $echo The command "cmp t9Pbf.out $srcdir/n+6b3l6f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2953,15 +2953,15 @@ test -s t9Pbf.err || rm -f t9Pbf.err
 $xx --test -h x -n.3 +6 -b -3 -l 6 -f $srcdir/FnFn > t9Pbg.out 2> t9Pbg.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pbg failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pbg failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pbg.out $srcdir/n+6b3l6f-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pbg; fi ;; # equal files
-    1) $echo Test 9Pbg failed: files t9Pbg.out and $srcdir/n+6b3l6f-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pbg"; fi ;;
+    1) $echo "Test 9Pbg failed: files t9Pbg.out and $srcdir/n+6b3l6f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pbg may have failed. 1>&2;
+    2) $echo "Test 9Pbg may have failed." 1>&2;
        $echo The command "cmp t9Pbg.out $srcdir/n+6b3l6f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2970,15 +2970,15 @@ test -s t9Pbg.err || rm -f t9Pbg.err
 $xx --test -h x -n.3 +6 -b -3 -l 6 -f $srcdir/tFFn > t9Pbh.out 2> t9Pbh.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pbh failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pbh failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pbh.out $srcdir/n+6b3l6f-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pbh; fi ;; # equal files
-    1) $echo Test 9Pbh failed: files t9Pbh.out and $srcdir/n+6b3l6f-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pbh"; fi ;;
+    1) $echo "Test 9Pbh failed: files t9Pbh.out and $srcdir/n+6b3l6f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pbh may have failed. 1>&2;
+    2) $echo "Test 9Pbh may have failed." 1>&2;
        $echo The command "cmp t9Pbh.out $srcdir/n+6b3l6f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -2987,15 +2987,15 @@ test -s t9Pbh.err || rm -f t9Pbh.err
 $xx --test -h x -n.3 +6 -b -3 -l 6 -f $srcdir/tFnFt > t9Pbi.out 2> t9Pbi.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pbi failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pbi failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pbi.out $srcdir/n+6b3l6f-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pbi; fi ;; # equal files
-    1) $echo Test 9Pbi failed: files t9Pbi.out and $srcdir/n+6b3l6f-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pbi"; fi ;;
+    1) $echo "Test 9Pbi failed: files t9Pbi.out and $srcdir/n+6b3l6f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pbi may have failed. 1>&2;
+    2) $echo "Test 9Pbi may have failed." 1>&2;
        $echo The command "cmp t9Pbi.out $srcdir/n+6b3l6f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3004,15 +3004,15 @@ test -s t9Pbi.err || rm -f t9Pbi.err
 $xx --test -h x -n.3 +6 -b -3 -l 6 -f $srcdir/tFFt > t9Pbj.out 2> t9Pbj.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pbj failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pbj failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pbj.out $srcdir/n+6b3l6f-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pbj; fi ;; # equal files
-    1) $echo Test 9Pbj failed: files t9Pbj.out and $srcdir/n+6b3l6f-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pbj"; fi ;;
+    1) $echo "Test 9Pbj failed: files t9Pbj.out and $srcdir/n+6b3l6f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pbj may have failed. 1>&2;
+    2) $echo "Test 9Pbj may have failed." 1>&2;
        $echo The command "cmp t9Pbj.out $srcdir/n+6b3l6f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3021,15 +3021,15 @@ test -s t9Pbj.err || rm -f t9Pbj.err
 $xx --test -h x -n.3 +5:8 -b -3 -l 10 -f $srcdir/FnFn > t9Pbk.out 2> t9Pbk.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pbk failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pbk failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pbk.out $srcdir/n+5-8b3l10f-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pbk; fi ;; # equal files
-    1) $echo Test 9Pbk failed: files t9Pbk.out and $srcdir/n+5-8b3l10f-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pbk"; fi ;;
+    1) $echo "Test 9Pbk failed: files t9Pbk.out and $srcdir/n+5-8b3l10f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pbk may have failed. 1>&2;
+    2) $echo "Test 9Pbk may have failed." 1>&2;
        $echo The command "cmp t9Pbk.out $srcdir/n+5-8b3l10f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3038,15 +3038,15 @@ test -s t9Pbk.err || rm -f t9Pbk.err
 $xx --test -h x -n.3 +3 -m -l 13 -f $srcdir/tFFt-bl $srcdir/FnFn > t9Pma.out 2> t9Pma.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pma failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pma failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pma.out $srcdir/n+3ml13f-bl-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pma; fi ;; # equal files
-    1) $echo Test 9Pma failed: files t9Pma.out and $srcdir/n+3ml13f-bl-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pma"; fi ;;
+    1) $echo "Test 9Pma failed: files t9Pma.out and $srcdir/n+3ml13f-bl-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pma may have failed. 1>&2;
+    2) $echo "Test 9Pma may have failed." 1>&2;
        $echo The command "cmp t9Pma.out $srcdir/n+3ml13f-bl-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3055,15 +3055,15 @@ test -s t9Pma.err || rm -f t9Pma.err
 $xx --test -h x -n.3 +3 -m -l 17 -f $srcdir/tFFt-bl $srcdir/tn > t9Pmb.out 2> t9Pmb.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pmb failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pmb failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pmb.out $srcdir/n+3ml17f-bl-tn
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pmb; fi ;; # equal files
-    1) $echo Test 9Pmb failed: files t9Pmb.out and $srcdir/n+3ml17f-bl-tn differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pmb"; fi ;;
+    1) $echo "Test 9Pmb failed: files t9Pmb.out and $srcdir/n+3ml17f-bl-tn differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pmb may have failed. 1>&2;
+    2) $echo "Test 9Pmb may have failed." 1>&2;
        $echo The command "cmp t9Pmb.out $srcdir/n+3ml17f-bl-tn" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3072,15 +3072,15 @@ test -s t9Pmb.err || rm -f t9Pmb.err
 $xx --test -h x -n.3 +3 -m -l 17 -f $srcdir/tn $srcdir/tFFt-bl > t9Pmc.out 2> t9Pmc.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9Pmc failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 9Pmc failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9Pmc.out $srcdir/n+3ml17f-tn-bl
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9Pmc; fi ;; # equal files
-    1) $echo Test 9Pmc failed: files t9Pmc.out and $srcdir/n+3ml17f-tn-bl differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9Pmc"; fi ;;
+    1) $echo "Test 9Pmc failed: files t9Pmc.out and $srcdir/n+3ml17f-tn-bl differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9Pmc may have failed. 1>&2;
+    2) $echo "Test 9Pmc may have failed." 1>&2;
        $echo The command "cmp t9Pmc.out $srcdir/n+3ml17f-tn-bl" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3089,15 +3089,15 @@ test -s t9Pmc.err || rm -f t9Pmc.err
 $xx --test -h x -w 72 -j $srcdir/0FnFnt > t10a.out 2> t10a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 10a failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 10a failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t10a.out $srcdir/w72j-0FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 10a; fi ;; # equal files
-    1) $echo Test 10a failed: files t10a.out and $srcdir/w72j-0FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 10a"; fi ;;
+    1) $echo "Test 10a failed: files t10a.out and $srcdir/w72j-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 10a may have failed. 1>&2;
+    2) $echo "Test 10a may have failed." 1>&2;
        $echo The command "cmp t10a.out $srcdir/w72j-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3106,15 +3106,15 @@ test -s t10a.err || rm -f t10a.err
 $xx --test -h x -w 48 -l17 -f $srcdir/tFFt-lm > t10b.out 2> t10b.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 10b failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 10b failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t10b.out $srcdir/w48l17f-lm
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 10b; fi ;; # equal files
-    1) $echo Test 10b failed: files t10b.out and $srcdir/w48l17f-lm differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 10b"; fi ;;
+    1) $echo "Test 10b failed: files t10b.out and $srcdir/w48l17f-lm differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 10b may have failed. 1>&2;
+    2) $echo "Test 10b may have failed." 1>&2;
        $echo The command "cmp t10b.out $srcdir/w48l17f-lm" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3123,15 +3123,15 @@ test -s t10b.err || rm -f t10b.err
 $xx --test -h x -w 26 -l17 -f $srcdir/tFFt-lm > t10c.out 2> t10c.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 10c failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 10c failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t10c.out $srcdir/w26l17f-lm
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 10c; fi ;; # equal files
-    1) $echo Test 10c failed: files t10c.out and $srcdir/w26l17f-lm differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 10c"; fi ;;
+    1) $echo "Test 10c failed: files t10c.out and $srcdir/w26l17f-lm differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 10c may have failed. 1>&2;
+    2) $echo "Test 10c may have failed." 1>&2;
        $echo The command "cmp t10c.out $srcdir/w26l17f-lm" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3140,15 +3140,15 @@ test -s t10c.err || rm -f t10c.err
 $xx --test -h x -w 25 -l17 -f $srcdir/tFFt-lm > t10d.out 2> t10d.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 10d failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 10d failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t10d.out $srcdir/w25l17f-lm
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 10d; fi ;; # equal files
-    1) $echo Test 10d failed: files t10d.out and $srcdir/w25l17f-lm differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 10d"; fi ;;
+    1) $echo "Test 10d failed: files t10d.out and $srcdir/w25l17f-lm differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 10d may have failed. 1>&2;
+    2) $echo "Test 10d may have failed." 1>&2;
        $echo The command "cmp t10d.out $srcdir/w25l17f-lm" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3157,15 +3157,15 @@ test -s t10d.err || rm -f t10d.err
 $xx --test -h x -w 20 -l17 -f $srcdir/tFFt-lm > t10e.out 2> t10e.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 10e failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 10e failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t10e.out $srcdir/w20l17f-lm
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 10e; fi ;; # equal files
-    1) $echo Test 10e failed: files t10e.out and $srcdir/w20l17f-lm differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 10e"; fi ;;
+    1) $echo "Test 10e failed: files t10e.out and $srcdir/w20l17f-lm differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 10e may have failed. 1>&2;
+    2) $echo "Test 10e may have failed." 1>&2;
        $echo The command "cmp t10e.out $srcdir/w20l17f-lm" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3174,15 +3174,15 @@ test -s t10e.err || rm -f t10e.err
 $xx --test -h x -m -l 17 -f $srcdir/tFFt-lm $srcdir/loli > t10ma.out 2> t10ma.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 10ma failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 10ma failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t10ma.out $srcdir/ml17f-lm-lo
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 10ma; fi ;; # equal files
-    1) $echo Test 10ma failed: files t10ma.out and $srcdir/ml17f-lm-lo differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 10ma"; fi ;;
+    1) $echo "Test 10ma failed: files t10ma.out and $srcdir/ml17f-lm-lo differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 10ma may have failed. 1>&2;
+    2) $echo "Test 10ma may have failed." 1>&2;
        $echo The command "cmp t10ma.out $srcdir/ml17f-lm-lo" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3191,15 +3191,15 @@ test -s t10ma.err || rm -f t10ma.err
 $xx --test -h x -w 35 -m -l 17 -f $srcdir/tFFt-lm $srcdir/loli > t10mb.out 2> t10mb.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 10mb failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 10mb failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t10mb.out $srcdir/w35ml17f-lm-lo
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 10mb; fi ;; # equal files
-    1) $echo Test 10mb failed: files t10mb.out and $srcdir/w35ml17f-lm-lo differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 10mb"; fi ;;
+    1) $echo "Test 10mb failed: files t10mb.out and $srcdir/w35ml17f-lm-lo differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 10mb may have failed. 1>&2;
+    2) $echo "Test 10mb may have failed." 1>&2;
        $echo The command "cmp t10mb.out $srcdir/w35ml17f-lm-lo" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3208,15 +3208,15 @@ test -s t10mb.err || rm -f t10mb.err
 $xx --test -h x -j -m -l 17 -f $srcdir/tFFt-lm $srcdir/loli > t10mc.out 2> t10mc.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 10mc failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 10mc failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t10mc.out $srcdir/jml17f-lm-lo
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 10mc; fi ;; # equal files
-    1) $echo Test 10mc failed: files t10mc.out and $srcdir/jml17f-lm-lo differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 10mc"; fi ;;
+    1) $echo "Test 10mc failed: files t10mc.out and $srcdir/jml17f-lm-lo differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 10mc may have failed. 1>&2;
+    2) $echo "Test 10mc may have failed." 1>&2;
        $echo The command "cmp t10mc.out $srcdir/jml17f-lm-lo" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3225,15 +3225,15 @@ test -s t10mc.err || rm -f t10mc.err
 $xx --test -h x -w 35 -j -m -l 17 -f $srcdir/tFFt-lm $srcdir/loli > t10md.out 2> t10md.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 10md failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 10md failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t10md.out $srcdir/w35jml17f-lm-lo
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 10md; fi ;; # equal files
-    1) $echo Test 10md failed: files t10md.out and $srcdir/w35jml17f-lm-lo differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 10md"; fi ;;
+    1) $echo "Test 10md failed: files t10md.out and $srcdir/w35jml17f-lm-lo differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 10md may have failed. 1>&2;
+    2) $echo "Test 10md may have failed." 1>&2;
        $echo The command "cmp t10md.out $srcdir/w35jml17f-lm-lo" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3242,15 +3242,15 @@ test -s t10md.err || rm -f t10md.err
 $xx --test -h x -n.3 -j -m -l 17 -f $srcdir/tFFt-lm $srcdir/tFFt-lm $srcdir/loli > t10me.out 2> t10me.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 10me failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 10me failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t10me.out $srcdir/njml17f-lm-lm-lo
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 10me; fi ;; # equal files
-    1) $echo Test 10me failed: files t10me.out and $srcdir/njml17f-lm-lm-lo differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 10me"; fi ;;
+    1) $echo "Test 10me failed: files t10me.out and $srcdir/njml17f-lm-lm-lo differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 10me may have failed. 1>&2;
+    2) $echo "Test 10me may have failed." 1>&2;
        $echo The command "cmp t10me.out $srcdir/njml17f-lm-lm-lo" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3259,15 +3259,15 @@ test -s t10me.err || rm -f t10me.err
 $xx --test -h x -n.3 -j -m -l 17 -f $srcdir/tFFt-lm $srcdir/loli $srcdir/tFFt-lm > t10mf.out 2> t10mf.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 10mf failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 10mf failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t10mf.out $srcdir/njml17f-lm-lo-lm
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 10mf; fi ;; # equal files
-    1) $echo Test 10mf failed: files t10mf.out and $srcdir/njml17f-lm-lo-lm differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 10mf"; fi ;;
+    1) $echo "Test 10mf failed: files t10mf.out and $srcdir/njml17f-lm-lo-lm differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 10mf may have failed. 1>&2;
+    2) $echo "Test 10mf may have failed." 1>&2;
        $echo The command "cmp t10mf.out $srcdir/njml17f-lm-lo-lm" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3276,15 +3276,15 @@ test -s t10mf.err || rm -f t10mf.err
 $xx --test -h x -a -3 -l 17 -f $srcdir/tFFt-lm > t10aa.out 2> t10aa.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 10aa failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 10aa failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t10aa.out $srcdir/a3l17f-lm
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 10aa; fi ;; # equal files
-    1) $echo Test 10aa failed: files t10aa.out and $srcdir/a3l17f-lm differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 10aa"; fi ;;
+    1) $echo "Test 10aa failed: files t10aa.out and $srcdir/a3l17f-lm differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 10aa may have failed. 1>&2;
+    2) $echo "Test 10aa may have failed." 1>&2;
        $echo The command "cmp t10aa.out $srcdir/a3l17f-lm" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3293,15 +3293,15 @@ test -s t10aa.err || rm -f t10aa.err
 $xx --test -h x -w 35 -a -3 -l 17 -f $srcdir/tFFt-lm > t10ab.out 2> t10ab.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 10ab failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 10ab failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t10ab.out $srcdir/w35a3l17f-lm
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 10ab; fi ;; # equal files
-    1) $echo Test 10ab failed: files t10ab.out and $srcdir/w35a3l17f-lm differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 10ab"; fi ;;
+    1) $echo "Test 10ab failed: files t10ab.out and $srcdir/w35a3l17f-lm differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 10ab may have failed. 1>&2;
+    2) $echo "Test 10ab may have failed." 1>&2;
        $echo The command "cmp t10ab.out $srcdir/w35a3l17f-lm" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3310,15 +3310,15 @@ test -s t10ab.err || rm -f t10ab.err
 $xx --test -h x -j -a -3 -l 17 -f $srcdir/tFFt-lm > t10ac.out 2> t10ac.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 10ac failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 10ac failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t10ac.out $srcdir/ja3l17f-lm
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 10ac; fi ;; # equal files
-    1) $echo Test 10ac failed: files t10ac.out and $srcdir/ja3l17f-lm differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 10ac"; fi ;;
+    1) $echo "Test 10ac failed: files t10ac.out and $srcdir/ja3l17f-lm differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 10ac may have failed. 1>&2;
+    2) $echo "Test 10ac may have failed." 1>&2;
        $echo The command "cmp t10ac.out $srcdir/ja3l17f-lm" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3327,15 +3327,15 @@ test -s t10ac.err || rm -f t10ac.err
 $xx --test -h x -w 35 -j -a -3 -l 17 -f $srcdir/tFFt-lm > t10ad.out 2> t10ad.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 10ad failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 10ad failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t10ad.out $srcdir/w35ja3l17f-lm
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 10ad; fi ;; # equal files
-    1) $echo Test 10ad failed: files t10ad.out and $srcdir/w35ja3l17f-lm differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 10ad"; fi ;;
+    1) $echo "Test 10ad failed: files t10ad.out and $srcdir/w35ja3l17f-lm differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 10ad may have failed. 1>&2;
+    2) $echo "Test 10ad may have failed." 1>&2;
        $echo The command "cmp t10ad.out $srcdir/w35ja3l17f-lm" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3344,15 +3344,15 @@ test -s t10ad.err || rm -f t10ad.err
 $xx --test -h x -b -3 -l 17 -f $srcdir/tFFt-lm > t10ba.out 2> t10ba.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 10ba failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 10ba failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t10ba.out $srcdir/b3l17f-lm
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 10ba; fi ;; # equal files
-    1) $echo Test 10ba failed: files t10ba.out and $srcdir/b3l17f-lm differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 10ba"; fi ;;
+    1) $echo "Test 10ba failed: files t10ba.out and $srcdir/b3l17f-lm differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 10ba may have failed. 1>&2;
+    2) $echo "Test 10ba may have failed." 1>&2;
        $echo The command "cmp t10ba.out $srcdir/b3l17f-lm" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3361,15 +3361,15 @@ test -s t10ba.err || rm -f t10ba.err
 $xx --test -h x -w 35 -b -3 -l 17 -f $srcdir/tFFt-lm > t10bb.out 2> t10bb.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 10bb failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 10bb failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t10bb.out $srcdir/w35b3l17f-lm
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 10bb; fi ;; # equal files
-    1) $echo Test 10bb failed: files t10bb.out and $srcdir/w35b3l17f-lm differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 10bb"; fi ;;
+    1) $echo "Test 10bb failed: files t10bb.out and $srcdir/w35b3l17f-lm differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 10bb may have failed. 1>&2;
+    2) $echo "Test 10bb may have failed." 1>&2;
        $echo The command "cmp t10bb.out $srcdir/w35b3l17f-lm" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3378,15 +3378,15 @@ test -s t10bb.err || rm -f t10bb.err
 $xx --test -h x -j -b -3 -l 17 -f $srcdir/tFFt-lm > t10bc.out 2> t10bc.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 10bc failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 10bc failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t10bc.out $srcdir/jb3l17f-lm
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 10bc; fi ;; # equal files
-    1) $echo Test 10bc failed: files t10bc.out and $srcdir/jb3l17f-lm differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 10bc"; fi ;;
+    1) $echo "Test 10bc failed: files t10bc.out and $srcdir/jb3l17f-lm differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 10bc may have failed. 1>&2;
+    2) $echo "Test 10bc may have failed." 1>&2;
        $echo The command "cmp t10bc.out $srcdir/jb3l17f-lm" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3395,15 +3395,15 @@ test -s t10bc.err || rm -f t10bc.err
 $xx --test -h x -w 35 -j -b -3 -l 17 -f $srcdir/tFFt-lm > t10bd.out 2> t10bd.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 10bd failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 10bd failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t10bd.out $srcdir/w35jb3l17f-lm
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 10bd; fi ;; # equal files
-    1) $echo Test 10bd failed: files t10bd.out and $srcdir/w35jb3l17f-lm differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 10bd"; fi ;;
+    1) $echo "Test 10bd failed: files t10bd.out and $srcdir/w35jb3l17f-lm differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 10bd may have failed. 1>&2;
+    2) $echo "Test 10bd may have failed." 1>&2;
        $echo The command "cmp t10bd.out $srcdir/w35jb3l17f-lm" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3412,15 +3412,15 @@ test -s t10bd.err || rm -f t10bd.err
 $xx --test -h x -n.3 -s:--: -m -l 13 -f $srcdir/tFFt-bl $srcdir/FnFn > t11a.out 2> t11a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 11a failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 11a failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t11a.out $srcdir/nsml13-bl-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 11a; fi ;; # equal files
-    1) $echo Test 11a failed: files t11a.out and $srcdir/nsml13-bl-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 11a"; fi ;;
+    1) $echo "Test 11a failed: files t11a.out and $srcdir/nsml13-bl-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 11a may have failed. 1>&2;
+    2) $echo "Test 11a may have failed." 1>&2;
        $echo The command "cmp t11a.out $srcdir/nsml13-bl-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3429,15 +3429,15 @@ test -s t11a.err || rm -f t11a.err
 $xx --test -h x -n.3 -s:--: -m -l 17 -f $srcdir/tFFt-bl $srcdir/FnFn > t11b.out 2> t11b.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 11b failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 11b failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t11b.out $srcdir/nsml17-bl-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 11b; fi ;; # equal files
-    1) $echo Test 11b failed: files t11b.out and $srcdir/nsml17-bl-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 11b"; fi ;;
+    1) $echo "Test 11b failed: files t11b.out and $srcdir/nsml17-bl-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 11b may have failed. 1>&2;
+    2) $echo "Test 11b may have failed." 1>&2;
        $echo The command "cmp t11b.out $srcdir/nsml17-bl-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3446,15 +3446,15 @@ test -s t11b.err || rm -f t11b.err
 $xx --test -h x -n.3 -s:--: -m -l 13 -f $srcdir/tn $srcdir/tn $srcdir/FnFn > t11e.out 2> t11e.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 11e failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 11e failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t11e.out $srcdir/nsml13-t-t-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 11e; fi ;; # equal files
-    1) $echo Test 11e failed: files t11e.out and $srcdir/nsml13-t-t-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 11e"; fi ;;
+    1) $echo "Test 11e failed: files t11e.out and $srcdir/nsml13-t-t-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 11e may have failed. 1>&2;
+    2) $echo "Test 11e may have failed." 1>&2;
        $echo The command "cmp t11e.out $srcdir/nsml13-t-t-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3463,15 +3463,15 @@ test -s t11e.err || rm -f t11e.err
 $xx --test -h x -n.3 -s:--: -m -l 17 -f $srcdir/tn $srcdir/tn $srcdir/FnFn > t11f.out 2> t11f.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 11f failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 11f failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t11f.out $srcdir/nsml17-t-t-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 11f; fi ;; # equal files
-    1) $echo Test 11f failed: files t11f.out and $srcdir/nsml17-t-t-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 11f"; fi ;;
+    1) $echo "Test 11f failed: files t11f.out and $srcdir/nsml17-t-t-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 11f may have failed. 1>&2;
+    2) $echo "Test 11f may have failed." 1>&2;
        $echo The command "cmp t11f.out $srcdir/nsml17-t-t-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3480,15 +3480,15 @@ test -s t11f.err || rm -f t11f.err
 $xx --test -h x -n.3 -s:--: -m -l 13 -f $srcdir/tn $srcdir/tn $srcdir/FnFn $srcdir/FnFn > t11g.out 2> t11g.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 11g failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 11g failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t11g.out $srcdir/nsml13-t-t-FF-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 11g; fi ;; # equal files
-    1) $echo Test 11g failed: files t11g.out and $srcdir/nsml13-t-t-FF-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 11g"; fi ;;
+    1) $echo "Test 11g failed: files t11g.out and $srcdir/nsml13-t-t-FF-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 11g may have failed. 1>&2;
+    2) $echo "Test 11g may have failed." 1>&2;
        $echo The command "cmp t11g.out $srcdir/nsml13-t-t-FF-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3497,15 +3497,15 @@ test -s t11g.err || rm -f t11g.err
 $xx --test -h x -n.3 -s:--: -m -l 17 -f $srcdir/tn $srcdir/tn $srcdir/FnFn $srcdir/FnFn > t11h.out 2> t11h.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 11h failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 11h failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t11h.out $srcdir/nsml17-t-t-FF-FF
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 11h; fi ;; # equal files
-    1) $echo Test 11h failed: files t11h.out and $srcdir/nsml17-t-t-FF-FF differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 11h"; fi ;;
+    1) $echo "Test 11h failed: files t11h.out and $srcdir/nsml17-t-t-FF-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 11h may have failed. 1>&2;
+    2) $echo "Test 11h may have failed." 1>&2;
        $echo The command "cmp t11h.out $srcdir/nsml17-t-t-FF-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3514,15 +3514,15 @@ test -s t11h.err || rm -f t11h.err
 $xx --test -h x -o3 -a -3 -l17 -f $srcdir/tn > t12aa.out 2> t12aa.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 12aa failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 12aa failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t12aa.out $srcdir/o3a3l17f-tn
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 12aa; fi ;; # equal files
-    1) $echo Test 12aa failed: files t12aa.out and $srcdir/o3a3l17f-tn differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 12aa"; fi ;;
+    1) $echo "Test 12aa failed: files t12aa.out and $srcdir/o3a3l17f-tn differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 12aa may have failed. 1>&2;
+    2) $echo "Test 12aa may have failed." 1>&2;
        $echo The command "cmp t12aa.out $srcdir/o3a3l17f-tn" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3531,15 +3531,15 @@ test -s t12aa.err || rm -f t12aa.err
 $xx --test -h x -o3 -a -3 -s:--: -l17 -f $srcdir/tn > t12ab.out 2> t12ab.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 12ab failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 12ab failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t12ab.out $srcdir/o3a3sl17f-tn
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 12ab; fi ;; # equal files
-    1) $echo Test 12ab failed: files t12ab.out and $srcdir/o3a3sl17f-tn differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 12ab"; fi ;;
+    1) $echo "Test 12ab failed: files t12ab.out and $srcdir/o3a3sl17f-tn differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 12ab may have failed. 1>&2;
+    2) $echo "Test 12ab may have failed." 1>&2;
        $echo The command "cmp t12ab.out $srcdir/o3a3sl17f-tn" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3548,15 +3548,15 @@ test -s t12ab.err || rm -f t12ab.err
 $xx --test -h x -o3 -a -3 -s:--: -n. -l17 -f $srcdir/tn > t12ac.out 2> t12ac.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 12ac failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 12ac failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t12ac.out $srcdir/o3a3snl17f-tn
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 12ac; fi ;; # equal files
-    1) $echo Test 12ac failed: files t12ac.out and $srcdir/o3a3snl17f-tn differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 12ac"; fi ;;
+    1) $echo "Test 12ac failed: files t12ac.out and $srcdir/o3a3snl17f-tn differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 12ac may have failed. 1>&2;
+    2) $echo "Test 12ac may have failed." 1>&2;
        $echo The command "cmp t12ac.out $srcdir/o3a3snl17f-tn" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3565,15 +3565,15 @@ test -s t12ac.err || rm -f t12ac.err
 $xx --test -h x -o3 -b -3 -l17 -f $srcdir/tn > t12ba.out 2> t12ba.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 12ba failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 12ba failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t12ba.out $srcdir/o3b3l17f-tn
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 12ba; fi ;; # equal files
-    1) $echo Test 12ba failed: files t12ba.out and $srcdir/o3b3l17f-tn differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 12ba"; fi ;;
+    1) $echo "Test 12ba failed: files t12ba.out and $srcdir/o3b3l17f-tn differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 12ba may have failed. 1>&2;
+    2) $echo "Test 12ba may have failed." 1>&2;
        $echo The command "cmp t12ba.out $srcdir/o3b3l17f-tn" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3582,15 +3582,15 @@ test -s t12ba.err || rm -f t12ba.err
 $xx --test -h x -o3 -b -3 -s:--: -l17 -f $srcdir/tn > t12bb.out 2> t12bb.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 12bb failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 12bb failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t12bb.out $srcdir/o3b3sl17f-tn
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 12bb; fi ;; # equal files
-    1) $echo Test 12bb failed: files t12bb.out and $srcdir/o3b3sl17f-tn differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 12bb"; fi ;;
+    1) $echo "Test 12bb failed: files t12bb.out and $srcdir/o3b3sl17f-tn differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 12bb may have failed. 1>&2;
+    2) $echo "Test 12bb may have failed." 1>&2;
        $echo The command "cmp t12bb.out $srcdir/o3b3sl17f-tn" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3599,15 +3599,15 @@ test -s t12bb.err || rm -f t12bb.err
 $xx --test -h x -o3 -b -3 -s:--: -n. -l17 -f $srcdir/tn > t12bc.out 2> t12bc.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 12bc failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 12bc failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t12bc.out $srcdir/o3b3snl17f-tn
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 12bc; fi ;; # equal files
-    1) $echo Test 12bc failed: files t12bc.out and $srcdir/o3b3snl17f-tn differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 12bc"; fi ;;
+    1) $echo "Test 12bc failed: files t12bc.out and $srcdir/o3b3snl17f-tn differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 12bc may have failed. 1>&2;
+    2) $echo "Test 12bc may have failed." 1>&2;
        $echo The command "cmp t12bc.out $srcdir/o3b3snl17f-tn" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3616,15 +3616,15 @@ test -s t12bc.err || rm -f t12bc.err
 $xx --test -h x -o3 -m -l17 -f $srcdir/tFFt-bl $srcdir/tn > t12ma.out 2> t12ma.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 12ma failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 12ma failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t12ma.out $srcdir/o3ml17f-bl-tn
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 12ma; fi ;; # equal files
-    1) $echo Test 12ma failed: files t12ma.out and $srcdir/o3ml17f-bl-tn differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 12ma"; fi ;;
+    1) $echo "Test 12ma failed: files t12ma.out and $srcdir/o3ml17f-bl-tn differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 12ma may have failed. 1>&2;
+    2) $echo "Test 12ma may have failed." 1>&2;
        $echo The command "cmp t12ma.out $srcdir/o3ml17f-bl-tn" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3633,15 +3633,15 @@ test -s t12ma.err || rm -f t12ma.err
 $xx --test -h x -o3 -m -s:--: -l17 -f $srcdir/tFFt-bl $srcdir/tn > t12mb.out 2> t12mb.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 12mb failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 12mb failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t12mb.out $srcdir/o3msl17f-bl-tn
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 12mb; fi ;; # equal files
-    1) $echo Test 12mb failed: files t12mb.out and $srcdir/o3msl17f-bl-tn differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 12mb"; fi ;;
+    1) $echo "Test 12mb failed: files t12mb.out and $srcdir/o3msl17f-bl-tn differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 12mb may have failed. 1>&2;
+    2) $echo "Test 12mb may have failed." 1>&2;
        $echo The command "cmp t12mb.out $srcdir/o3msl17f-bl-tn" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3650,15 +3650,15 @@ test -s t12mb.err || rm -f t12mb.err
 $xx --test -h x -o3 -m -s:--: -n. -l17 -f $srcdir/tFFt-bl $srcdir/tn > t12mc.out 2> t12mc.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 12mc failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 12mc failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t12mc.out $srcdir/o3msnl17f-bl-tn
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 12mc; fi ;; # equal files
-    1) $echo Test 12mc failed: files t12mc.out and $srcdir/o3msnl17f-bl-tn differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 12mc"; fi ;;
+    1) $echo "Test 12mc failed: files t12mc.out and $srcdir/o3msnl17f-bl-tn differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 12mc may have failed. 1>&2;
+    2) $echo "Test 12mc may have failed." 1>&2;
        $echo The command "cmp t12mc.out $srcdir/o3msnl17f-bl-tn" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -3667,15 +3667,15 @@ test -s t12mc.err || rm -f t12mc.err
 $xx --test -h x -o3 -j -m -l17 -f $srcdir/tFFt-lm $srcdir/loli > t12md.out 2> t12md.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 12md failed: ../../src/pr return code $code differs from expected value 0 1>&2
+  $echo "Test 12md failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t12md.out $srcdir/o3jml17f-lm-lo
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 12md; fi ;; # equal files
-    1) $echo Test 12md failed: files t12md.out and $srcdir/o3jml17f-lm-lo differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 12md"; fi ;;
+    1) $echo "Test 12md failed: files t12md.out and $srcdir/o3jml17f-lm-lo differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 12md may have failed. 1>&2;
+    2) $echo "Test 12md may have failed." 1>&2;
        $echo The command "cmp t12md.out $srcdir/o3jml17f-lm-lo" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
diff --git a/tests/sort/sort-tests b/tests/sort/sort-tests
index 0a3f5f21b..4a7427be6 100755
--- a/tests/sort/sort-tests
+++ b/tests/sort/sort-tests
@@ -12,15 +12,15 @@ test "$VERBOSE" && $xx --version 2> /dev/null
 $xx  $srcdir/t01a.in > t01a.out 2> t01a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 01a failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 01a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t01a.out $srcdir/t01a.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 01a; fi ;; # equal files
-    1) $echo Test 01a failed: files t01a.out and $srcdir/t01a.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 01a"; fi ;;
+    1) $echo "Test 01a failed: files t01a.out and $srcdir/t01a.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 01a may have failed. 1>&2;
+    2) $echo "Test 01a may have failed." 1>&2;
        $echo The command "cmp t01a.out $srcdir/t01a.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -29,15 +29,15 @@ test -s t01a.err || rm -f t01a.err
 $xx -c $srcdir/t02a.in > t02a.out 2> t02a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 02a failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 02a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t02a.out $srcdir/t02a.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 02a; fi ;; # equal files
-    1) $echo Test 02a failed: files t02a.out and $srcdir/t02a.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 02a"; fi ;;
+    1) $echo "Test 02a failed: files t02a.out and $srcdir/t02a.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 02a may have failed. 1>&2;
+    2) $echo "Test 02a may have failed." 1>&2;
        $echo The command "cmp t02a.out $srcdir/t02a.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -46,15 +46,15 @@ test -s t02a.err || rm -f t02a.err
 $xx -c $srcdir/t02b.in > t02b.out 2> t02b.err
 code=$?
 if test $code != 1 ; then
-  $echo Test 02b failed: ../../src/sort return code $code differs from expected value 1 1>&2
+  $echo "Test 02b failed: ../../src/sort return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t02b.out $srcdir/t02b.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 02b; fi ;; # equal files
-    1) $echo Test 02b failed: files t02b.out and $srcdir/t02b.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 02b"; fi ;;
+    1) $echo "Test 02b failed: files t02b.out and $srcdir/t02b.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 02b may have failed. 1>&2;
+    2) $echo "Test 02b may have failed." 1>&2;
        $echo The command "cmp t02b.out $srcdir/t02b.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -63,15 +63,15 @@ test -s t02b.err || rm -f t02b.err
 $xx -cu $srcdir/t02c.in > t02c.out 2> t02c.err
 code=$?
 if test $code != 1 ; then
-  $echo Test 02c failed: ../../src/sort return code $code differs from expected value 1 1>&2
+  $echo "Test 02c failed: ../../src/sort return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t02c.out $srcdir/t02c.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 02c; fi ;; # equal files
-    1) $echo Test 02c failed: files t02c.out and $srcdir/t02c.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 02c"; fi ;;
+    1) $echo "Test 02c failed: files t02c.out and $srcdir/t02c.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 02c may have failed. 1>&2;
+    2) $echo "Test 02c may have failed." 1>&2;
        $echo The command "cmp t02c.out $srcdir/t02c.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -80,15 +80,15 @@ test -s t02c.err || rm -f t02c.err
 $xx -cu $srcdir/t02d.in > t02d.out 2> t02d.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 02d failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 02d failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t02d.out $srcdir/t02d.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 02d; fi ;; # equal files
-    1) $echo Test 02d failed: files t02d.out and $srcdir/t02d.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 02d"; fi ;;
+    1) $echo "Test 02d failed: files t02d.out and $srcdir/t02d.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 02d may have failed. 1>&2;
+    2) $echo "Test 02d may have failed." 1>&2;
        $echo The command "cmp t02d.out $srcdir/t02d.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -97,15 +97,15 @@ test -s t02d.err || rm -f t02d.err
 $xx -cu $srcdir/t02e.in > t02e.out 2> t02e.err
 code=$?
 if test $code != 1 ; then
-  $echo Test 02e failed: ../../src/sort return code $code differs from expected value 1 1>&2
+  $echo "Test 02e failed: ../../src/sort return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t02e.out $srcdir/t02e.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 02e; fi ;; # equal files
-    1) $echo Test 02e failed: files t02e.out and $srcdir/t02e.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 02e"; fi ;;
+    1) $echo "Test 02e failed: files t02e.out and $srcdir/t02e.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 02e may have failed. 1>&2;
+    2) $echo "Test 02e may have failed." 1>&2;
        $echo The command "cmp t02e.out $srcdir/t02e.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -114,15 +114,15 @@ test -s t02e.err || rm -f t02e.err
 $xx -cu $srcdir/t02f.in > t02f.out 2> t02f.err
 code=$?
 if test $code != 1 ; then
-  $echo Test 02f failed: ../../src/sort return code $code differs from expected value 1 1>&2
+  $echo "Test 02f failed: ../../src/sort return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t02f.out $srcdir/t02f.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 02f; fi ;; # equal files
-    1) $echo Test 02f failed: files t02f.out and $srcdir/t02f.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 02f"; fi ;;
+    1) $echo "Test 02f failed: files t02f.out and $srcdir/t02f.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 02f may have failed. 1>&2;
+    2) $echo "Test 02f may have failed." 1>&2;
        $echo The command "cmp t02f.out $srcdir/t02f.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -131,15 +131,15 @@ test -s t02f.err || rm -f t02f.err
 $xx -k1 $srcdir/t03a.in > t03a.out 2> t03a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 03a failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 03a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t03a.out $srcdir/t03a.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 03a; fi ;; # equal files
-    1) $echo Test 03a failed: files t03a.out and $srcdir/t03a.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 03a"; fi ;;
+    1) $echo "Test 03a failed: files t03a.out and $srcdir/t03a.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 03a may have failed. 1>&2;
+    2) $echo "Test 03a may have failed." 1>&2;
        $echo The command "cmp t03a.out $srcdir/t03a.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -148,15 +148,15 @@ test -s t03a.err || rm -f t03a.err
 $xx -k1,1 $srcdir/t03b.in > t03b.out 2> t03b.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 03b failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 03b failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t03b.out $srcdir/t03b.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 03b; fi ;; # equal files
-    1) $echo Test 03b failed: files t03b.out and $srcdir/t03b.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 03b"; fi ;;
+    1) $echo "Test 03b failed: files t03b.out and $srcdir/t03b.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 03b may have failed. 1>&2;
+    2) $echo "Test 03b may have failed." 1>&2;
        $echo The command "cmp t03b.out $srcdir/t03b.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -165,15 +165,15 @@ test -s t03b.err || rm -f t03b.err
 $xx -k1 -k2 $srcdir/t03c.in > t03c.out 2> t03c.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 03c failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 03c failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t03c.out $srcdir/t03c.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 03c; fi ;; # equal files
-    1) $echo Test 03c failed: files t03c.out and $srcdir/t03c.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 03c"; fi ;;
+    1) $echo "Test 03c failed: files t03c.out and $srcdir/t03c.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 03c may have failed. 1>&2;
+    2) $echo "Test 03c may have failed." 1>&2;
        $echo The command "cmp t03c.out $srcdir/t03c.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -182,15 +182,15 @@ test -s t03c.err || rm -f t03c.err
 $xx -k0 $srcdir/t03d.in > t03d.out 2> t03d.err
 code=$?
 if test $code != 2 ; then
-  $echo Test 03d failed: ../../src/sort return code $code differs from expected value 2 1>&2
+  $echo "Test 03d failed: ../../src/sort return code $code differs from expected value 2" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t03d.out $srcdir/t03d.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 03d; fi ;; # equal files
-    1) $echo Test 03d failed: files t03d.out and $srcdir/t03d.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 03d"; fi ;;
+    1) $echo "Test 03d failed: files t03d.out and $srcdir/t03d.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 03d may have failed. 1>&2;
+    2) $echo "Test 03d may have failed." 1>&2;
        $echo The command "cmp t03d.out $srcdir/t03d.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -199,15 +199,15 @@ test -s t03d.err || rm -f t03d.err
 $xx -k1.0 $srcdir/t03e.in > t03e.out 2> t03e.err
 code=$?
 if test $code != 2 ; then
-  $echo Test 03e failed: ../../src/sort return code $code differs from expected value 2 1>&2
+  $echo "Test 03e failed: ../../src/sort return code $code differs from expected value 2" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t03e.out $srcdir/t03e.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 03e; fi ;; # equal files
-    1) $echo Test 03e failed: files t03e.out and $srcdir/t03e.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 03e"; fi ;;
+    1) $echo "Test 03e failed: files t03e.out and $srcdir/t03e.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 03e may have failed. 1>&2;
+    2) $echo "Test 03e may have failed." 1>&2;
        $echo The command "cmp t03e.out $srcdir/t03e.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -216,15 +216,15 @@ test -s t03e.err || rm -f t03e.err
 $xx -k1.1,-k0 $srcdir/t03f.in > t03f.out 2> t03f.err
 code=$?
 if test $code != 2 ; then
-  $echo Test 03f failed: ../../src/sort return code $code differs from expected value 2 1>&2
+  $echo "Test 03f failed: ../../src/sort return code $code differs from expected value 2" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t03f.out $srcdir/t03f.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 03f; fi ;; # equal files
-    1) $echo Test 03f failed: files t03f.out and $srcdir/t03f.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 03f"; fi ;;
+    1) $echo "Test 03f failed: files t03f.out and $srcdir/t03f.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 03f may have failed. 1>&2;
+    2) $echo "Test 03f may have failed." 1>&2;
        $echo The command "cmp t03f.out $srcdir/t03f.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -233,15 +233,15 @@ test -s t03f.err || rm -f t03f.err
 $xx -k1.1,1.0 $srcdir/t03g.in > t03g.out 2> t03g.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 03g failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 03g failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t03g.out $srcdir/t03g.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 03g; fi ;; # equal files
-    1) $echo Test 03g failed: files t03g.out and $srcdir/t03g.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 03g"; fi ;;
+    1) $echo "Test 03g failed: files t03g.out and $srcdir/t03g.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 03g may have failed. 1>&2;
+    2) $echo "Test 03g may have failed." 1>&2;
        $echo The command "cmp t03g.out $srcdir/t03g.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -250,15 +250,15 @@ test -s t03g.err || rm -f t03g.err
 $xx -k1.1,1 $srcdir/t03h.in > t03h.out 2> t03h.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 03h failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 03h failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t03h.out $srcdir/t03h.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 03h; fi ;; # equal files
-    1) $echo Test 03h failed: files t03h.out and $srcdir/t03h.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 03h"; fi ;;
+    1) $echo "Test 03h failed: files t03h.out and $srcdir/t03h.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 03h may have failed. 1>&2;
+    2) $echo "Test 03h may have failed." 1>&2;
        $echo The command "cmp t03h.out $srcdir/t03h.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -267,15 +267,15 @@ test -s t03h.err || rm -f t03h.err
 $xx -k1,1 $srcdir/t03i.in > t03i.out 2> t03i.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 03i failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 03i failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t03i.out $srcdir/t03i.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 03i; fi ;; # equal files
-    1) $echo Test 03i failed: files t03i.out and $srcdir/t03i.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 03i"; fi ;;
+    1) $echo "Test 03i failed: files t03i.out and $srcdir/t03i.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 03i may have failed. 1>&2;
+    2) $echo "Test 03i may have failed." 1>&2;
        $echo The command "cmp t03i.out $srcdir/t03i.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -284,15 +284,15 @@ test -s t03i.err || rm -f t03i.err
 $xx -nc $srcdir/t04a.in > t04a.out 2> t04a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 04a failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 04a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t04a.out $srcdir/t04a.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 04a; fi ;; # equal files
-    1) $echo Test 04a failed: files t04a.out and $srcdir/t04a.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 04a"; fi ;;
+    1) $echo "Test 04a failed: files t04a.out and $srcdir/t04a.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 04a may have failed. 1>&2;
+    2) $echo "Test 04a may have failed." 1>&2;
        $echo The command "cmp t04a.out $srcdir/t04a.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -301,15 +301,15 @@ test -s t04a.err || rm -f t04a.err
 $xx -n $srcdir/t04b.in > t04b.out 2> t04b.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 04b failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 04b failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t04b.out $srcdir/t04b.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 04b; fi ;; # equal files
-    1) $echo Test 04b failed: files t04b.out and $srcdir/t04b.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 04b"; fi ;;
+    1) $echo "Test 04b failed: files t04b.out and $srcdir/t04b.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 04b may have failed. 1>&2;
+    2) $echo "Test 04b may have failed." 1>&2;
        $echo The command "cmp t04b.out $srcdir/t04b.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -318,15 +318,15 @@ test -s t04b.err || rm -f t04b.err
 $xx -k1n $srcdir/t04c.in > t04c.out 2> t04c.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 04c failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 04c failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t04c.out $srcdir/t04c.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 04c; fi ;; # equal files
-    1) $echo Test 04c failed: files t04c.out and $srcdir/t04c.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 04c"; fi ;;
+    1) $echo "Test 04c failed: files t04c.out and $srcdir/t04c.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 04c may have failed. 1>&2;
+    2) $echo "Test 04c may have failed." 1>&2;
        $echo The command "cmp t04c.out $srcdir/t04c.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -335,15 +335,15 @@ test -s t04c.err || rm -f t04c.err
 $xx -k1 $srcdir/t04d.in > t04d.out 2> t04d.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 04d failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 04d failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t04d.out $srcdir/t04d.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 04d; fi ;; # equal files
-    1) $echo Test 04d failed: files t04d.out and $srcdir/t04d.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 04d"; fi ;;
+    1) $echo "Test 04d failed: files t04d.out and $srcdir/t04d.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 04d may have failed. 1>&2;
+    2) $echo "Test 04d may have failed." 1>&2;
        $echo The command "cmp t04d.out $srcdir/t04d.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -352,15 +352,15 @@ test -s t04d.err || rm -f t04d.err
 $xx -k2 $srcdir/t04e.in > t04e.out 2> t04e.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 04e failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 04e failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t04e.out $srcdir/t04e.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 04e; fi ;; # equal files
-    1) $echo Test 04e failed: files t04e.out and $srcdir/t04e.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 04e"; fi ;;
+    1) $echo "Test 04e failed: files t04e.out and $srcdir/t04e.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 04e may have failed. 1>&2;
+    2) $echo "Test 04e may have failed." 1>&2;
        $echo The command "cmp t04e.out $srcdir/t04e.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -369,15 +369,15 @@ test -s t04e.err || rm -f t04e.err
 $xx -k1,2 $srcdir/t05a.in > t05a.out 2> t05a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 05a failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 05a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t05a.out $srcdir/t05a.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 05a; fi ;; # equal files
-    1) $echo Test 05a failed: files t05a.out and $srcdir/t05a.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 05a"; fi ;;
+    1) $echo "Test 05a failed: files t05a.out and $srcdir/t05a.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 05a may have failed. 1>&2;
+    2) $echo "Test 05a may have failed." 1>&2;
        $echo The command "cmp t05a.out $srcdir/t05a.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -386,15 +386,15 @@ test -s t05a.err || rm -f t05a.err
 $xx -k1,2 $srcdir/t05b.in > t05b.out 2> t05b.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 05b failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 05b failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t05b.out $srcdir/t05b.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 05b; fi ;; # equal files
-    1) $echo Test 05b failed: files t05b.out and $srcdir/t05b.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 05b"; fi ;;
+    1) $echo "Test 05b failed: files t05b.out and $srcdir/t05b.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 05b may have failed. 1>&2;
+    2) $echo "Test 05b may have failed." 1>&2;
        $echo The command "cmp t05b.out $srcdir/t05b.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -403,15 +403,15 @@ test -s t05b.err || rm -f t05b.err
 $xx -k1 -k2 $srcdir/t05c.in > t05c.out 2> t05c.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 05c failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 05c failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t05c.out $srcdir/t05c.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 05c; fi ;; # equal files
-    1) $echo Test 05c failed: files t05c.out and $srcdir/t05c.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 05c"; fi ;;
+    1) $echo "Test 05c failed: files t05c.out and $srcdir/t05c.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 05c may have failed. 1>&2;
+    2) $echo "Test 05c may have failed." 1>&2;
        $echo The command "cmp t05c.out $srcdir/t05c.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -420,15 +420,15 @@ test -s t05c.err || rm -f t05c.err
 $xx -k2,2 $srcdir/t05d.in > t05d.out 2> t05d.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 05d failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 05d failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t05d.out $srcdir/t05d.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 05d; fi ;; # equal files
-    1) $echo Test 05d failed: files t05d.out and $srcdir/t05d.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 05d"; fi ;;
+    1) $echo "Test 05d failed: files t05d.out and $srcdir/t05d.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 05d may have failed. 1>&2;
+    2) $echo "Test 05d may have failed." 1>&2;
        $echo The command "cmp t05d.out $srcdir/t05d.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -437,15 +437,15 @@ test -s t05d.err || rm -f t05d.err
 $xx -k2,2 $srcdir/t05e.in > t05e.out 2> t05e.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 05e failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 05e failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t05e.out $srcdir/t05e.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 05e; fi ;; # equal files
-    1) $echo Test 05e failed: files t05e.out and $srcdir/t05e.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 05e"; fi ;;
+    1) $echo "Test 05e failed: files t05e.out and $srcdir/t05e.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 05e may have failed. 1>&2;
+    2) $echo "Test 05e may have failed." 1>&2;
        $echo The command "cmp t05e.out $srcdir/t05e.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -454,15 +454,15 @@ test -s t05e.err || rm -f t05e.err
 $xx -k2,2 $srcdir/t05f.in > t05f.out 2> t05f.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 05f failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 05f failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t05f.out $srcdir/t05f.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 05f; fi ;; # equal files
-    1) $echo Test 05f failed: files t05f.out and $srcdir/t05f.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 05f"; fi ;;
+    1) $echo "Test 05f failed: files t05f.out and $srcdir/t05f.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 05f may have failed. 1>&2;
+    2) $echo "Test 05f may have failed." 1>&2;
        $echo The command "cmp t05f.out $srcdir/t05f.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -471,15 +471,15 @@ test -s t05f.err || rm -f t05f.err
 $xx -k 1,2 $srcdir/t06a.in > t06a.out 2> t06a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 06a failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 06a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t06a.out $srcdir/t06a.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 06a; fi ;; # equal files
-    1) $echo Test 06a failed: files t06a.out and $srcdir/t06a.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 06a"; fi ;;
+    1) $echo "Test 06a failed: files t06a.out and $srcdir/t06a.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 06a may have failed. 1>&2;
+    2) $echo "Test 06a may have failed." 1>&2;
        $echo The command "cmp t06a.out $srcdir/t06a.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -488,15 +488,15 @@ test -s t06a.err || rm -f t06a.err
 $xx -k 1,2 $srcdir/t06b.in > t06b.out 2> t06b.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 06b failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 06b failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t06b.out $srcdir/t06b.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 06b; fi ;; # equal files
-    1) $echo Test 06b failed: files t06b.out and $srcdir/t06b.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 06b"; fi ;;
+    1) $echo "Test 06b failed: files t06b.out and $srcdir/t06b.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 06b may have failed. 1>&2;
+    2) $echo "Test 06b may have failed." 1>&2;
        $echo The command "cmp t06b.out $srcdir/t06b.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -505,15 +505,15 @@ test -s t06b.err || rm -f t06b.err
 $xx -k 1 -k 2 $srcdir/t06c.in > t06c.out 2> t06c.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 06c failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 06c failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t06c.out $srcdir/t06c.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 06c; fi ;; # equal files
-    1) $echo Test 06c failed: files t06c.out and $srcdir/t06c.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 06c"; fi ;;
+    1) $echo "Test 06c failed: files t06c.out and $srcdir/t06c.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 06c may have failed. 1>&2;
+    2) $echo "Test 06c may have failed." 1>&2;
        $echo The command "cmp t06c.out $srcdir/t06c.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -522,15 +522,15 @@ test -s t06c.err || rm -f t06c.err
 $xx -k 2,2 $srcdir/t06d.in > t06d.out 2> t06d.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 06d failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 06d failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t06d.out $srcdir/t06d.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 06d; fi ;; # equal files
-    1) $echo Test 06d failed: files t06d.out and $srcdir/t06d.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 06d"; fi ;;
+    1) $echo "Test 06d failed: files t06d.out and $srcdir/t06d.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 06d may have failed. 1>&2;
+    2) $echo "Test 06d may have failed." 1>&2;
        $echo The command "cmp t06d.out $srcdir/t06d.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -539,15 +539,15 @@ test -s t06d.err || rm -f t06d.err
 $xx -k 2,2 $srcdir/t06e.in > t06e.out 2> t06e.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 06e failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 06e failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t06e.out $srcdir/t06e.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 06e; fi ;; # equal files
-    1) $echo Test 06e failed: files t06e.out and $srcdir/t06e.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 06e"; fi ;;
+    1) $echo "Test 06e failed: files t06e.out and $srcdir/t06e.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 06e may have failed. 1>&2;
+    2) $echo "Test 06e may have failed." 1>&2;
        $echo The command "cmp t06e.out $srcdir/t06e.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -556,15 +556,15 @@ test -s t06e.err || rm -f t06e.err
 $xx -k 2,2 $srcdir/t06f.in > t06f.out 2> t06f.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 06f failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 06f failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t06f.out $srcdir/t06f.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 06f; fi ;; # equal files
-    1) $echo Test 06f failed: files t06f.out and $srcdir/t06f.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 06f"; fi ;;
+    1) $echo "Test 06f failed: files t06f.out and $srcdir/t06f.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 06f may have failed. 1>&2;
+    2) $echo "Test 06f may have failed." 1>&2;
        $echo The command "cmp t06f.out $srcdir/t06f.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -573,15 +573,15 @@ test -s t06f.err || rm -f t06f.err
 $xx -k 2,3 $srcdir/t07a.in > t07a.out 2> t07a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 07a failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 07a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t07a.out $srcdir/t07a.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 07a; fi ;; # equal files
-    1) $echo Test 07a failed: files t07a.out and $srcdir/t07a.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 07a"; fi ;;
+    1) $echo "Test 07a failed: files t07a.out and $srcdir/t07a.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 07a may have failed. 1>&2;
+    2) $echo "Test 07a may have failed." 1>&2;
        $echo The command "cmp t07a.out $srcdir/t07a.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -590,15 +590,15 @@ test -s t07a.err || rm -f t07a.err
 $xx -k 2,3 $srcdir/t07b.in > t07b.out 2> t07b.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 07b failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 07b failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t07b.out $srcdir/t07b.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 07b; fi ;; # equal files
-    1) $echo Test 07b failed: files t07b.out and $srcdir/t07b.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 07b"; fi ;;
+    1) $echo "Test 07b failed: files t07b.out and $srcdir/t07b.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 07b may have failed. 1>&2;
+    2) $echo "Test 07b may have failed." 1>&2;
        $echo The command "cmp t07b.out $srcdir/t07b.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -607,15 +607,15 @@ test -s t07b.err || rm -f t07b.err
 $xx -k 2,3 $srcdir/t07c.in > t07c.out 2> t07c.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 07c failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 07c failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t07c.out $srcdir/t07c.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 07c; fi ;; # equal files
-    1) $echo Test 07c failed: files t07c.out and $srcdir/t07c.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 07c"; fi ;;
+    1) $echo "Test 07c failed: files t07c.out and $srcdir/t07c.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 07c may have failed. 1>&2;
+    2) $echo "Test 07c may have failed." 1>&2;
        $echo The command "cmp t07c.out $srcdir/t07c.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -624,15 +624,15 @@ test -s t07c.err || rm -f t07c.err
 $xx +1 -3 $srcdir/t07d.in > t07d.out 2> t07d.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 07d failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 07d failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t07d.out $srcdir/t07d.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 07d; fi ;; # equal files
-    1) $echo Test 07d failed: files t07d.out and $srcdir/t07d.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 07d"; fi ;;
+    1) $echo "Test 07d failed: files t07d.out and $srcdir/t07d.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 07d may have failed. 1>&2;
+    2) $echo "Test 07d may have failed." 1>&2;
        $echo The command "cmp t07d.out $srcdir/t07d.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -641,15 +641,15 @@ test -s t07d.err || rm -f t07d.err
 $xx -k 2.,3 $srcdir/t08a.in > t08a.out 2> t08a.err
 code=$?
 if test $code != 2 ; then
-  $echo Test 08a failed: ../../src/sort return code $code differs from expected value 2 1>&2
+  $echo "Test 08a failed: ../../src/sort return code $code differs from expected value 2" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t08a.out $srcdir/t08a.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 08a; fi ;; # equal files
-    1) $echo Test 08a failed: files t08a.out and $srcdir/t08a.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 08a"; fi ;;
+    1) $echo "Test 08a failed: files t08a.out and $srcdir/t08a.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 08a may have failed. 1>&2;
+    2) $echo "Test 08a may have failed." 1>&2;
        $echo The command "cmp t08a.out $srcdir/t08a.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -658,15 +658,15 @@ test -s t08a.err || rm -f t08a.err
 $xx -k 2, $srcdir/t08b.in > t08b.out 2> t08b.err
 code=$?
 if test $code != 2 ; then
-  $echo Test 08b failed: ../../src/sort return code $code differs from expected value 2 1>&2
+  $echo "Test 08b failed: ../../src/sort return code $code differs from expected value 2" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t08b.out $srcdir/t08b.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 08b; fi ;; # equal files
-    1) $echo Test 08b failed: files t08b.out and $srcdir/t08b.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 08b"; fi ;;
+    1) $echo "Test 08b failed: files t08b.out and $srcdir/t08b.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 08b may have failed. 1>&2;
+    2) $echo "Test 08b may have failed." 1>&2;
        $echo The command "cmp t08b.out $srcdir/t08b.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -675,15 +675,15 @@ test -s t08b.err || rm -f t08b.err
 $xx -g $srcdir/t09a.in > t09a.out 2> t09a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 09a failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 09a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t09a.out $srcdir/t09a.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 09a; fi ;; # equal files
-    1) $echo Test 09a failed: files t09a.out and $srcdir/t09a.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 09a"; fi ;;
+    1) $echo "Test 09a failed: files t09a.out and $srcdir/t09a.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 09a may have failed. 1>&2;
+    2) $echo "Test 09a may have failed." 1>&2;
        $echo The command "cmp t09a.out $srcdir/t09a.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -692,15 +692,15 @@ test -s t09a.err || rm -f t09a.err
 $xx -n $srcdir/t09b.in > t09b.out 2> t09b.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 09b failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 09b failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t09b.out $srcdir/t09b.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 09b; fi ;; # equal files
-    1) $echo Test 09b failed: files t09b.out and $srcdir/t09b.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 09b"; fi ;;
+    1) $echo "Test 09b failed: files t09b.out and $srcdir/t09b.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 09b may have failed. 1>&2;
+    2) $echo "Test 09b may have failed." 1>&2;
        $echo The command "cmp t09b.out $srcdir/t09b.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -709,15 +709,15 @@ test -s t09b.err || rm -f t09b.err
 $xx -n $srcdir/t09c.in > t09c.out 2> t09c.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 09c failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 09c failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t09c.out $srcdir/t09c.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 09c; fi ;; # equal files
-    1) $echo Test 09c failed: files t09c.out and $srcdir/t09c.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 09c"; fi ;;
+    1) $echo "Test 09c failed: files t09c.out and $srcdir/t09c.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 09c may have failed. 1>&2;
+    2) $echo "Test 09c may have failed." 1>&2;
        $echo The command "cmp t09c.out $srcdir/t09c.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -726,15 +726,15 @@ test -s t09c.err || rm -f t09c.err
 $xx -k2g $srcdir/t09d.in > t09d.out 2> t09d.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 09d failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 09d failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t09d.out $srcdir/t09d.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 09d; fi ;; # equal files
-    1) $echo Test 09d failed: files t09d.out and $srcdir/t09d.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 09d"; fi ;;
+    1) $echo "Test 09d failed: files t09d.out and $srcdir/t09d.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 09d may have failed. 1>&2;
+    2) $echo "Test 09d may have failed." 1>&2;
        $echo The command "cmp t09d.out $srcdir/t09d.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -743,15 +743,15 @@ test -s t09d.err || rm -f t09d.err
 $xx -t : -k 2.2,2.2 $srcdir/t10a.in > t10a.out 2> t10a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 10a failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 10a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t10a.out $srcdir/t10a.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 10a; fi ;; # equal files
-    1) $echo Test 10a failed: files t10a.out and $srcdir/t10a.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 10a"; fi ;;
+    1) $echo "Test 10a failed: files t10a.out and $srcdir/t10a.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 10a may have failed. 1>&2;
+    2) $echo "Test 10a may have failed." 1>&2;
        $echo The command "cmp t10a.out $srcdir/t10a.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -760,15 +760,15 @@ test -s t10a.err || rm -f t10a.err
 $xx -t : +1.1 -1.2 $srcdir/t10b.in > t10b.out 2> t10b.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 10b failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 10b failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t10b.out $srcdir/t10b.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 10b; fi ;; # equal files
-    1) $echo Test 10b failed: files t10b.out and $srcdir/t10b.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 10b"; fi ;;
+    1) $echo "Test 10b failed: files t10b.out and $srcdir/t10b.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 10b may have failed. 1>&2;
+    2) $echo "Test 10b may have failed." 1>&2;
        $echo The command "cmp t10b.out $srcdir/t10b.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -777,15 +777,15 @@ test -s t10b.err || rm -f t10b.err
 $xx -t : -k 2.2,2.2 $srcdir/t10c.in > t10c.out 2> t10c.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 10c failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 10c failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t10c.out $srcdir/t10c.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 10c; fi ;; # equal files
-    1) $echo Test 10c failed: files t10c.out and $srcdir/t10c.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 10c"; fi ;;
+    1) $echo "Test 10c failed: files t10c.out and $srcdir/t10c.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 10c may have failed. 1>&2;
+    2) $echo "Test 10c may have failed." 1>&2;
        $echo The command "cmp t10c.out $srcdir/t10c.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -794,15 +794,15 @@ test -s t10c.err || rm -f t10c.err
 $xx -t : +1.1 -1.2 $srcdir/t10d.in > t10d.out 2> t10d.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 10d failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 10d failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t10d.out $srcdir/t10d.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 10d; fi ;; # equal files
-    1) $echo Test 10d failed: files t10d.out and $srcdir/t10d.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 10d"; fi ;;
+    1) $echo "Test 10d failed: files t10d.out and $srcdir/t10d.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 10d may have failed. 1>&2;
+    2) $echo "Test 10d may have failed." 1>&2;
        $echo The command "cmp t10d.out $srcdir/t10d.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -811,15 +811,15 @@ test -s t10d.err || rm -f t10d.err
 $xx -k 2.3,2.3 $srcdir/t10a0.in > t10a0.out 2> t10a0.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 10a0 failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 10a0 failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t10a0.out $srcdir/t10a0.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 10a0; fi ;; # equal files
-    1) $echo Test 10a0 failed: files t10a0.out and $srcdir/t10a0.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 10a0"; fi ;;
+    1) $echo "Test 10a0 failed: files t10a0.out and $srcdir/t10a0.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 10a0 may have failed. 1>&2;
+    2) $echo "Test 10a0 may have failed." 1>&2;
        $echo The command "cmp t10a0.out $srcdir/t10a0.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -828,15 +828,15 @@ test -s t10a0.err || rm -f t10a0.err
 $xx -k 1.2,1.2 $srcdir/t10a1.in > t10a1.out 2> t10a1.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 10a1 failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 10a1 failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t10a1.out $srcdir/t10a1.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 10a1; fi ;; # equal files
-    1) $echo Test 10a1 failed: files t10a1.out and $srcdir/t10a1.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 10a1"; fi ;;
+    1) $echo "Test 10a1 failed: files t10a1.out and $srcdir/t10a1.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 10a1 may have failed. 1>&2;
+    2) $echo "Test 10a1 may have failed." 1>&2;
        $echo The command "cmp t10a1.out $srcdir/t10a1.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -845,15 +845,15 @@ test -s t10a1.err || rm -f t10a1.err
 $xx -b -k 2.2,2.2 $srcdir/t10a2.in > t10a2.out 2> t10a2.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 10a2 failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 10a2 failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t10a2.out $srcdir/t10a2.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 10a2; fi ;; # equal files
-    1) $echo Test 10a2 failed: files t10a2.out and $srcdir/t10a2.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 10a2"; fi ;;
+    1) $echo "Test 10a2 failed: files t10a2.out and $srcdir/t10a2.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 10a2 may have failed. 1>&2;
+    2) $echo "Test 10a2 may have failed." 1>&2;
        $echo The command "cmp t10a2.out $srcdir/t10a2.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -862,15 +862,15 @@ test -s t10a2.err || rm -f t10a2.err
 $xx -k 1.2,1.2 $srcdir/t10e.in > t10e.out 2> t10e.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 10e failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 10e failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t10e.out $srcdir/t10e.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 10e; fi ;; # equal files
-    1) $echo Test 10e failed: files t10e.out and $srcdir/t10e.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 10e"; fi ;;
+    1) $echo "Test 10e failed: files t10e.out and $srcdir/t10e.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 10e may have failed. 1>&2;
+    2) $echo "Test 10e may have failed." 1>&2;
        $echo The command "cmp t10e.out $srcdir/t10e.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -879,15 +879,15 @@ test -s t10e.err || rm -f t10e.err
 $xx -t : -k 1.3,1.3 $srcdir/t10f.in > t10f.out 2> t10f.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 10f failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 10f failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t10f.out $srcdir/t10f.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 10f; fi ;; # equal files
-    1) $echo Test 10f failed: files t10f.out and $srcdir/t10f.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 10f"; fi ;;
+    1) $echo "Test 10f failed: files t10f.out and $srcdir/t10f.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 10f may have failed. 1>&2;
+    2) $echo "Test 10f may have failed." 1>&2;
        $echo The command "cmp t10f.out $srcdir/t10f.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -896,15 +896,15 @@ test -s t10f.err || rm -f t10f.err
 $xx -k 1.4,1.4 $srcdir/t10g.in > t10g.out 2> t10g.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 10g failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 10g failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t10g.out $srcdir/t10g.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 10g; fi ;; # equal files
-    1) $echo Test 10g failed: files t10g.out and $srcdir/t10g.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 10g"; fi ;;
+    1) $echo "Test 10g failed: files t10g.out and $srcdir/t10g.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 10g may have failed. 1>&2;
+    2) $echo "Test 10g may have failed." 1>&2;
        $echo The command "cmp t10g.out $srcdir/t10g.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -913,15 +913,15 @@ test -s t10g.err || rm -f t10g.err
 $xx -t: -k1,1b -k2,2 $srcdir/t11a.in > t11a.out 2> t11a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 11a failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 11a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t11a.out $srcdir/t11a.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 11a; fi ;; # equal files
-    1) $echo Test 11a failed: files t11a.out and $srcdir/t11a.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 11a"; fi ;;
+    1) $echo "Test 11a failed: files t11a.out and $srcdir/t11a.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 11a may have failed. 1>&2;
+    2) $echo "Test 11a may have failed." 1>&2;
        $echo The command "cmp t11a.out $srcdir/t11a.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -930,15 +930,15 @@ test -s t11a.err || rm -f t11a.err
 $xx -t: -k1,1b -k2,2 $srcdir/t11b.in > t11b.out 2> t11b.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 11b failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 11b failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t11b.out $srcdir/t11b.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 11b; fi ;; # equal files
-    1) $echo Test 11b failed: files t11b.out and $srcdir/t11b.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 11b"; fi ;;
+    1) $echo "Test 11b failed: files t11b.out and $srcdir/t11b.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 11b may have failed. 1>&2;
+    2) $echo "Test 11b may have failed." 1>&2;
        $echo The command "cmp t11b.out $srcdir/t11b.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -947,15 +947,15 @@ test -s t11b.err || rm -f t11b.err
 $xx -t: -k2,2b -k3,3 $srcdir/t11c.in > t11c.out 2> t11c.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 11c failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 11c failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t11c.out $srcdir/t11c.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 11c; fi ;; # equal files
-    1) $echo Test 11c failed: files t11c.out and $srcdir/t11c.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 11c"; fi ;;
+    1) $echo "Test 11c failed: files t11c.out and $srcdir/t11c.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 11c may have failed. 1>&2;
+    2) $echo "Test 11c may have failed." 1>&2;
        $echo The command "cmp t11c.out $srcdir/t11c.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -964,15 +964,15 @@ test -s t11c.err || rm -f t11c.err
 $xx -t: -k2,2b -k3,3 $srcdir/t11d.in > t11d.out 2> t11d.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 11d failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 11d failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t11d.out $srcdir/t11d.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 11d; fi ;; # equal files
-    1) $echo Test 11d failed: files t11d.out and $srcdir/t11d.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 11d"; fi ;;
+    1) $echo "Test 11d failed: files t11d.out and $srcdir/t11d.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 11d may have failed. 1>&2;
+    2) $echo "Test 11d may have failed." 1>&2;
        $echo The command "cmp t11d.out $srcdir/t11d.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -981,15 +981,15 @@ test -s t11d.err || rm -f t11d.err
 $xx -n -t: +1 $srcdir/t12a.in > t12a.out 2> t12a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 12a failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 12a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t12a.out $srcdir/t12a.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 12a; fi ;; # equal files
-    1) $echo Test 12a failed: files t12a.out and $srcdir/t12a.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 12a"; fi ;;
+    1) $echo "Test 12a failed: files t12a.out and $srcdir/t12a.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 12a may have failed. 1>&2;
+    2) $echo "Test 12a may have failed." 1>&2;
        $echo The command "cmp t12a.out $srcdir/t12a.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -998,15 +998,15 @@ test -s t12a.err || rm -f t12a.err
 $xx -n -t: +1 $srcdir/t12b.in > t12b.out 2> t12b.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 12b failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 12b failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t12b.out $srcdir/t12b.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 12b; fi ;; # equal files
-    1) $echo Test 12b failed: files t12b.out and $srcdir/t12b.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 12b"; fi ;;
+    1) $echo "Test 12b failed: files t12b.out and $srcdir/t12b.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 12b may have failed. 1>&2;
+    2) $echo "Test 12b may have failed." 1>&2;
        $echo The command "cmp t12b.out $srcdir/t12b.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1015,15 +1015,15 @@ test -s t12b.err || rm -f t12b.err
 $xx -n -t: +1 $srcdir/t12c.in > t12c.out 2> t12c.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 12c failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 12c failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t12c.out $srcdir/t12c.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 12c; fi ;; # equal files
-    1) $echo Test 12c failed: files t12c.out and $srcdir/t12c.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 12c"; fi ;;
+    1) $echo "Test 12c failed: files t12c.out and $srcdir/t12c.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 12c may have failed. 1>&2;
+    2) $echo "Test 12c may have failed." 1>&2;
        $echo The command "cmp t12c.out $srcdir/t12c.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1032,15 +1032,15 @@ test -s t12c.err || rm -f t12c.err
 $xx -n -t: +1 $srcdir/t12d.in > t12d.out 2> t12d.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 12d failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 12d failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t12d.out $srcdir/t12d.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 12d; fi ;; # equal files
-    1) $echo Test 12d failed: files t12d.out and $srcdir/t12d.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 12d"; fi ;;
+    1) $echo "Test 12d failed: files t12d.out and $srcdir/t12d.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 12d may have failed. 1>&2;
+    2) $echo "Test 12d may have failed." 1>&2;
        $echo The command "cmp t12d.out $srcdir/t12d.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1049,15 +1049,15 @@ test -s t12d.err || rm -f t12d.err
 $xx +0.1n $srcdir/t13a.in > t13a.out 2> t13a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 13a failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 13a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t13a.out $srcdir/t13a.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 13a; fi ;; # equal files
-    1) $echo Test 13a failed: files t13a.out and $srcdir/t13a.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 13a"; fi ;;
+    1) $echo "Test 13a failed: files t13a.out and $srcdir/t13a.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 13a may have failed. 1>&2;
+    2) $echo "Test 13a may have failed." 1>&2;
        $echo The command "cmp t13a.out $srcdir/t13a.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1066,15 +1066,15 @@ test -s t13a.err || rm -f t13a.err
 $xx +0.1n $srcdir/t13b.in > t13b.out 2> t13b.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 13b failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 13b failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t13b.out $srcdir/t13b.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 13b; fi ;; # equal files
-    1) $echo Test 13b failed: files t13b.out and $srcdir/t13b.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 13b"; fi ;;
+    1) $echo "Test 13b failed: files t13b.out and $srcdir/t13b.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 13b may have failed. 1>&2;
+    2) $echo "Test 13b may have failed." 1>&2;
        $echo The command "cmp t13b.out $srcdir/t13b.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1083,15 +1083,15 @@ test -s t13b.err || rm -f t13b.err
 $xx -d -u $srcdir/t14a.in > t14a.out 2> t14a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 14a failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 14a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t14a.out $srcdir/t14a.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 14a; fi ;; # equal files
-    1) $echo Test 14a failed: files t14a.out and $srcdir/t14a.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 14a"; fi ;;
+    1) $echo "Test 14a failed: files t14a.out and $srcdir/t14a.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 14a may have failed. 1>&2;
+    2) $echo "Test 14a may have failed." 1>&2;
        $echo The command "cmp t14a.out $srcdir/t14a.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1100,15 +1100,15 @@ test -s t14a.err || rm -f t14a.err
 $xx -f -d -u $srcdir/t14b.in > t14b.out 2> t14b.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 14b failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 14b failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t14b.out $srcdir/t14b.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 14b; fi ;; # equal files
-    1) $echo Test 14b failed: files t14b.out and $srcdir/t14b.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 14b"; fi ;;
+    1) $echo "Test 14b failed: files t14b.out and $srcdir/t14b.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 14b may have failed. 1>&2;
+    2) $echo "Test 14b may have failed." 1>&2;
        $echo The command "cmp t14b.out $srcdir/t14b.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1117,15 +1117,15 @@ test -s t14b.err || rm -f t14b.err
 $xx -i -u $srcdir/t15a.in > t15a.out 2> t15a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 15a failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 15a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t15a.out $srcdir/t15a.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 15a; fi ;; # equal files
-    1) $echo Test 15a failed: files t15a.out and $srcdir/t15a.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 15a"; fi ;;
+    1) $echo "Test 15a failed: files t15a.out and $srcdir/t15a.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 15a may have failed. 1>&2;
+    2) $echo "Test 15a may have failed." 1>&2;
        $echo The command "cmp t15a.out $srcdir/t15a.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1134,15 +1134,15 @@ test -s t15a.err || rm -f t15a.err
 $xx -i -u $srcdir/t15b.in > t15b.out 2> t15b.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 15b failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 15b failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t15b.out $srcdir/t15b.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 15b; fi ;; # equal files
-    1) $echo Test 15b failed: files t15b.out and $srcdir/t15b.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 15b"; fi ;;
+    1) $echo "Test 15b failed: files t15b.out and $srcdir/t15b.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 15b may have failed. 1>&2;
+    2) $echo "Test 15b may have failed." 1>&2;
        $echo The command "cmp t15b.out $srcdir/t15b.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1151,15 +1151,15 @@ test -s t15b.err || rm -f t15b.err
 $xx -i -u $srcdir/t15c.in > t15c.out 2> t15c.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 15c failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 15c failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t15c.out $srcdir/t15c.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 15c; fi ;; # equal files
-    1) $echo Test 15c failed: files t15c.out and $srcdir/t15c.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 15c"; fi ;;
+    1) $echo "Test 15c failed: files t15c.out and $srcdir/t15c.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 15c may have failed. 1>&2;
+    2) $echo "Test 15c may have failed." 1>&2;
        $echo The command "cmp t15c.out $srcdir/t15c.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1168,15 +1168,15 @@ test -s t15c.err || rm -f t15c.err
 $xx -i -u $srcdir/t15d.in > t15d.out 2> t15d.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 15d failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 15d failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t15d.out $srcdir/t15d.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 15d; fi ;; # equal files
-    1) $echo Test 15d failed: files t15d.out and $srcdir/t15d.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 15d"; fi ;;
+    1) $echo "Test 15d failed: files t15d.out and $srcdir/t15d.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 15d may have failed. 1>&2;
+    2) $echo "Test 15d may have failed." 1>&2;
        $echo The command "cmp t15d.out $srcdir/t15d.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1185,15 +1185,15 @@ test -s t15d.err || rm -f t15d.err
 $xx -i -u $srcdir/t15e.in > t15e.out 2> t15e.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 15e failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 15e failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t15e.out $srcdir/t15e.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 15e; fi ;; # equal files
-    1) $echo Test 15e failed: files t15e.out and $srcdir/t15e.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 15e"; fi ;;
+    1) $echo "Test 15e failed: files t15e.out and $srcdir/t15e.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 15e may have failed. 1>&2;
+    2) $echo "Test 15e may have failed." 1>&2;
        $echo The command "cmp t15e.out $srcdir/t15e.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1202,15 +1202,15 @@ test -s t15e.err || rm -f t15e.err
 $xx -f $srcdir/t16a.in > t16a.out 2> t16a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 16a failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 16a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t16a.out $srcdir/t16a.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 16a; fi ;; # equal files
-    1) $echo Test 16a failed: files t16a.out and $srcdir/t16a.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 16a"; fi ;;
+    1) $echo "Test 16a failed: files t16a.out and $srcdir/t16a.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 16a may have failed. 1>&2;
+    2) $echo "Test 16a may have failed." 1>&2;
        $echo The command "cmp t16a.out $srcdir/t16a.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1219,15 +1219,15 @@ test -s t16a.err || rm -f t16a.err
 $xx -c $srcdir/t17.in > t17.out 2> t17.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 17 failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 17 failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t17.out $srcdir/t17.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 17; fi ;; # equal files
-    1) $echo Test 17 failed: files t17.out and $srcdir/t17.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 17"; fi ;;
+    1) $echo "Test 17 failed: files t17.out and $srcdir/t17.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 17 may have failed. 1>&2;
+    2) $echo "Test 17 may have failed." 1>&2;
        $echo The command "cmp t17.out $srcdir/t17.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1236,15 +1236,15 @@ test -s t17.err || rm -f t17.err
 $xx -k1.1,1.2n $srcdir/t18a.in > t18a.out 2> t18a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 18a failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 18a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t18a.out $srcdir/t18a.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 18a; fi ;; # equal files
-    1) $echo Test 18a failed: files t18a.out and $srcdir/t18a.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 18a"; fi ;;
+    1) $echo "Test 18a failed: files t18a.out and $srcdir/t18a.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 18a may have failed. 1>&2;
+    2) $echo "Test 18a may have failed." 1>&2;
        $echo The command "cmp t18a.out $srcdir/t18a.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1253,15 +1253,15 @@ test -s t18a.err || rm -f t18a.err
 $xx -b -k1.1,1.2n $srcdir/t18b.in > t18b.out 2> t18b.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 18b failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 18b failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t18b.out $srcdir/t18b.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 18b; fi ;; # equal files
-    1) $echo Test 18b failed: files t18b.out and $srcdir/t18b.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 18b"; fi ;;
+    1) $echo "Test 18b failed: files t18b.out and $srcdir/t18b.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 18b may have failed. 1>&2;
+    2) $echo "Test 18b may have failed." 1>&2;
        $echo The command "cmp t18b.out $srcdir/t18b.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1270,15 +1270,15 @@ test -s t18b.err || rm -f t18b.err
 $xx -k1.1,1.2nb $srcdir/t18c.in > t18c.out 2> t18c.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 18c failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 18c failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t18c.out $srcdir/t18c.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 18c; fi ;; # equal files
-    1) $echo Test 18c failed: files t18c.out and $srcdir/t18c.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 18c"; fi ;;
+    1) $echo "Test 18c failed: files t18c.out and $srcdir/t18c.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 18c may have failed. 1>&2;
+    2) $echo "Test 18c may have failed." 1>&2;
        $echo The command "cmp t18c.out $srcdir/t18c.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1287,15 +1287,15 @@ test -s t18c.err || rm -f t18c.err
 $xx -k1.1b,1.2n $srcdir/t18d.in > t18d.out 2> t18d.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 18d failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 18d failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t18d.out $srcdir/t18d.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 18d; fi ;; # equal files
-    1) $echo Test 18d failed: files t18d.out and $srcdir/t18d.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 18d"; fi ;;
+    1) $echo "Test 18d failed: files t18d.out and $srcdir/t18d.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 18d may have failed. 1>&2;
+    2) $echo "Test 18d may have failed." 1>&2;
        $echo The command "cmp t18d.out $srcdir/t18d.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -1304,15 +1304,15 @@ test -s t18d.err || rm -f t18d.err
 $xx -nb -k1.1,1.2 $srcdir/t18e.in > t18e.out 2> t18e.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 18e failed: ../../src/sort return code $code differs from expected value 0 1>&2
+  $echo "Test 18e failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t18e.out $srcdir/t18e.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 18e; fi ;; # equal files
-    1) $echo Test 18e failed: files t18e.out and $srcdir/t18e.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 18e"; fi ;;
+    1) $echo "Test 18e failed: files t18e.out and $srcdir/t18e.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 18e may have failed. 1>&2;
+    2) $echo "Test 18e may have failed." 1>&2;
        $echo The command "cmp t18e.out $srcdir/t18e.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
diff --git a/tests/tr/tr-tests b/tests/tr/tr-tests
index 38a54455b..351bbd04a 100755
--- a/tests/tr/tr-tests
+++ b/tests/tr/tr-tests
@@ -12,15 +12,15 @@ test "$VERBOSE" && $xx --version 2> /dev/null
 $xx 'abcd' '[]*]' < $srcdir/t1.in > t1.out 2> t1.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 1 failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test 1 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t1.out $srcdir/t1.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 1; fi ;; # equal files
-    1) $echo Test 1 failed: files t1.out and $srcdir/t1.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 1"; fi ;;
+    1) $echo "Test 1 failed: files t1.out and $srcdir/t1.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 1 may have failed. 1>&2;
+    2) $echo "Test 1 may have failed." 1>&2;
        $echo The command "cmp t1.out $srcdir/t1.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -29,15 +29,15 @@ test -s t1.err || rm -f t1.err
 $xx 'abc' '[%*]xyz' < $srcdir/t2.in > t2.out 2> t2.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 2 failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test 2 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t2.out $srcdir/t2.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 2; fi ;; # equal files
-    1) $echo Test 2 failed: files t2.out and $srcdir/t2.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 2"; fi ;;
+    1) $echo "Test 2 failed: files t2.out and $srcdir/t2.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 2 may have failed. 1>&2;
+    2) $echo "Test 2 may have failed." 1>&2;
        $echo The command "cmp t2.out $srcdir/t2.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -46,15 +46,15 @@ test -s t2.err || rm -f t2.err
 $xx '' '[.*]' < $srcdir/t3.in > t3.out 2> t3.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3 failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test 3 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t3.out $srcdir/t3.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3; fi ;; # equal files
-    1) $echo Test 3 failed: files t3.out and $srcdir/t3.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3"; fi ;;
+    1) $echo "Test 3 failed: files t3.out and $srcdir/t3.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 3 may have failed. 1>&2;
+    2) $echo "Test 3 may have failed." 1>&2;
        $echo The command "cmp t3.out $srcdir/t3.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -63,15 +63,15 @@ test -s t3.err || rm -f t3.err
 $xx -t 'abcd' 'xy' < $srcdir/t4.in > t4.out 2> t4.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 4 failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test 4 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t4.out $srcdir/t4.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 4; fi ;; # equal files
-    1) $echo Test 4 failed: files t4.out and $srcdir/t4.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 4"; fi ;;
+    1) $echo "Test 4 failed: files t4.out and $srcdir/t4.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 4 may have failed. 1>&2;
+    2) $echo "Test 4 may have failed." 1>&2;
        $echo The command "cmp t4.out $srcdir/t4.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -80,15 +80,15 @@ test -s t4.err || rm -f t4.err
 $xx 'abcd' 'xy' < $srcdir/t5.in > t5.out 2> t5.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5 failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test 5 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t5.out $srcdir/t5.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5; fi ;; # equal files
-    1) $echo Test 5 failed: files t5.out and $srcdir/t5.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5"; fi ;;
+    1) $echo "Test 5 failed: files t5.out and $srcdir/t5.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 5 may have failed. 1>&2;
+    2) $echo "Test 5 may have failed." 1>&2;
        $echo The command "cmp t5.out $srcdir/t5.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -97,15 +97,15 @@ test -s t5.err || rm -f t5.err
 $xx 'abcd' 'x[y*]' < $srcdir/t6.in > t6.out 2> t6.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 6 failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test 6 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t6.out $srcdir/t6.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 6; fi ;; # equal files
-    1) $echo Test 6 failed: files t6.out and $srcdir/t6.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 6"; fi ;;
+    1) $echo "Test 6 failed: files t6.out and $srcdir/t6.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 6 may have failed. 1>&2;
+    2) $echo "Test 6 may have failed." 1>&2;
        $echo The command "cmp t6.out $srcdir/t6.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -114,15 +114,15 @@ test -s t6.err || rm -f t6.err
 $xx -s 'a-p' '%[.*]$' < $srcdir/t7.in > t7.out 2> t7.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 7 failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test 7 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t7.out $srcdir/t7.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 7; fi ;; # equal files
-    1) $echo Test 7 failed: files t7.out and $srcdir/t7.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 7"; fi ;;
+    1) $echo "Test 7 failed: files t7.out and $srcdir/t7.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 7 may have failed. 1>&2;
+    2) $echo "Test 7 may have failed." 1>&2;
        $echo The command "cmp t7.out $srcdir/t7.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -131,15 +131,15 @@ test -s t7.err || rm -f t7.err
 $xx -s 'a-p' '[.*]$' < $srcdir/t8.in > t8.out 2> t8.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 8 failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test 8 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t8.out $srcdir/t8.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 8; fi ;; # equal files
-    1) $echo Test 8 failed: files t8.out and $srcdir/t8.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 8"; fi ;;
+    1) $echo "Test 8 failed: files t8.out and $srcdir/t8.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 8 may have failed. 1>&2;
+    2) $echo "Test 8 may have failed." 1>&2;
        $echo The command "cmp t8.out $srcdir/t8.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -148,15 +148,15 @@ test -s t8.err || rm -f t8.err
 $xx -s 'a-p' '%[.*]' < $srcdir/t9.in > t9.out 2> t9.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 9 failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test 9 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t9.out $srcdir/t9.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 9; fi ;; # equal files
-    1) $echo Test 9 failed: files t9.out and $srcdir/t9.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9"; fi ;;
+    1) $echo "Test 9 failed: files t9.out and $srcdir/t9.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test 9 may have failed. 1>&2;
+    2) $echo "Test 9 may have failed." 1>&2;
        $echo The command "cmp t9.out $srcdir/t9.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -165,15 +165,15 @@ test -s t9.err || rm -f t9.err
 $xx -s '[a-z]' < $srcdir/ta.in > ta.out 2> ta.err
 code=$?
 if test $code != 0 ; then
-  $echo Test a failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test a failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ta.out $srcdir/ta.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed a; fi ;; # equal files
-    1) $echo Test a failed: files ta.out and $srcdir/ta.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed a"; fi ;;
+    1) $echo "Test a failed: files ta.out and $srcdir/ta.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test a may have failed. 1>&2;
+    2) $echo "Test a may have failed." 1>&2;
        $echo The command "cmp ta.out $srcdir/ta.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -182,15 +182,15 @@ test -s ta.err || rm -f ta.err
 $xx -s '[a-c]' < $srcdir/tb.in > tb.out 2> tb.err
 code=$?
 if test $code != 0 ; then
-  $echo Test b failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test b failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tb.out $srcdir/tb.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed b; fi ;; # equal files
-    1) $echo Test b failed: files tb.out and $srcdir/tb.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed b"; fi ;;
+    1) $echo "Test b failed: files tb.out and $srcdir/tb.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test b may have failed. 1>&2;
+    2) $echo "Test b may have failed." 1>&2;
        $echo The command "cmp tb.out $srcdir/tb.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -199,15 +199,15 @@ test -s tb.err || rm -f tb.err
 $xx -s '[a-b]' < $srcdir/tc.in > tc.out 2> tc.err
 code=$?
 if test $code != 0 ; then
-  $echo Test c failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test c failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tc.out $srcdir/tc.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed c; fi ;; # equal files
-    1) $echo Test c failed: files tc.out and $srcdir/tc.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed c"; fi ;;
+    1) $echo "Test c failed: files tc.out and $srcdir/tc.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test c may have failed. 1>&2;
+    2) $echo "Test c may have failed." 1>&2;
        $echo The command "cmp tc.out $srcdir/tc.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -216,15 +216,15 @@ test -s tc.err || rm -f tc.err
 $xx -s '[b-c]' < $srcdir/td.in > td.out 2> td.err
 code=$?
 if test $code != 0 ; then
-  $echo Test d failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test d failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp td.out $srcdir/td.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed d; fi ;; # equal files
-    1) $echo Test d failed: files td.out and $srcdir/td.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed d"; fi ;;
+    1) $echo "Test d failed: files td.out and $srcdir/td.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test d may have failed. 1>&2;
+    2) $echo "Test d may have failed." 1>&2;
        $echo The command "cmp td.out $srcdir/td.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -233,15 +233,15 @@ test -s td.err || rm -f td.err
 $xx -s '[\0-\5]' < $srcdir/te.in > te.out 2> te.err
 code=$?
 if test $code != 0 ; then
-  $echo Test e failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test e failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp te.out $srcdir/te.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed e; fi ;; # equal files
-    1) $echo Test e failed: files te.out and $srcdir/te.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed e"; fi ;;
+    1) $echo "Test e failed: files te.out and $srcdir/te.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test e may have failed. 1>&2;
+    2) $echo "Test e may have failed." 1>&2;
        $echo The command "cmp te.out $srcdir/te.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -250,15 +250,15 @@ test -s te.err || rm -f te.err
 $xx -d '[=[=]' < $srcdir/tf.in > tf.out 2> tf.err
 code=$?
 if test $code != 0 ; then
-  $echo Test f failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test f failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tf.out $srcdir/tf.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed f; fi ;; # equal files
-    1) $echo Test f failed: files tf.out and $srcdir/tf.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed f"; fi ;;
+    1) $echo "Test f failed: files tf.out and $srcdir/tf.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test f may have failed. 1>&2;
+    2) $echo "Test f may have failed." 1>&2;
        $echo The command "cmp tf.out $srcdir/tf.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -267,15 +267,15 @@ test -s tf.err || rm -f tf.err
 $xx -d '[=]=]' < $srcdir/tg.in > tg.out 2> tg.err
 code=$?
 if test $code != 0 ; then
-  $echo Test g failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test g failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tg.out $srcdir/tg.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed g; fi ;; # equal files
-    1) $echo Test g failed: files tg.out and $srcdir/tg.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed g"; fi ;;
+    1) $echo "Test g failed: files tg.out and $srcdir/tg.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test g may have failed. 1>&2;
+    2) $echo "Test g may have failed." 1>&2;
        $echo The command "cmp tg.out $srcdir/tg.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -284,15 +284,15 @@ test -s tg.err || rm -f tg.err
 $xx -d '[:xdigit:]' < $srcdir/th.in > th.out 2> th.err
 code=$?
 if test $code != 0 ; then
-  $echo Test h failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test h failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp th.out $srcdir/th.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed h; fi ;; # equal files
-    1) $echo Test h failed: files th.out and $srcdir/th.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed h"; fi ;;
+    1) $echo "Test h failed: files th.out and $srcdir/th.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test h may have failed. 1>&2;
+    2) $echo "Test h may have failed." 1>&2;
        $echo The command "cmp th.out $srcdir/th.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -301,15 +301,15 @@ test -s th.err || rm -f th.err
 $xx -d '[:xdigit:]' < $srcdir/ti.in > ti.out 2> ti.err
 code=$?
 if test $code != 0 ; then
-  $echo Test i failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test i failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ti.out $srcdir/ti.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed i; fi ;; # equal files
-    1) $echo Test i failed: files ti.out and $srcdir/ti.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed i"; fi ;;
+    1) $echo "Test i failed: files ti.out and $srcdir/ti.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test i may have failed. 1>&2;
+    2) $echo "Test i may have failed." 1>&2;
        $echo The command "cmp ti.out $srcdir/ti.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -318,15 +318,15 @@ test -s ti.err || rm -f ti.err
 $xx -d '[:digit:]' < $srcdir/tj.in > tj.out 2> tj.err
 code=$?
 if test $code != 0 ; then
-  $echo Test j failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test j failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tj.out $srcdir/tj.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed j; fi ;; # equal files
-    1) $echo Test j failed: files tj.out and $srcdir/tj.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed j"; fi ;;
+    1) $echo "Test j failed: files tj.out and $srcdir/tj.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test j may have failed. 1>&2;
+    2) $echo "Test j may have failed." 1>&2;
        $echo The command "cmp tj.out $srcdir/tj.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -335,15 +335,15 @@ test -s tj.err || rm -f tj.err
 $xx -d '[:digit:]' < $srcdir/tk.in > tk.out 2> tk.err
 code=$?
 if test $code != 0 ; then
-  $echo Test k failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test k failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tk.out $srcdir/tk.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed k; fi ;; # equal files
-    1) $echo Test k failed: files tk.out and $srcdir/tk.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed k"; fi ;;
+    1) $echo "Test k failed: files tk.out and $srcdir/tk.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test k may have failed. 1>&2;
+    2) $echo "Test k may have failed." 1>&2;
        $echo The command "cmp tk.out $srcdir/tk.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -352,15 +352,15 @@ test -s tk.err || rm -f tk.err
 $xx -d '[:lower:]' < $srcdir/tl.in > tl.out 2> tl.err
 code=$?
 if test $code != 0 ; then
-  $echo Test l failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test l failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tl.out $srcdir/tl.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed l; fi ;; # equal files
-    1) $echo Test l failed: files tl.out and $srcdir/tl.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed l"; fi ;;
+    1) $echo "Test l failed: files tl.out and $srcdir/tl.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test l may have failed. 1>&2;
+    2) $echo "Test l may have failed." 1>&2;
        $echo The command "cmp tl.out $srcdir/tl.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -369,15 +369,15 @@ test -s tl.err || rm -f tl.err
 $xx -d '[:upper:]' < $srcdir/tm.in > tm.out 2> tm.err
 code=$?
 if test $code != 0 ; then
-  $echo Test m failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test m failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tm.out $srcdir/tm.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed m; fi ;; # equal files
-    1) $echo Test m failed: files tm.out and $srcdir/tm.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed m"; fi ;;
+    1) $echo "Test m failed: files tm.out and $srcdir/tm.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test m may have failed. 1>&2;
+    2) $echo "Test m may have failed." 1>&2;
        $echo The command "cmp tm.out $srcdir/tm.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -386,15 +386,15 @@ test -s tm.err || rm -f tm.err
 $xx -d '[:lower:][:upper:]' < $srcdir/tn.in > tn.out 2> tn.err
 code=$?
 if test $code != 0 ; then
-  $echo Test n failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test n failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tn.out $srcdir/tn.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed n; fi ;; # equal files
-    1) $echo Test n failed: files tn.out and $srcdir/tn.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed n"; fi ;;
+    1) $echo "Test n failed: files tn.out and $srcdir/tn.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test n may have failed. 1>&2;
+    2) $echo "Test n may have failed." 1>&2;
        $echo The command "cmp tn.out $srcdir/tn.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -403,15 +403,15 @@ test -s tn.err || rm -f tn.err
 $xx -d '[:alpha:]' < $srcdir/to.in > to.out 2> to.err
 code=$?
 if test $code != 0 ; then
-  $echo Test o failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test o failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp to.out $srcdir/to.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed o; fi ;; # equal files
-    1) $echo Test o failed: files to.out and $srcdir/to.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed o"; fi ;;
+    1) $echo "Test o failed: files to.out and $srcdir/to.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test o may have failed. 1>&2;
+    2) $echo "Test o may have failed." 1>&2;
        $echo The command "cmp to.out $srcdir/to.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -420,15 +420,15 @@ test -s to.err || rm -f to.err
 $xx -d '[:alnum:]' < $srcdir/tp.in > tp.out 2> tp.err
 code=$?
 if test $code != 0 ; then
-  $echo Test p failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test p failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tp.out $srcdir/tp.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed p; fi ;; # equal files
-    1) $echo Test p failed: files tp.out and $srcdir/tp.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed p"; fi ;;
+    1) $echo "Test p failed: files tp.out and $srcdir/tp.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test p may have failed. 1>&2;
+    2) $echo "Test p may have failed." 1>&2;
        $echo The command "cmp tp.out $srcdir/tp.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -437,15 +437,15 @@ test -s tp.err || rm -f tp.err
 $xx -d '[:alnum:]' < $srcdir/tq.in > tq.out 2> tq.err
 code=$?
 if test $code != 0 ; then
-  $echo Test q failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test q failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tq.out $srcdir/tq.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed q; fi ;; # equal files
-    1) $echo Test q failed: files tq.out and $srcdir/tq.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed q"; fi ;;
+    1) $echo "Test q failed: files tq.out and $srcdir/tq.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test q may have failed. 1>&2;
+    2) $echo "Test q may have failed." 1>&2;
        $echo The command "cmp tq.out $srcdir/tq.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -454,15 +454,15 @@ test -s tq.err || rm -f tq.err
 $xx -ds '[:alnum:]' '.' < $srcdir/tr.in > tr.out 2> tr.err
 code=$?
 if test $code != 0 ; then
-  $echo Test r failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test r failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tr.out $srcdir/tr.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed r; fi ;; # equal files
-    1) $echo Test r failed: files tr.out and $srcdir/tr.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed r"; fi ;;
+    1) $echo "Test r failed: files tr.out and $srcdir/tr.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test r may have failed. 1>&2;
+    2) $echo "Test r may have failed." 1>&2;
        $echo The command "cmp tr.out $srcdir/tr.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -471,15 +471,15 @@ test -s tr.err || rm -f tr.err
 $xx -cs '[:alnum:]' '\n' < $srcdir/ts.in > ts.out 2> ts.err
 code=$?
 if test $code != 0 ; then
-  $echo Test s failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test s failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ts.out $srcdir/ts.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed s; fi ;; # equal files
-    1) $echo Test s failed: files ts.out and $srcdir/ts.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed s"; fi ;;
+    1) $echo "Test s failed: files ts.out and $srcdir/ts.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test s may have failed. 1>&2;
+    2) $echo "Test s may have failed." 1>&2;
        $echo The command "cmp ts.out $srcdir/ts.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -488,15 +488,15 @@ test -s ts.err || rm -f ts.err
 $xx -cs '[:alnum:]' '[\n*]' < $srcdir/tt.in > tt.out 2> tt.err
 code=$?
 if test $code != 0 ; then
-  $echo Test t failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test t failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tt.out $srcdir/tt.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed t; fi ;; # equal files
-    1) $echo Test t failed: files tt.out and $srcdir/tt.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed t"; fi ;;
+    1) $echo "Test t failed: files tt.out and $srcdir/tt.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test t may have failed. 1>&2;
+    2) $echo "Test t may have failed." 1>&2;
        $echo The command "cmp tt.out $srcdir/tt.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -505,15 +505,15 @@ test -s tt.err || rm -f tt.err
 $xx -ds 'b' 'a' < $srcdir/tu.in > tu.out 2> tu.err
 code=$?
 if test $code != 0 ; then
-  $echo Test u failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test u failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tu.out $srcdir/tu.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed u; fi ;; # equal files
-    1) $echo Test u failed: files tu.out and $srcdir/tu.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed u"; fi ;;
+    1) $echo "Test u failed: files tu.out and $srcdir/tu.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test u may have failed. 1>&2;
+    2) $echo "Test u may have failed." 1>&2;
        $echo The command "cmp tu.out $srcdir/tu.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -522,15 +522,15 @@ test -s tu.err || rm -f tu.err
 $xx -ds '[:xdigit:]' 'Z' < $srcdir/tv.in > tv.out 2> tv.err
 code=$?
 if test $code != 0 ; then
-  $echo Test v failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test v failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tv.out $srcdir/tv.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed v; fi ;; # equal files
-    1) $echo Test v failed: files tv.out and $srcdir/tv.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed v"; fi ;;
+    1) $echo "Test v failed: files tv.out and $srcdir/tv.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test v may have failed. 1>&2;
+    2) $echo "Test v may have failed." 1>&2;
        $echo The command "cmp tv.out $srcdir/tv.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -539,15 +539,15 @@ test -s tv.err || rm -f tv.err
 $xx -ds '\350' '\345' < $srcdir/tw.in > tw.out 2> tw.err
 code=$?
 if test $code != 0 ; then
-  $echo Test w failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test w failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tw.out $srcdir/tw.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed w; fi ;; # equal files
-    1) $echo Test w failed: files tw.out and $srcdir/tw.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed w"; fi ;;
+    1) $echo "Test w failed: files tw.out and $srcdir/tw.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test w may have failed. 1>&2;
+    2) $echo "Test w may have failed." 1>&2;
        $echo The command "cmp tw.out $srcdir/tw.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -556,15 +556,15 @@ test -s tw.err || rm -f tw.err
 $xx -s 'abcdefghijklmn' '[:*016]' < $srcdir/tx.in > tx.out 2> tx.err
 code=$?
 if test $code != 0 ; then
-  $echo Test x failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test x failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tx.out $srcdir/tx.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed x; fi ;; # equal files
-    1) $echo Test x failed: files tx.out and $srcdir/tx.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed x"; fi ;;
+    1) $echo "Test x failed: files tx.out and $srcdir/tx.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test x may have failed. 1>&2;
+    2) $echo "Test x may have failed." 1>&2;
        $echo The command "cmp tx.out $srcdir/tx.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -573,15 +573,15 @@ test -s tx.err || rm -f tx.err
 $xx -d 'a-z' < $srcdir/ty.in > ty.out 2> ty.err
 code=$?
 if test $code != 0 ; then
-  $echo Test y failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test y failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ty.out $srcdir/ty.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed y; fi ;; # equal files
-    1) $echo Test y failed: files ty.out and $srcdir/ty.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed y"; fi ;;
+    1) $echo "Test y failed: files ty.out and $srcdir/ty.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test y may have failed. 1>&2;
+    2) $echo "Test y may have failed." 1>&2;
        $echo The command "cmp ty.out $srcdir/ty.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -590,15 +590,15 @@ test -s ty.err || rm -f ty.err
 $xx -ds 'a-z' '$.' < $srcdir/tz.in > tz.out 2> tz.err
 code=$?
 if test $code != 0 ; then
-  $echo Test z failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test z failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tz.out $srcdir/tz.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed z; fi ;; # equal files
-    1) $echo Test z failed: files tz.out and $srcdir/tz.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed z"; fi ;;
+    1) $echo "Test z failed: files tz.out and $srcdir/tz.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test z may have failed. 1>&2;
+    2) $echo "Test z may have failed." 1>&2;
        $echo The command "cmp tz.out $srcdir/tz.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -607,15 +607,15 @@ test -s tz.err || rm -f tz.err
 $xx 'a-a' 'z' < $srcdir/trange-a-a.in > trange-a-a.out 2> trange-a-a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test range-a-a failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test range-a-a failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp trange-a-a.out $srcdir/trange-a-a.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed range-a-a; fi ;; # equal files
-    1) $echo Test range-a-a failed: files trange-a-a.out and $srcdir/trange-a-a.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed range-a-a"; fi ;;
+    1) $echo "Test range-a-a failed: files trange-a-a.out and $srcdir/trange-a-a.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test range-a-a may have failed. 1>&2;
+    2) $echo "Test range-a-a may have failed." 1>&2;
        $echo The command "cmp trange-a-a.out $srcdir/trange-a-a.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -624,15 +624,15 @@ test -s trange-a-a.err || rm -f trange-a-a.err
 $xx 'a' '''' < $srcdir/tnull.in > tnull.out 2> tnull.err
 code=$?
 if test $code != 1 ; then
-  $echo Test null failed: ../../src/tr return code $code differs from expected value 1 1>&2
+  $echo "Test null failed: ../../src/tr return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tnull.out $srcdir/tnull.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed null; fi ;; # equal files
-    1) $echo Test null failed: files tnull.out and $srcdir/tnull.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed null"; fi ;;
+    1) $echo "Test null failed: files tnull.out and $srcdir/tnull.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test null may have failed. 1>&2;
+    2) $echo "Test null may have failed." 1>&2;
        $echo The command "cmp tnull.out $srcdir/tnull.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -641,15 +641,15 @@ test -s tnull.err || rm -f tnull.err
 $xx '[:lower:]' '[:upper:]' < $srcdir/tupcase.in > tupcase.out 2> tupcase.err
 code=$?
 if test $code != 0 ; then
-  $echo Test upcase failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test upcase failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tupcase.out $srcdir/tupcase.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed upcase; fi ;; # equal files
-    1) $echo Test upcase failed: files tupcase.out and $srcdir/tupcase.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed upcase"; fi ;;
+    1) $echo "Test upcase failed: files tupcase.out and $srcdir/tupcase.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test upcase may have failed. 1>&2;
+    2) $echo "Test upcase may have failed." 1>&2;
        $echo The command "cmp tupcase.out $srcdir/tupcase.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -658,15 +658,15 @@ test -s tupcase.err || rm -f tupcase.err
 $xx '[:upper:]' '[:lower:]' < $srcdir/tdncase.in > tdncase.out 2> tdncase.err
 code=$?
 if test $code != 0 ; then
-  $echo Test dncase failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test dncase failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tdncase.out $srcdir/tdncase.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed dncase; fi ;; # equal files
-    1) $echo Test dncase failed: files tdncase.out and $srcdir/tdncase.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed dncase"; fi ;;
+    1) $echo "Test dncase failed: files tdncase.out and $srcdir/tdncase.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test dncase may have failed. 1>&2;
+    2) $echo "Test dncase may have failed." 1>&2;
        $echo The command "cmp tdncase.out $srcdir/tdncase.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -675,15 +675,15 @@ test -s tdncase.err || rm -f tdncase.err
 $xx 'a[=*2][=c=]' 'xyyz' < $srcdir/trep-cclass.in > trep-cclass.out 2> trep-cclass.err
 code=$?
 if test $code != 0 ; then
-  $echo Test rep-cclass failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test rep-cclass failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp trep-cclass.out $srcdir/trep-cclass.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed rep-cclass; fi ;; # equal files
-    1) $echo Test rep-cclass failed: files trep-cclass.out and $srcdir/trep-cclass.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed rep-cclass"; fi ;;
+    1) $echo "Test rep-cclass failed: files trep-cclass.out and $srcdir/trep-cclass.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test rep-cclass may have failed. 1>&2;
+    2) $echo "Test rep-cclass may have failed." 1>&2;
        $echo The command "cmp trep-cclass.out $srcdir/trep-cclass.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -692,15 +692,15 @@ test -s trep-cclass.err || rm -f trep-cclass.err
 $xx '[:*3][:digit:]' 'a-m' < $srcdir/trep-1.in > trep-1.out 2> trep-1.err
 code=$?
 if test $code != 0 ; then
-  $echo Test rep-1 failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test rep-1 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp trep-1.out $srcdir/trep-1.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed rep-1; fi ;; # equal files
-    1) $echo Test rep-1 failed: files trep-1.out and $srcdir/trep-1.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed rep-1"; fi ;;
+    1) $echo "Test rep-1 failed: files trep-1.out and $srcdir/trep-1.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test rep-1 may have failed. 1>&2;
+    2) $echo "Test rep-1 may have failed." 1>&2;
        $echo The command "cmp trep-1.out $srcdir/trep-1.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -709,15 +709,15 @@ test -s trep-1.err || rm -f trep-1.err
 $xx 'a[b*512]c' '1[x*]2' < $srcdir/trep-2.in > trep-2.out 2> trep-2.err
 code=$?
 if test $code != 0 ; then
-  $echo Test rep-2 failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test rep-2 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp trep-2.out $srcdir/trep-2.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed rep-2; fi ;; # equal files
-    1) $echo Test rep-2 failed: files trep-2.out and $srcdir/trep-2.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed rep-2"; fi ;;
+    1) $echo "Test rep-2 failed: files trep-2.out and $srcdir/trep-2.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test rep-2 may have failed. 1>&2;
+    2) $echo "Test rep-2 may have failed." 1>&2;
        $echo The command "cmp trep-2.out $srcdir/trep-2.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -726,15 +726,15 @@ test -s trep-2.err || rm -f trep-2.err
 $xx 'a[b*513]c' '1[x*]2' < $srcdir/trep-3.in > trep-3.out 2> trep-3.err
 code=$?
 if test $code != 0 ; then
-  $echo Test rep-3 failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test rep-3 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp trep-3.out $srcdir/trep-3.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed rep-3; fi ;; # equal files
-    1) $echo Test rep-3 failed: files trep-3.out and $srcdir/trep-3.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed rep-3"; fi ;;
+    1) $echo "Test rep-3 failed: files trep-3.out and $srcdir/trep-3.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test rep-3 may have failed. 1>&2;
+    2) $echo "Test rep-3 may have failed." 1>&2;
        $echo The command "cmp trep-3.out $srcdir/trep-3.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -743,15 +743,15 @@ test -s trep-3.err || rm -f trep-3.err
 $xx 'a\-z' 'A-Z' < $srcdir/tesc.in > tesc.out 2> tesc.err
 code=$?
 if test $code != 0 ; then
-  $echo Test esc failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test esc failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tesc.out $srcdir/tesc.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed esc; fi ;; # equal files
-    1) $echo Test esc failed: files tesc.out and $srcdir/tesc.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed esc"; fi ;;
+    1) $echo "Test esc failed: files tesc.out and $srcdir/tesc.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test esc may have failed. 1>&2;
+    2) $echo "Test esc may have failed." 1>&2;
        $echo The command "cmp tesc.out $srcdir/tesc.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -760,15 +760,15 @@ test -s tesc.err || rm -f tesc.err
 $xx -cs '[:upper:]' 'X[Y*]' < $srcdir/tross-0a.in > tross-0a.out 2> tross-0a.err
 code=$?
 if test $code != 1 ; then
-  $echo Test ross-0a failed: ../../src/tr return code $code differs from expected value 1 1>&2
+  $echo "Test ross-0a failed: ../../src/tr return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tross-0a.out $srcdir/tross-0a.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed ross-0a; fi ;; # equal files
-    1) $echo Test ross-0a failed: files tross-0a.out and $srcdir/tross-0a.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed ross-0a"; fi ;;
+    1) $echo "Test ross-0a failed: files tross-0a.out and $srcdir/tross-0a.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test ross-0a may have failed. 1>&2;
+    2) $echo "Test ross-0a may have failed." 1>&2;
        $echo The command "cmp tross-0a.out $srcdir/tross-0a.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -777,15 +777,15 @@ test -s tross-0a.err || rm -f tross-0a.err
 $xx -cs '[:cntrl:]' 'X[Y*]' < $srcdir/tross-0b.in > tross-0b.out 2> tross-0b.err
 code=$?
 if test $code != 1 ; then
-  $echo Test ross-0b failed: ../../src/tr return code $code differs from expected value 1 1>&2
+  $echo "Test ross-0b failed: ../../src/tr return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tross-0b.out $srcdir/tross-0b.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed ross-0b; fi ;; # equal files
-    1) $echo Test ross-0b failed: files tross-0b.out and $srcdir/tross-0b.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed ross-0b"; fi ;;
+    1) $echo "Test ross-0b failed: files tross-0b.out and $srcdir/tross-0b.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test ross-0b may have failed. 1>&2;
+    2) $echo "Test ross-0b may have failed." 1>&2;
        $echo The command "cmp tross-0b.out $srcdir/tross-0b.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -794,15 +794,15 @@ test -s tross-0b.err || rm -f tross-0b.err
 $xx -cs '[:upper:]' '[X*]' < $srcdir/tross-1a.in > tross-1a.out 2> tross-1a.err
 code=$?
 if test $code != 0 ; then
-  $echo Test ross-1a failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test ross-1a failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tross-1a.out $srcdir/tross-1a.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed ross-1a; fi ;; # equal files
-    1) $echo Test ross-1a failed: files tross-1a.out and $srcdir/tross-1a.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed ross-1a"; fi ;;
+    1) $echo "Test ross-1a failed: files tross-1a.out and $srcdir/tross-1a.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test ross-1a may have failed. 1>&2;
+    2) $echo "Test ross-1a may have failed." 1>&2;
        $echo The command "cmp tross-1a.out $srcdir/tross-1a.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -811,15 +811,15 @@ test -s tross-1a.err || rm -f tross-1a.err
 $xx -cs '[:upper:][:digit:]' '[Z*]' < $srcdir/tross-1b.in > tross-1b.out 2> tross-1b.err
 code=$?
 if test $code != 0 ; then
-  $echo Test ross-1b failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test ross-1b failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tross-1b.out $srcdir/tross-1b.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed ross-1b; fi ;; # equal files
-    1) $echo Test ross-1b failed: files tross-1b.out and $srcdir/tross-1b.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed ross-1b"; fi ;;
+    1) $echo "Test ross-1b failed: files tross-1b.out and $srcdir/tross-1b.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test ross-1b may have failed. 1>&2;
+    2) $echo "Test ross-1b may have failed." 1>&2;
        $echo The command "cmp tross-1b.out $srcdir/tross-1b.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -828,15 +828,15 @@ test -s tross-1b.err || rm -f tross-1b.err
 $xx -dcs '[:lower:]' 'n-rs-z' < $srcdir/tross-2.in > tross-2.out 2> tross-2.err
 code=$?
 if test $code != 0 ; then
-  $echo Test ross-2 failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test ross-2 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tross-2.out $srcdir/tross-2.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed ross-2; fi ;; # equal files
-    1) $echo Test ross-2 failed: files tross-2.out and $srcdir/tross-2.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed ross-2"; fi ;;
+    1) $echo "Test ross-2 failed: files tross-2.out and $srcdir/tross-2.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test ross-2 may have failed. 1>&2;
+    2) $echo "Test ross-2 may have failed." 1>&2;
        $echo The command "cmp tross-2.out $srcdir/tross-2.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -845,15 +845,15 @@ test -s tross-2.err || rm -f tross-2.err
 $xx -ds '[:xdigit:]' '[:alnum:]' < $srcdir/tross-3.in > tross-3.out 2> tross-3.err
 code=$?
 if test $code != 0 ; then
-  $echo Test ross-3 failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test ross-3 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tross-3.out $srcdir/tross-3.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed ross-3; fi ;; # equal files
-    1) $echo Test ross-3 failed: files tross-3.out and $srcdir/tross-3.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed ross-3"; fi ;;
+    1) $echo "Test ross-3 failed: files tross-3.out and $srcdir/tross-3.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test ross-3 may have failed. 1>&2;
+    2) $echo "Test ross-3 may have failed." 1>&2;
        $echo The command "cmp tross-3.out $srcdir/tross-3.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -862,15 +862,15 @@ test -s tross-3.err || rm -f tross-3.err
 $xx -dcs '[:alnum:]' '[:digit:]' < $srcdir/tross-4.in > tross-4.out 2> tross-4.err
 code=$?
 if test $code != 0 ; then
-  $echo Test ross-4 failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test ross-4 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tross-4.out $srcdir/tross-4.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed ross-4; fi ;; # equal files
-    1) $echo Test ross-4 failed: files tross-4.out and $srcdir/tross-4.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed ross-4"; fi ;;
+    1) $echo "Test ross-4 failed: files tross-4.out and $srcdir/tross-4.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test ross-4 may have failed. 1>&2;
+    2) $echo "Test ross-4 may have failed." 1>&2;
        $echo The command "cmp tross-4.out $srcdir/tross-4.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -879,15 +879,15 @@ test -s tross-4.err || rm -f tross-4.err
 $xx -dc '[:lower:]' < $srcdir/tross-5.in > tross-5.out 2> tross-5.err
 code=$?
 if test $code != 0 ; then
-  $echo Test ross-5 failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test ross-5 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tross-5.out $srcdir/tross-5.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed ross-5; fi ;; # equal files
-    1) $echo Test ross-5 failed: files tross-5.out and $srcdir/tross-5.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed ross-5"; fi ;;
+    1) $echo "Test ross-5 failed: files tross-5.out and $srcdir/tross-5.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test ross-5 may have failed. 1>&2;
+    2) $echo "Test ross-5 may have failed." 1>&2;
        $echo The command "cmp tross-5.out $srcdir/tross-5.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -896,15 +896,15 @@ test -s tross-5.err || rm -f tross-5.err
 $xx -dc '[:upper:]' < $srcdir/tross-6.in > tross-6.out 2> tross-6.err
 code=$?
 if test $code != 0 ; then
-  $echo Test ross-6 failed: ../../src/tr return code $code differs from expected value 0 1>&2
+  $echo "Test ross-6 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp tross-6.out $srcdir/tross-6.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed ross-6; fi ;; # equal files
-    1) $echo Test ross-6 failed: files tross-6.out and $srcdir/tross-6.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed ross-6"; fi ;;
+    1) $echo "Test ross-6 failed: files tross-6.out and $srcdir/tross-6.exp differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo Test ross-6 may have failed. 1>&2;
+    2) $echo "Test ross-6 may have failed." 1>&2;
        $echo The command "cmp tross-6.out $srcdir/tross-6.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac