7 files changed, 193 insertions, 147 deletions
diff --git a/testsuite/check.sh b/testsuite/check.sh
index 638d6db..30b2edb 100755
--- a/testsuite/check.sh
+++ b/testsuite/check.sh
@@ -32,7 +32,6 @@ cd "${objdir}"/tmp || framework_failure
 cp "${testdir}"/test.txt in || framework_failure
 in_lz="${testdir}"/test.txt.lz
 in_lzma="${testdir}"/test.txt.lzma
-in_em="${testdir}"/test_em.txt.lz
 inD="${testdir}"/test21636.txt
 bad1_lz="${testdir}"/test_bad1.lz
 bad2_lz="${testdir}"/test_bad2.lz
@@ -44,8 +43,9 @@ bad7_lz="${testdir}"/test_bad7.lz
 bad8_lz="${testdir}"/test_bad8.lz
 bad9_lz="${testdir}"/test_bad9.lz
 fox_lz="${testdir}"/fox.lz
-fox6_lz="${testdir}"/fox6.lz
+fnz_lz="${testdir}"/fox_nz.lz
 f6b1="${testdir}"/fox6_bad1.txt
+f6b1nz_lz="${testdir}"/fox6_b1nz.lz
 f6b1_lz="${testdir}"/fox6_bad1.lz
 f6b2_lz="${testdir}"/fox6_bad2.lz
 f6b3_lz="${testdir}"/fox6_bad3.lz
@@ -58,7 +58,6 @@ f6s3_lz="${testdir}"/fox6_sc3.lz
 f6s4_lz="${testdir}"/fox6_sc4.lz
 f6s5_lz="${testdir}"/fox6_sc5.lz
 f6s6_lz="${testdir}"/fox6_sc6.lz
-f6nz_lz="${testdir}"/fox6_nz.lz
 num_lz="${testdir}"/numbers.lz
 nbt_lz="${testdir}"/numbersbt.lz
 fail=0
@@ -76,10 +75,8 @@ test_failed() { fail=1 ; printf " $1" ; [ -z "$2" ] || printf "($2)" ; }
 # test_bad8.lz: [  66-  73] --> zeroed  (reference test.txt [   89-  110])
 # test_bad9.lz: [6491-6498] --> zeroed  (reference test.txt [17982-18594])
 #
-# test_em.txt.lz: test.txt split in 3, with 5 empty members (1,3,5-6,8)
-# test_3m.txt.lz.md5: md5sum of test_em.txt.lz after removing empty members
-#
 # 6-member files; fox6.lz with one or more errors
+# fox6_b1nz.lz: fox6_bad1.lz with first LZMA byte set to 'a'..'f'
 # fox6_bad1.lz: byte at offset   5 changed from 0x0C to 0x00 (DS)
 #               byte at offset 142 changed from 0x50 to 0x70 (CRC)
 #               byte at offset 224 changed from 0x2D to 0x2E (data_size)
@@ -92,8 +89,6 @@ test_failed() { fail=1 ; printf " $1" ; [ -z "$2" ] || printf "($2)" ; }
 # fox6_bad5.lz: [380-479] --> zeroed  (members 5,6)
 # fox6_bad6.lz: [430-439] --> zeroed  (member 6)
 #
-# fox6_nz.lz: first LZMA byte of 4 last members set to 'a', 'b', 'c', 'd'
-#
 # 6-member files "shortcircuited" by a corrupt or fake trailer
 # fox6_sc1.lz: (corrupt but consistent last trailer)
 #              last CRC != 0 ; dsize = 4 * msize ; msize = 480 (file size)
@@ -114,7 +109,8 @@ printf "testing lziprecover-%s..." "$2"
 "${LZIPRECOVER}" -q --nrep-stats=0N "${in_lz}"
 [ $? = 1 ] || test_failed $LINENO
 for i in 0 255 0kB 0KiB 0M 0G 0T 0P 0E 0Z 0Y 0R 0Q ; do
-	"${LZIPRECOVER}" -q --nrep-stats=$i "${in_lz}" || test_failed $LINENO $i
+	"${LZIPRECOVER}" --nrep-stats=$i "${in_lz}" > /dev/null ||
+	  test_failed $LINENO $i
 done
 "${LZIP}" -lq in
 [ $? = 2 ] || test_failed $LINENO
@@ -249,6 +245,7 @@ cp "${in_lzma}" out.lzma || framework_failure
 cmp "${in_lz}" out.lz || test_failed $LINENO
 printf "to be overwritten" > out.lz || framework_failure
 "${LZIPRECOVER}" -Af out.lzma || test_failed $LINENO
+[ ! -e out.lzma ] || test_failed $LINENO
 cmp "${in_lz}" out.lz || test_failed $LINENO
 rm -f out.lz || framework_failure
 cp "${in_lzma}" out.tlz || framework_failure
@@ -261,39 +258,26 @@ rm -f out.tar.lz || framework_failure
 cat in in > in2 || framework_failure
 "${LZIPRECOVER}" -A -o out2.lz - "${in_lzma}" - < "${in_lzma}" ||
 	test_failed $LINENO
-"${LZIP}" -cd out2.lz > out2 || test_failed $LINENO
+"${LZIP}" -d out2.lz || test_failed $LINENO
 cmp in2 out2 || test_failed $LINENO
-rm -f out2.lz out2 || framework_failure
+rm -f out2 || framework_failure
 "${LZIPRECOVER}" -A "${in_lzma}" -o a/b/c/out.lz || test_failed $LINENO
 cmp "${in_lz}" a/b/c/out.lz || test_failed $LINENO
 rm -rf a || framework_failure
 
 printf "\ntesting decompression..."
 
-for i in "${in_lz}" "${in_em}" ; do
-	"${LZIP}" -lq "$i" --ignore-empty || test_failed $LINENO "$i"
-	"${LZIP}" -t "$i" --ignore-empty || test_failed $LINENO "$i"
-	"${LZIP}" -d "$i" --ignore-empty -o out || test_failed $LINENO "$i"
-	cmp in out || test_failed $LINENO "$i"
-	"${LZIP}" -cd "$i" --ignore-empty > out || test_failed $LINENO "$i"
-	cmp in out || test_failed $LINENO "$i"
-	"${LZIP}" -d "$i" --ignore-empty -o - > out || test_failed $LINENO "$i"
-	cmp in out || test_failed $LINENO "$i"
-	"${LZIP}" -d < "$i" --ignore-empty > out || test_failed $LINENO "$i"
-	cmp in out || test_failed $LINENO "$i"
-	rm -f out || framework_failure
-done
-
-lines=`"${LZIP}" -tvv "${in_em}" --ignore-empty 2>&1 | wc -l` ||
-	test_failed $LINENO
-[ "${lines}" -eq 8 ] || test_failed $LINENO "${lines}"
-"${LZIP}" -tq "${in_em}"
-[ $? = 2 ] || test_failed $LINENO
-
-lines=`"${LZIP}" -lvv "${in_em}" --ignore-empty | wc -l` || test_failed $LINENO
-[ "${lines}" -eq 11 ] || test_failed $LINENO "${lines}"
-"${LZIP}" -lq "${in_em}"
-[ $? = 2 ] || test_failed $LINENO
+"${LZIP}" -l "${in_lz}" > /dev/null || test_failed $LINENO
+"${LZIP}" -t "${in_lz}" || test_failed $LINENO
+"${LZIP}" -d "${in_lz}" -o out || test_failed $LINENO
+cmp in out || test_failed $LINENO
+"${LZIP}" -cd "${in_lz}" > out || test_failed $LINENO
+cmp in out || test_failed $LINENO
+"${LZIP}" -d "${in_lz}" -o - > out || test_failed $LINENO
+cmp in out || test_failed $LINENO
+"${LZIP}" -d < "${in_lz}" > out || test_failed $LINENO
+cmp in out || test_failed $LINENO
+rm -f out || framework_failure
 
 cp "${in_lz}" out.lz || framework_failure
 "${LZIP}" -dk out.lz || test_failed $LINENO
@@ -315,7 +299,6 @@ rm -f copy out || framework_failure
 printf "to be overwritten" > out || framework_failure
 "${LZIP}" -df -o out < "${in_lz}" || test_failed $LINENO
 cmp in out || test_failed $LINENO
-rm -f out || framework_failure
 "${LZIP}" -d -o ./- "${in_lz}" || test_failed $LINENO
 cmp in ./- || test_failed $LINENO
 rm -f ./- || framework_failure
@@ -328,7 +311,7 @@ cp "${in_lz}" anyothername || framework_failure
 	test_failed $LINENO
 cmp in out || test_failed $LINENO
 cmp in anyothername.out || test_failed $LINENO
-rm -f out anyothername.out || framework_failure
+rm -f anyothername.out || framework_failure
 
 "${LZIP}" -lq in "${in_lz}"
 [ $? = 2 ] || test_failed $LINENO
@@ -365,7 +348,7 @@ done
 cmp in out || test_failed $LINENO
 rm -f out || framework_failure
 
-"${LZIP}" -lq "${in_lz}" "${in_lz}" || test_failed $LINENO
+"${LZIP}" -l "${in_lz}" "${in_lz}" > /dev/null || test_failed $LINENO
 "${LZIP}" -t "${in_lz}" "${in_lz}" || test_failed $LINENO
 "${LZIP}" -cd "${in_lz}" "${in_lz}" -o out > out2 || test_failed $LINENO
 [ ! -e out ] || test_failed $LINENO			# override -o
@@ -376,10 +359,13 @@ cmp in2 out2 || test_failed $LINENO
 rm -f out2 || framework_failure
 
 cat "${in_lz}" "${in_lz}" > out2.lz || framework_failure
+lines=`"${LZIP}" -tvv out2.lz 2>&1 | wc -l` || test_failed $LINENO
+[ "${lines}" -eq 2 ] || test_failed $LINENO "${lines}"
+lines=`"${LZIP}" -lvv out2.lz | wc -l` || test_failed $LINENO
+[ "${lines}" -eq 5 ] || test_failed $LINENO "${lines}"
+
 printf "\ngarbage" >> out2.lz || framework_failure
 "${LZIP}" -tvvvv out2.lz 2> /dev/null || test_failed $LINENO
-"${LZIPRECOVER}" -aD0 -q out2.lz
-[ $? = 2 ] || test_failed $LINENO
 "${LZIP}" -alq out2.lz
 [ $? = 2 ] || test_failed $LINENO
 "${LZIP}" -atq out2.lz
@@ -392,6 +378,8 @@ printf "\ngarbage" >> out2.lz || framework_failure
 "${LZIP}" -adkq -o out2 < out2.lz
 [ $? = 2 ] || test_failed $LINENO
 [ ! -e out2 ] || test_failed $LINENO
+"${LZIPRECOVER}" -aD0 -q out2.lz
+[ $? = 2 ] || test_failed $LINENO
 printf "to be overwritten" > out2 || framework_failure
 "${LZIP}" -df out2.lz || test_failed $LINENO
 cmp in2 out2 || test_failed $LINENO
@@ -410,11 +398,21 @@ rm -rf a || framework_failure
 if [ -z "${LZIP_NAME}" ] ; then LZIP_NAME=lzip ; fi
 touch empty em || framework_failure
 "${LZIP_NAME}" -0 em || test_failed $LINENO
-"${LZIP}" -lq em.lz || test_failed $LINENO
-"${LZIP}" -d em.lz || test_failed $LINENO
+"${LZIP}" -l em.lz > /dev/null || test_failed $LINENO
+"${LZIP}" -dk em.lz || test_failed $LINENO
 cmp empty em || test_failed $LINENO
-rm -f em || framework_failure
+cat em.lz em.lz | "${LZIP}" -t || test_failed $LINENO
+cat em.lz em.lz | "${LZIP}" -d > em || test_failed $LINENO
+cmp empty em || test_failed $LINENO
+cat em.lz "${in_lz}" | "${LZIP}" -t || test_failed $LINENO
+cat em.lz "${in_lz}" | "${LZIP}" -d > out || test_failed $LINENO
+cmp in out || test_failed $LINENO
+cat "${in_lz}" em.lz | "${LZIP}" -t || test_failed $LINENO
+cat "${in_lz}" em.lz | "${LZIP}" -d > out || test_failed $LINENO
+cmp in out || test_failed $LINENO
 
+cat em.lz "${fox_lz}" em.lz "${fox_lz}" em.lz em.lz "${fox_lz}" em.lz > \
+    f3_em.lz || framework_failure
 "${LZIPRECOVER}" -D ,18000 "${in_lz}" > out || test_failed $LINENO
 "${LZIPRECOVER}" -D 18000 "${in_lz}" >> out || test_failed $LINENO
 cmp in out || test_failed $LINENO
@@ -422,22 +420,60 @@ cmp in out || test_failed $LINENO
 cmp "${inD}" out || test_failed $LINENO
 "${LZIPRECOVER}" -D 21636,397 "${in_lz}" > out || test_failed $LINENO
 cmp "${inD}" out || test_failed $LINENO
-"${LZIPRECOVER}" -D 21636,397 "${in_em}" --ignore-empty > out ||
-	test_failed $LINENO
-cmp "${inD}" out || test_failed $LINENO
-"${LZIPRECOVER}" -q -D 21636,397 "${in_em}"
-[ $? = 2 ] || test_failed $LINENO
+"${LZIPRECOVER}" -D 45,45 f3_em.lz > out || test_failed $LINENO
+cmp fox out || test_failed $LINENO
 "${LZIP}" -D 0 "${in_lz}" -o a/b/c/out || test_failed $LINENO
 cmp in a/b/c/out || test_failed $LINENO
 rm -rf a || framework_failure
 
 printf "\ntesting bad input..."
 
+cat em.lz em.lz > ee.lz || framework_failure
+"${LZIP}" -l < ee.lz > /dev/null || test_failed $LINENO
+"${LZIP}" -t < ee.lz || test_failed $LINENO
+"${LZIP}" -d < ee.lz > em || test_failed $LINENO
+cmp empty em || test_failed $LINENO
+"${LZIPRECOVER}" -li ee.lz > /dev/null || test_failed $LINENO
+"${LZIPRECOVER}" -ti ee.lz || test_failed $LINENO
+"${LZIPRECOVER}" -cdi ee.lz > em || test_failed $LINENO
+cmp empty em || test_failed $LINENO
+"${LZIP}" -lq ee.lz
+[ $? = 2 ] || test_failed $LINENO
+"${LZIP}" -tq ee.lz
+[ $? = 2 ] || test_failed $LINENO
+"${LZIP}" -dq ee.lz
+[ $? = 2 ] || test_failed $LINENO
+[ ! -e ee ] || test_failed $LINENO
+"${LZIP}" -cdq ee.lz > em
+[ $? = 2 ] || test_failed $LINENO
+cmp empty em || test_failed $LINENO
+rm -f em || framework_failure
+cat "${in_lz}" em.lz "${in_lz}" > inein.lz || framework_failure
+"${LZIP}" -l < inein.lz > /dev/null || test_failed $LINENO
+"${LZIP}" -t < inein.lz || test_failed $LINENO
+"${LZIP}" -d < inein.lz > out2 || test_failed $LINENO
+cmp in2 out2 || test_failed $LINENO
+"${LZIPRECOVER}" -li inein.lz > /dev/null || test_failed $LINENO
+"${LZIPRECOVER}" -ti inein.lz || test_failed $LINENO
+"${LZIPRECOVER}" -cdi inein.lz > out2 || test_failed $LINENO
+cmp in2 out2 || test_failed $LINENO
+"${LZIP}" -lq inein.lz
+[ $? = 2 ] || test_failed $LINENO
+"${LZIP}" -tq inein.lz
+[ $? = 2 ] || test_failed $LINENO
+"${LZIP}" -dq inein.lz
+[ $? = 2 ] || test_failed $LINENO
+[ ! -e inein ] || test_failed $LINENO
+"${LZIP}" -cdq inein.lz > out2
+[ $? = 2 ] || test_failed $LINENO
+cmp in2 out2 || test_failed $LINENO
+rm -f out2 inein.lz em.lz || framework_failure
+
 headers='LZIp LZiP LZip LzIP LzIp LziP lZIP lZIp lZiP lzIP'
 body='\001\014\000\000\101\376\367\377\377\340\000\200\000\215\357\002\322\001\000\000\000\000\000\000\000\045\000\000\000\000\000\000\000'
 cp "${in_lz}" int.lz || framework_failure
 printf "LZIP${body}" >> int.lz || framework_failure
-if "${LZIP}" -tq int.lz ; then
+if "${LZIP}" -t int.lz ; then
 	for header in ${headers} ; do
 		printf "${header}${body}" > int.lz || framework_failure
 		"${LZIP}" -lq int.lz			# first member
@@ -466,7 +502,7 @@ if "${LZIP}" -tq int.lz ; then
 		[ $? = 2 ] || test_failed $LINENO ${header}
 		"${LZIP}" -cdq int.lz > /dev/null
 		[ $? = 2 ] || test_failed $LINENO ${header}
-		"${LZIP}" -lq --loose-trailing int.lz ||
+		"${LZIP}" -l --loose-trailing int.lz > /dev/null ||
 			test_failed $LINENO ${header}
 		"${LZIP}" -t --loose-trailing int.lz ||
 			test_failed $LINENO ${header}
@@ -497,24 +533,31 @@ if "${LZIP}" -tq int.lz ; then
 		cmp "${in_lz}" int.lz || test_failed $LINENO ${header}
 	done
 else
-	printf "\nwarning: skipping header test: 'printf' does not work on your system."
+	printf "warning: skipping header test: 'printf' does not work on your system."
 fi
-rm -f int.lz out || framework_failure
+rm -f int.lz || framework_failure
 
-"${LZIP}" -cd "${fox6_lz}" > out || test_failed $LINENO
-"${LZIPRECOVER}" -cd "${f6nz_lz}" --ignore-nonzero > copy || test_failed $LINENO
-cmp copy out || test_failed $LINENO
-rm -f copy out || framework_failure
-"${LZIP}" -lq "${f6nz_lz}" || test_failed $LINENO
-"${LZIP}" -tq "${f6nz_lz}"
+"${LZIP}" -l "${fnz_lz}" > /dev/null || test_failed $LINENO
+"${LZIP}" -tq "${fnz_lz}"
 [ $? = 2 ] || test_failed $LINENO
-cp "${f6nz_lz}" f6nz.lz || framework_failure
-cp "${f6nz_lz}" f6nz2.lz || framework_failure
-cmp -s "${fox6_lz}" f6nz.lz && test_failed $LINENO
-"${LZIPRECOVER}" --nonzero-repair f6nz.lz f6nz2.lz || test_failed $LINENO
-cmp "${fox6_lz}" f6nz.lz || test_failed $LINENO
-cmp "${fox6_lz}" f6nz2.lz || test_failed $LINENO
-rm -f f6nz.lz f6nz2.lz || framework_failure
+cat "${fox_lz}" "${fox_lz}" "${fox_lz}" "${fox_lz}" "${fox_lz}" "${fox_lz}" \
+    > fox6.lz || framework_failure
+cat "${fox_lz}" "${fnz_lz}" "${fox_lz}" "${fnz_lz}" "${fox_lz}" "${fnz_lz}" \
+    > fox6_nz.lz || framework_failure
+"${LZIP}" -cd fox6.lz > out || test_failed $LINENO
+"${LZIPRECOVER}" -cd -i fox6_nz.lz > copy || test_failed $LINENO
+cmp copy out || test_failed $LINENO
+rm -f copy || framework_failure
+cp fox6_nz.lz f6nz.lz || framework_failure
+cp fox6_nz.lz f6nz2.lz || framework_failure
+cp "${f6b1nz_lz}" f6b1nz.lz || framework_failure
+cmp -s fox6.lz f6nz.lz && test_failed $LINENO
+"${LZIPRECOVER}" --nonzero-repair f6nz.lz f6nz2.lz f6b1nz.lz ||
+	test_failed $LINENO
+cmp fox6.lz f6nz.lz || test_failed $LINENO
+cmp fox6.lz f6nz2.lz || test_failed $LINENO
+cmp "${f6b1_lz}" f6b1nz.lz || test_failed $LINENO
+rm -f f6nz.lz f6nz2.lz f6b1nz.lz || framework_failure
 
 for i in fox_v2.lz fox_s11.lz fox_de20.lz \
          fox_bcrc.lz fox_crc0.lz fox_das46.lz fox_mes81.lz ; do
@@ -530,12 +573,12 @@ for i in fox_bcrc.lz fox_crc0.lz fox_das46.lz fox_mes81.lz ; do
 	"${LZIPRECOVER}" -cdq -i "${testdir}"/$i > out || test_failed $LINENO $i
 	cmp fox out || test_failed $LINENO $i
 done
-rm -f fox out || framework_failure
+rm -f fox || framework_failure
 
 cat "${in_lz}" "${in_lz}" > in2.lz || framework_failure
 cat "${in_lz}" "${in_lz}" "${in_lz}" > in3.lz || framework_failure
 if dd if=in3.lz of=trunc.lz bs=14682 count=1 2> /dev/null &&
-   [ -e trunc.lz ] && cmp in2.lz trunc.lz > /dev/null 2>&1 ; then
+   [ -e trunc.lz ] && cmp in2.lz trunc.lz ; then
 	for i in 6 20 14664 14683 14684 14685 14686 14687 14688 ; do
 		dd if=in3.lz of=trunc.lz bs=$i count=1 2> /dev/null
 		"${LZIP}" -lq trunc.lz
@@ -550,7 +593,7 @@ if dd if=in3.lz of=trunc.lz bs=14682 count=1 2> /dev/null &&
 		[ $? = 2 ] || test_failed $LINENO $i
 	done
 else
-	printf "\nwarning: skipping truncation test: 'dd' does not work on your system."
+	printf "warning: skipping truncation test: 'dd' does not work on your system."
 fi
 rm -f in3.lz trunc.lz || framework_failure
 
@@ -572,17 +615,22 @@ cat "${in_lz}" >> ingin.lz || framework_failure
 [ $? = 2 ] || test_failed $LINENO
 "${LZIP}" -atq < ingin.lz
 [ $? = 2 ] || test_failed $LINENO
-"${LZIP}" -acdq ingin.lz > /dev/null
+"${LZIP}" -acdq ingin.lz > out
 [ $? = 2 ] || test_failed $LINENO
-"${LZIP}" -adq < ingin.lz > /dev/null
+cmp in out || test_failed $LINENO
+"${LZIP}" -adq < ingin.lz > out
 [ $? = 2 ] || test_failed $LINENO
-"${LZIPRECOVER}" -lq -i ingin.lz || test_failed $LINENO
+cmp in out || test_failed $LINENO
 "${LZIP}" -t ingin.lz || test_failed $LINENO
 "${LZIP}" -t < ingin.lz || test_failed $LINENO
+"${LZIP}" -dk ingin.lz || test_failed $LINENO
+cmp in ingin || test_failed $LINENO
 "${LZIP}" -cd ingin.lz > out || test_failed $LINENO
 cmp in out || test_failed $LINENO
 "${LZIP}" -d < ingin.lz > out || test_failed $LINENO
 cmp in out || test_failed $LINENO
+rm -f ingin || framework_failure
+"${LZIPRECOVER}" -l -i ingin.lz > /dev/null || test_failed $LINENO
 "${LZIPRECOVER}" -cd -i ingin.lz > out2 || test_failed $LINENO
 cmp in2 out2 || test_failed $LINENO
 
@@ -615,7 +663,7 @@ rm -f in2 in2t.lz out out2 || framework_failure
 printf "\ntesting --byte-repair..."
 
 rm -f out.lz || framework_failure
-"${LZIPRECOVER}" -B -o out.lz "${fox6_lz}" || test_failed $LINENO
+"${LZIPRECOVER}" -B -o out.lz fox6.lz || test_failed $LINENO
 [ ! -e out.lz ] || test_failed $LINENO
 "${LZIPRECOVER}" -B -o out.lz "${bad2_lz}" -q
 [ $? = 2 ] || test_failed $LINENO
@@ -627,7 +675,11 @@ rm -f out.lz || framework_failure
 [ $? = 2 ] || test_failed $LINENO
 [ ! -e out.lz ] || test_failed $LINENO
 "${LZIPRECOVER}" -Bf -o out.lz "${f6b1_lz}" || test_failed $LINENO
-cmp "${fox6_lz}" out.lz || test_failed $LINENO
+cmp fox6.lz out.lz || test_failed $LINENO
+"${LZIPRECOVER}" -Bf fox6_nz.lz -o out.lz || test_failed $LINENO
+cmp fox6.lz out.lz || test_failed $LINENO
+"${LZIPRECOVER}" -Bf "${f6b1nz_lz}" -o out.lz || test_failed $LINENO
+cmp fox6.lz out.lz || test_failed $LINENO
 "${LZIPRECOVER}" -Bf -o out.lz "${bad1_lz}" || test_failed $LINENO
 cmp "${in_lz}" out.lz || test_failed $LINENO
 "${LZIPRECOVER}" -B -o a/b/c/out.lz "${bad1_lz}" || test_failed $LINENO
@@ -667,21 +719,21 @@ cmp fec/test.txt.lz.fec fecfile.fec || test_failed $LINENO
 "${LZIPRECOVER}" -Ft "${in_lz}" --fec-file=fec/ || test_failed $LINENO
 rm -rf fec || framework_failure
 mkdir a
-cp "${in_lz}" "${fox6_lz}" a || framework_failure
+cp fox6.lz "${in_lz}" a || framework_failure
 "${LZIPRECOVER}" -r -Fc a/ -o fec/ || test_failed $LINENO
-cmp fec/test.txt.lz.fec fecfile.fec || test_failed $LINENO
 [ -e fec/fox6.lz.fec ] || test_failed $LINENO
+cmp fec/test.txt.lz.fec fecfile.fec || test_failed $LINENO
 "${LZIPRECOVER}" -r -Fc a -o fec/ || test_failed $LINENO
-cmp fec/a/test.txt.lz.fec fecfile.fec || test_failed $LINENO
 [ -e fec/a/fox6.lz.fec ] || test_failed $LINENO
+cmp fec/a/test.txt.lz.fec fecfile.fec || test_failed $LINENO
 rm -rf a fec fecfile.fec || framework_failure
 
 printf "\ntesting --merge..."
 
 rm -f out.lz || framework_failure
-"${LZIPRECOVER}" -m -o out.lz "${fox6_lz}" "${f6b1_lz}" || test_failed $LINENO
+"${LZIPRECOVER}" -m -o out.lz fox6.lz "${f6b1_lz}" || test_failed $LINENO
 [ ! -e out.lz ] || test_failed $LINENO
-"${LZIPRECOVER}" -m -o out.lz "${f6b1_lz}" "${fox6_lz}" || test_failed $LINENO
+"${LZIPRECOVER}" -m -o out.lz "${f6b1_lz}" fox6.lz || test_failed $LINENO
 [ ! -e out.lz ] || test_failed $LINENO
 "${LZIPRECOVER}" -m -o out.lz "${bad1_lz}" "${bad2_lz}" "${bad1_lz}" -q
 [ $? = 2 ] || test_failed $LINENO
@@ -705,56 +757,56 @@ rm -f bad2.lz || framework_failure
 [ ! -e out.lz ] || test_failed $LINENO
 
 "${LZIPRECOVER}" -mf -o out.lz "${f6b1_lz}" "${f6b4_lz}" || test_failed $LINENO
-cmp "${fox6_lz}" out.lz || test_failed $LINENO
+cmp fox6.lz out.lz || test_failed $LINENO
 "${LZIPRECOVER}" -mf -o out.lz "${f6b4_lz}" "${f6b1_lz}" || test_failed $LINENO
-cmp "${fox6_lz}" out.lz || test_failed $LINENO
+cmp fox6.lz out.lz || test_failed $LINENO
 "${LZIPRECOVER}" -m -o a/b/c/out.lz "${f6b1_lz}" "${f6b4_lz}" ||
 	test_failed $LINENO
-cmp "${fox6_lz}" a/b/c/out.lz || test_failed $LINENO
+cmp fox6.lz a/b/c/out.lz || test_failed $LINENO
 rm -rf a || framework_failure
 
 for i in "${f6b1_lz}" "${f6b3_lz}" "${f6b4_lz}" "${f6b5_lz}" "${f6b6_lz}" ; do
 	"${LZIPRECOVER}" -mf -o out.lz "${f6b2_lz}" "$i" ||
 		test_failed $LINENO "$i"
-	cmp "${fox6_lz}" out.lz || test_failed $LINENO "$i"
+	cmp fox6.lz out.lz || test_failed $LINENO "$i"
 	"${LZIPRECOVER}" -mf -o out.lz "$i" "${f6b2_lz}" ||
 		test_failed $LINENO "$i"
-	cmp "${fox6_lz}" out.lz || test_failed $LINENO "$i"
+	cmp fox6.lz out.lz || test_failed $LINENO "$i"
 done
 
 for i in "${f6b3_lz}" "${f6b4_lz}" "${f6b5_lz}" "${f6b6_lz}" ; do
 	"${LZIPRECOVER}" -mf -o out.lz "${f6b1_lz}" "${f6b2_lz}" "$i" ||
 		test_failed $LINENO "$i"
-	cmp "${fox6_lz}" out.lz || test_failed $LINENO "$i"
+	cmp fox6.lz out.lz || test_failed $LINENO "$i"
 	"${LZIPRECOVER}" -mf -o out.lz "${f6b1_lz}" "$i" "${f6b2_lz}" ||
 		test_failed $LINENO "$i"
-	cmp "${fox6_lz}" out.lz || test_failed $LINENO "$i"
+	cmp fox6.lz out.lz || test_failed $LINENO "$i"
 	"${LZIPRECOVER}" -mf -o out.lz "${f6b2_lz}" "${f6b1_lz}" "$i" ||
 		test_failed $LINENO "$i"
-	cmp "${fox6_lz}" out.lz || test_failed $LINENO "$i"
+	cmp fox6.lz out.lz || test_failed $LINENO "$i"
 	"${LZIPRECOVER}" -mf -o out.lz "${f6b2_lz}" "$i" "${f6b1_lz}" ||
 		test_failed $LINENO "$i"
-	cmp "${fox6_lz}" out.lz || test_failed $LINENO "$i"
+	cmp fox6.lz out.lz || test_failed $LINENO "$i"
 	"${LZIPRECOVER}" -mf -o out.lz "$i" "${f6b1_lz}" "${f6b2_lz}" ||
 		test_failed $LINENO "$i"
-	cmp "${fox6_lz}" out.lz || test_failed $LINENO "$i"
+	cmp fox6.lz out.lz || test_failed $LINENO "$i"
 	"${LZIPRECOVER}" -mf -o out.lz "$i" "${f6b2_lz}" "${f6b1_lz}" ||
 		test_failed $LINENO "$i"
-	cmp "${fox6_lz}" out.lz || test_failed $LINENO "$i"
+	cmp fox6.lz out.lz || test_failed $LINENO "$i"
 done
 
 "${LZIPRECOVER}" -mf -o out.lz "${f6b3_lz}" "${f6b4_lz}" "${f6b5_lz}" ||
 	test_failed $LINENO
-cmp "${fox6_lz}" out.lz || test_failed $LINENO
+cmp fox6.lz out.lz || test_failed $LINENO
 "${LZIPRECOVER}" -mf -o out.lz "${f6b1_lz}" "${f6b3_lz}" "${f6b4_lz}" \
 	"${f6b5_lz}" || test_failed $LINENO
-cmp "${fox6_lz}" out.lz || test_failed $LINENO
+cmp fox6.lz out.lz || test_failed $LINENO
 "${LZIPRECOVER}" -mf -o out.lz "${f6b2_lz}" "${f6b3_lz}" "${f6b4_lz}" \
 	"${f6b5_lz}" || test_failed $LINENO
-cmp "${fox6_lz}" out.lz || test_failed $LINENO
+cmp fox6.lz out.lz || test_failed $LINENO
 "${LZIPRECOVER}" -mf -o out.lz "${f6b1_lz}" "${f6b2_lz}" "${f6b3_lz}" \
 	"${f6b4_lz}" "${f6b5_lz}" || test_failed $LINENO
-cmp "${fox6_lz}" out.lz || test_failed $LINENO
+cmp fox6.lz out.lz || test_failed $LINENO
 
 "${LZIPRECOVER}" -mf -o out.lz "${bad1_lz}" "${bad2_lz}" || test_failed $LINENO
 cmp "${in_lz}" out.lz || test_failed $LINENO
@@ -836,7 +888,7 @@ rm -f bad345.lz bad453.lz bad534.lz out4.lz || framework_failure
 printf "\ntesting --reproduce..."
 
 if /bin/sh -c "${LZIP_NAME} -s18KiB" < in > out 2> /dev/null &&
-   cmp "${in_lz}" out > /dev/null 2>&1 ; then
+   cmp "${in_lz}" out ; then
   rm -f out || framework_failure
   "${LZIPRECOVER}" --reproduce --lzip-name="${LZIP_NAME}" -o out \
     --reference-file=foo "${in_lz}" || test_failed $LINENO "${LZIP_NAME}"
@@ -850,19 +902,19 @@ if /bin/sh -c "${LZIP_NAME} -s18KiB" < in > out 2> /dev/null &&
   for i in 6 7 8 9 ; do
     for f in "${testdir}"/test_bad${i}.txt in ; do
       rm -f out || framework_failure
-      "${LZIPRECOVER}" -q --reproduce --lzip-name="${LZIP_NAME}" \
-        --reference-file="$f" "${testdir}"/test_bad${i}.lz -o out ||
+      "${LZIPRECOVER}" --reproduce --lzip-name="${LZIP_NAME}" -o out \
+        --reference-file="$f" "${testdir}"/test_bad${i}.lz > /dev/null ||
         test_failed $LINENO "${LZIP_NAME} $i $f"
       cmp "${in_lz}" out || test_failed $LINENO "${LZIP_NAME} $i $f"
       rm -f out || framework_failure
-      "${LZIPRECOVER}" -q --reproduce --lzip-name="${LZIP_NAME}" \
-        --reference-file="$f" "${testdir}"/test_bad${i}.lz -o out \
-        --lzip-level=6 || test_failed $LINENO "${LZIP_NAME} $i $f level=6"
+      "${LZIPRECOVER}" --reproduce --lzip-name="${LZIP_NAME}" -o out \
+        --lzip-level=6 --reference-file="$f" "${testdir}"/test_bad${i}.lz \
+        > /dev/null || test_failed $LINENO "${LZIP_NAME} $i $f level=6"
       cmp "${in_lz}" out || test_failed $LINENO "${LZIP_NAME} $i $f level=6"
       rm -f out || framework_failure
-      "${LZIPRECOVER}" -q --reproduce --lzip-name="${LZIP_NAME}" \
-        --reference-file="$f" "${testdir}"/test_bad${i}.lz -o out \
-        --lzip-level=m36 || test_failed $LINENO "${LZIP_NAME} $i $f level=m36"
+      "${LZIPRECOVER}" --reproduce --lzip-name="${LZIP_NAME}" -o out \
+        --lzip-level=m36 --reference-file="$f" "${testdir}"/test_bad${i}.lz \
+        > /dev/null || test_failed $LINENO "${LZIP_NAME} $i $f level=m36"
       cmp "${in_lz}" out || test_failed $LINENO "${LZIP_NAME} $i $f level=m36"
     done
   done
@@ -872,8 +924,8 @@ if /bin/sh -c "${LZIP_NAME} -s18KiB" < in > out 2> /dev/null &&
     framework_failure
   rm -f out || framework_failure
   for i in 6 7 8 9 ; do			# reproduce one member each time
-    "${LZIPRECOVER}" -q --reproduce --lzip-name="${LZIP_NAME}" \
-      --reference-file="${testdir}"/test_bad${i}.txt mm_bad.lz -o out ||
+    "${LZIPRECOVER}" --reproduce --lzip-name="${LZIP_NAME}" mm_bad.lz \
+      --reference-file="${testdir}"/test_bad${i}.txt -o out > /dev/null ||
       test_failed $LINENO "${LZIP_NAME} $i"
     mv out mm_bad.lz || framework_failure
   done
@@ -884,22 +936,23 @@ if /bin/sh -c "${LZIP_NAME} -s18KiB" < in > out 2> /dev/null &&
     framework_failure
   rm -f out || framework_failure
   for i in 6 7 8 9 ; do			# reproduce one member each time
-    "${LZIPRECOVER}" -q --reproduce --lzip-name="${LZIP_NAME}" -o out \
-      --reference-file=in mm_bad.lz || test_failed $LINENO "${LZIP_NAME} $i"
+    "${LZIPRECOVER}" --reproduce --lzip-name="${LZIP_NAME}" mm_bad.lz -o out \
+      --reference-file=in > /dev/null || test_failed $LINENO "${LZIP_NAME} $i"
     mv out mm_bad.lz || framework_failure
   done
   cmp in4.lz mm_bad.lz || test_failed $LINENO "${LZIP_NAME}"
   rm -f mm_bad.lz || framework_failure
 
-  "${LZIPRECOVER}" -q --debug-reproduce=13-7356 --lzip-name="${LZIP_NAME}" \
-    --reference-file=in "${in_lz}" || test_failed $LINENO "${LZIP_NAME}"
+  "${LZIPRECOVER}" --reference-file=in "${in_lz}" --lzip-name="${LZIP_NAME}" \
+    --debug-reproduce=13-7356 > /dev/null || test_failed $LINENO "${LZIP_NAME}"
 
   "${LZIPRECOVER}" --debug-reproduce=512,5120,512 --lzip-name="${LZIP_NAME}" \
     -q --reference-file=in "${in_lz}" || test_failed $LINENO "${LZIP_NAME}"
 else
-  printf "\nwarning: skipping --reproduce test: ${LZIP_NAME} not found or not the right version.\n"
-  ${LZIP_NAME} -V
-  printf "\nTry 'make LZIP_NAME=<name_of_lzip_executable> check'."
+  printf "warning: skipping --reproduce test: "
+  printf "${LZIP_NAME} not found, not the right compressor, not the right version, or this is not a POSIX system.\n"
+  if ${LZIP_NAME} -V > /dev/null 2>&1 ; then ${LZIP_NAME} -V | sed -e 1q
+  else printf "Try 'make LZIP_NAME=<name_of_lzip_executable> check'.\n" ; fi
 fi
 rm -f in4.lz || framework_failure
 
@@ -1222,21 +1275,17 @@ for i in 1 2 3 4 5 6 7 8 9 10 ; do
 done
 rm -f nbt.lz || framework_failure
 
-cp "${in_em}" test_3m.txt.lz || framework_failure
-"${LZIPRECOVER}" --remove=empty test_3m.txt.lz || test_failed $LINENO
-"${LZIPRECOVER}" -M test_3m.txt.lz | cmp "${testdir}"/test_3m.txt.lz.md5 - ||
-	test_failed $LINENO
-"${LZIPRECOVER}" --dump=2,4,7 "${in_em}" | cmp test_3m.txt.lz - ||
-	test_failed $LINENO
-"${LZIPRECOVER}" --strip=e "${in_em}" | cmp test_3m.txt.lz - ||
-	test_failed $LINENO
-"${LZIPRECOVER}" --strip=e "${in_em}" | cmp test_3m.txt.lz - ||
+cat "${fox_lz}" "${fox_lz}" "${fox_lz}" > fox3.lz || framework_failure
+cp f3_em.lz out.lz || framework_failure
+"${LZIPRECOVER}" --remove=empty out.lz || test_failed $LINENO
+cmp fox3.lz out.lz || test_failed $LINENO
+rm -f out.lz || framework_failure
+"${LZIPRECOVER}" --dump=2,4,7 f3_em.lz | cmp fox3.lz - || test_failed $LINENO
+"${LZIPRECOVER}" --strip=e f3_em.lz | cmp fox3.lz - || test_failed $LINENO
+"${LZIPRECOVER}" --strip=1,3,5-6,8 f3_em.lz | cmp fox3.lz - ||
 	test_failed $LINENO
-"${LZIPRECOVER}" --strip=1,3,5-6,8 "${in_em}" | cmp test_3m.txt.lz - ||
+"${LZIPRECOVER}" --dump=empty f3_em.lz | "${LZIP}" -d | cmp empty - ||
 	test_failed $LINENO
-"${LZIPRECOVER}" --dump=emp "${in_em}" | "${LZIP}" -d --ignore-empty | \
-	cmp empty - || test_failed $LINENO
-rm -f test_3m.txt.lz || framework_failure
 
 printf "\ntesting --dump/remove/strip=damaged..."
 
@@ -1295,9 +1344,9 @@ cmp "${f6b1_lz}" out || test_failed $LINENO
 cat "${f6b1_lz}" in > f6bt.lz || framework_failure
 "${LZIPRECOVER}" --dump=damaged f6bt.lz > out || test_failed $LINENO
 cmp "${f6b1_lz}" out || test_failed $LINENO
-"${LZIPRECOVER}" -q --strip=damaged "${f6b1_lz}" > out || test_failed $LINENO
+"${LZIPRECOVER}" --strip=damaged "${f6b1_lz}" > out || test_failed $LINENO
 cmp empty out || test_failed $LINENO
-"${LZIPRECOVER}" -q --strip=damaged f6bt.lz > out || test_failed $LINENO
+"${LZIPRECOVER}" --strip=damaged f6bt.lz > out || test_failed $LINENO
 cmp empty out || test_failed $LINENO
 cp "${f6b1_lz}" f6b.lz || framework_failure
 "${LZIPRECOVER}" -q --remove=damaged f6b.lz
@@ -1335,7 +1384,6 @@ cat "${f6b3_lz}" in > f6bt.lz || framework_failure
 "${LZIPRECOVER}" --dump=damaged f6bt.lz > out || test_failed $LINENO
 cat "${fox_lz}" "${fox_lz}" out "${fox_lz}" | cmp "${f6b3_lz}" - ||
 	test_failed $LINENO
-cat "${fox_lz}" "${fox_lz}" "${fox_lz}" > fox3.lz || framework_failure
 "${LZIPRECOVER}" --strip=damaged "${f6b3_lz}" > out || test_failed $LINENO
 cmp fox3.lz out || test_failed $LINENO
 "${LZIPRECOVER}" --strip=damaged f6bt.lz > out || test_failed $LINENO
@@ -1392,10 +1440,9 @@ for i in "${f6s1_lz}" "${f6s2_lz}" ; do
 	"${LZIPRECOVER}" --dump=damaged f6bt.lz > out ||
 		test_failed $LINENO "$i"
 	cmp "$i" out || test_failed $LINENO "$i"
-	"${LZIPRECOVER}" -q --strip=damaged "$i" > out ||
-		test_failed $LINENO "$i"
+	"${LZIPRECOVER}" --strip=damaged "$i" > out || test_failed $LINENO "$i"
 	cmp empty out || test_failed $LINENO "$i"
-	"${LZIPRECOVER}" -q --strip=damaged f6bt.lz > out ||
+	"${LZIPRECOVER}" --strip=damaged f6bt.lz > out ||
 		test_failed $LINENO "$i"
 	cmp empty out || test_failed $LINENO "$i"
 	cp "$i" f6b.lz || framework_failure
@@ -1458,22 +1505,22 @@ cat "${bad2_lz}" out "${bad2_lz}" out | cmp out4 - || test_failed $LINENO
 	"${bad2_lz}" > out4 || test_failed $LINENO
 cat out "${bad2_lz}" out "${bad2_lz}" | cmp out4 - || test_failed $LINENO
 #
-"${LZIPRECOVER}" -q --strip=damaged "${bad2_lz}" "${f6b2_lz}" > out ||
+"${LZIPRECOVER}" --strip=damaged "${bad2_lz}" "${f6b2_lz}" > out ||
 	test_failed $LINENO
 cmp fox5.lz out || test_failed $LINENO
-"${LZIPRECOVER}" -q --strip=damaged bad2t.lz "${f6b2_lz}" > out ||
+"${LZIPRECOVER}" --strip=damaged bad2t.lz "${f6b2_lz}" > out ||
 	test_failed $LINENO
 cmp fox5.lz out || test_failed $LINENO
-"${LZIPRECOVER}" -q --strip=damaged "${f6b2_lz}" bad2t.lz f6bt.lz > out ||
+"${LZIPRECOVER}" --strip=damaged "${f6b2_lz}" bad2t.lz f6bt.lz > out ||
 	test_failed $LINENO
 cat fox5.lz fox5.lz in | cmp out - || test_failed $LINENO
-"${LZIPRECOVER}" -q --strip=damaged "${f6b2_lz}" f6bt.lz bad2t.lz > out ||
+"${LZIPRECOVER}" --strip=damaged "${f6b2_lz}" f6bt.lz bad2t.lz > out ||
 	test_failed $LINENO
 cat fox5.lz fox5.lz | cmp out - || test_failed $LINENO
-"${LZIPRECOVER}" -q --strip=damaged f6bt.lz bad2t.lz > out ||
+"${LZIPRECOVER}" --strip=damaged f6bt.lz bad2t.lz > out ||
 	test_failed $LINENO
 cmp fox5.lz out || test_failed $LINENO
-"${LZIPRECOVER}" -q --strip=damaged f6bt.lz "${in_lz}" > out ||
+"${LZIPRECOVER}" --strip=damaged f6bt.lz "${in_lz}" > out ||
 	test_failed $LINENO
 cat fox5.lz "${in_lz}" | cmp out - || test_failed $LINENO
 "${LZIPRECOVER}" --strip=damaged --strip=tdata f6bt.lz "${in_lz}" > out ||
@@ -1487,7 +1534,7 @@ cat "${bad2_lz}" in | cmp bad2t.lz - || test_failed $LINENO
 cmp fox5.lz f6b.lz || test_failed $LINENO
 cat fox5.lz in | cmp f6bt.lz - || test_failed $LINENO
 cat "${bad2_lz}" in > bad2t.lz || framework_failure
-cat "${fox6_lz}" "${inD}" > fox6t.lz || framework_failure
+cat fox6.lz "${inD}" > fox6t.lz || framework_failure
 cat "${f6b1_lz}" in > f6abt.lz || framework_failure
 cp "${f6b2_lz}" f6b.lz || framework_failure
 cat "${f6b2_lz}" in > f6bt.lz || framework_failure
@@ -1495,7 +1542,7 @@ cat "${f6b2_lz}" in > f6bt.lz || framework_failure
 [ $? = 2 ] || test_failed $LINENO
 cat "${bad2_lz}" in | cmp bad2t.lz - || test_failed $LINENO
 cat "${f6b1_lz}" in | cmp f6abt.lz - || test_failed $LINENO
-cmp "${fox6_lz}" fox6t.lz || test_failed $LINENO
+cmp fox6.lz fox6t.lz || test_failed $LINENO
 cmp fox5.lz f6b.lz || test_failed $LINENO
 cmp fox5.lz f6bt.lz || test_failed $LINENO
 rm -f fox6t.lz f6b.lz f6bt.lz f6abt.lz bad2t.lz fox5.lz out2 out4 ||
@@ -1509,7 +1556,7 @@ cmp "${inD}" out || test_failed $LINENO
 rm -f out || framework_failure
 "${LZIPRECOVER}" --dump=tdat int.lz -o out || test_failed $LINENO
 cmp "${inD}" out || test_failed $LINENO
-cat "${fox6_lz}" "${inD}" > fox6t.lz || framework_failure
+cat fox6.lz "${inD}" > fox6t.lz || framework_failure
 cat "${inD}" "${inD}" > inD2 || framework_failure
 "${LZIPRECOVER}" --dump=tda int.lz fox6t.lz -f -o out || test_failed $LINENO
 cmp inD2 out || test_failed $LINENO
@@ -1526,12 +1573,12 @@ rm -f out || framework_failure
 "${LZIPRECOVER}" --strip=tdata int.lz -o out || test_failed $LINENO
 cmp "${in_lz}" out || test_failed $LINENO
 "${LZIPRECOVER}" --strip=tdata fox6t.lz -f -o out || test_failed $LINENO
-cmp "${fox6_lz}" out || test_failed $LINENO
+cmp fox6.lz out || test_failed $LINENO
 "${LZIPRECOVER}" --strip=tdata int.lz int.lz -f -o out || test_failed $LINENO
 cmp in2.lz out || test_failed $LINENO
 rm -f in2.lz || framework_failure
 "${LZIPRECOVER}" --strip=tdata int.lz fox6t.lz > out || test_failed $LINENO
-cat "${in_lz}" "${fox6_lz}" | cmp out - || test_failed $LINENO
+cat "${in_lz}" fox6.lz | cmp out - || test_failed $LINENO
 "${LZIPRECOVER}" -q --strip=tdata ingint.lz > out	# /dev/null returns 1 on OS/2
 [ $? = 2 ] || test_failed $LINENO
 "${LZIPRECOVER}" -i --strip=tdata ingint.lz > out || test_failed $LINENO
@@ -1539,11 +1586,11 @@ cmp ingin.lz out || test_failed $LINENO
 
 "${LZIPRECOVER}" --remove=tdata int.lz fox6t.lz || test_failed $LINENO
 cmp "${in_lz}" int.lz || test_failed $LINENO
-cmp "${fox6_lz}" fox6t.lz || test_failed $LINENO
+cmp fox6.lz fox6t.lz || test_failed $LINENO
 "${LZIPRECOVER}" --remove=tdata int.lz || test_failed $LINENO
 cmp "${in_lz}" int.lz || test_failed $LINENO
 "${LZIPRECOVER}" --remove=tdata fox6t.lz || test_failed $LINENO
-cmp "${fox6_lz}" fox6t.lz || test_failed $LINENO
+cmp fox6.lz fox6t.lz || test_failed $LINENO
 "${LZIPRECOVER}" -q --remove=tdata ingint.lz
 [ $? = 2 ] || test_failed $LINENO
 cmp -s ingin.lz ingint.lz && test_failed $LINENO
@@ -1554,15 +1601,15 @@ rm -f int.lz fox6t.lz ingint.lz ingin.lz || framework_failure
 for i in "${f6s3_lz}" "${f6s4_lz}" "${f6s5_lz}" "${f6s6_lz}" ; do
 	"${LZIPRECOVER}" --strip=tdata "$i" > out || test_failed $LINENO "$i"
 	"${LZIPRECOVER}" --dump=tdata "$i" > tdata || test_failed $LINENO "$i"
-	cmp "${fox6_lz}" out || test_failed $LINENO "$i"
+	cmp fox6.lz out || test_failed $LINENO "$i"
 	cat out tdata | cmp "$i" - || test_failed $LINENO "$i"
 	cat "$i" "${inD}" > f6t.lz || framework_failure
 	"${LZIPRECOVER}" --strip=tdata f6t.lz > out || test_failed $LINENO "$i"
 	"${LZIPRECOVER}" --dump=tdata f6t.lz > tdata || test_failed $LINENO "$i"
-	cmp "${fox6_lz}" out || test_failed $LINENO "$i"
+	cmp fox6.lz out || test_failed $LINENO "$i"
 	cat out tdata | cmp f6t.lz - || test_failed $LINENO "$i"
 	"${LZIPRECOVER}" --remove=tdata f6t.lz || test_failed $LINENO "$i"
-	cmp "${fox6_lz}" f6t.lz || test_failed $LINENO "$i"
+	cmp fox6.lz f6t.lz || test_failed $LINENO "$i"
 	rm -f out tdata f6t.lz || framework_failure
 done
 
diff --git a/testsuite/fox6.lz b/testsuite/fox6.lz
deleted file mode 100644
index 8401b99..0000000
--- a/testsuite/fox6.lz
+++ /dev/null
diff --git a/testsuite/fox6_b1nz.lz b/testsuite/fox6_b1nz.lz
new file mode 100644
index 0000000..d841502
--- /dev/null
+++ b/testsuite/fox6_b1nz.lz
diff --git a/testsuite/fox6_nz.lz b/testsuite/fox6_nz.lz
deleted file mode 100644
index cd5b481..0000000
--- a/testsuite/fox6_nz.lz
+++ /dev/null
diff --git a/testsuite/fox_nz.lz b/testsuite/fox_nz.lz
new file mode 100644
index 0000000..44a4b58
--- /dev/null
+++ b/testsuite/fox_nz.lz
diff --git a/testsuite/test_3m.txt.lz.md5 b/testsuite/test_3m.txt.lz.md5
deleted file mode 100644
index e9f47d7..0000000
--- a/testsuite/test_3m.txt.lz.md5
+++ /dev/null
@@ -1 +0,0 @@
-aa8ca65001d627f89e7494fa829e710f  test_3m.txt.lz
diff --git a/testsuite/test_em.txt.lz b/testsuite/test_em.txt.lz
deleted file mode 100644
index 9e093be..0000000
--- a/testsuite/test_em.txt.lz
+++ /dev/null