diff --git a/modules/arch/x86/tests/addrop-err.errwarn b/modules/arch/x86/tests/addrop-err.errwarn
index 500ba51f..72040ee7 100644
--- a/modules/arch/x86/tests/addrop-err.errwarn
+++ b/modules/arch/x86/tests/addrop-err.errwarn
@@ -1 +1 @@
-./src/arch/x86/tests/addrop-err.asm:2: invalid effective address (displacement size)
+-:2: invalid effective address (displacement size)
diff --git a/modules/arch/x86/tests/cpubasic-err.errwarn b/modules/arch/x86/tests/cpubasic-err.errwarn
index b89784fc..c278d28d 100644
--- a/modules/arch/x86/tests/cpubasic-err.errwarn
+++ b/modules/arch/x86/tests/cpubasic-err.errwarn
@@ -1 +1 @@
-./src/arch/x86/tests/cpubasic-err.asm:2: invalid combination of opcode and operands
+-:2: invalid combination of opcode and operands
diff --git a/modules/arch/x86/tests/div-err.errwarn b/modules/arch/x86/tests/div-err.errwarn
index aab24906..4b6340e7 100644
--- a/modules/arch/x86/tests/div-err.errwarn
+++ b/modules/arch/x86/tests/div-err.errwarn
@@ -1,4 +1,4 @@
-./src/arch/x86/tests/div-err.asm:1: cannot override register size
-./src/arch/x86/tests/div-err.asm:3: cannot override register size
-./src/arch/x86/tests/div-err.asm:4: cannot override register size
-./src/arch/x86/tests/div-err.asm:5: cannot override register size
+-:1: cannot override register size
+-:3: cannot override register size
+-:4: cannot override register size
+-:5: cannot override register size
diff --git a/modules/arch/x86/tests/lds-err.errwarn b/modules/arch/x86/tests/lds-err.errwarn
index 5f1faa1e..601d1d06 100644
--- a/modules/arch/x86/tests/lds-err.errwarn
+++ b/modules/arch/x86/tests/lds-err.errwarn
@@ -1,4 +1,4 @@
-./src/arch/x86/tests/lds-err.asm:2: invalid combination of opcode and operands
-./src/arch/x86/tests/lds-err.asm:3: invalid combination of opcode and operands
-./src/arch/x86/tests/lds-err.asm:5: invalid combination of opcode and operands
-./src/arch/x86/tests/lds-err.asm:6: invalid combination of opcode and operands
+-:2: invalid combination of opcode and operands
+-:3: invalid combination of opcode and operands
+-:5: invalid combination of opcode and operands
+-:6: invalid combination of opcode and operands
diff --git a/modules/arch/x86/tests/opsize-err.errwarn b/modules/arch/x86/tests/opsize-err.errwarn
index 5b884bd8..c8ebb1e4 100644
--- a/modules/arch/x86/tests/opsize-err.errwarn
+++ b/modules/arch/x86/tests/opsize-err.errwarn
@@ -1 +1 @@
-./src/arch/x86/tests/opsize-err.asm:3: invalid combination of opcode and operands
+-:3: invalid combination of opcode and operands
diff --git a/modules/objfmts/bin/tests/float-err.errwarn b/modules/objfmts/bin/tests/float-err.errwarn
index 469e7e45..f890432d 100644
--- a/modules/objfmts/bin/tests/float-err.errwarn
+++ b/modules/objfmts/bin/tests/float-err.errwarn
@@ -1,8 +1,8 @@
-./src/objfmts/bin/tests/float-err.asm:2: invalid floating point constant size
-./src/objfmts/bin/tests/float-err.asm:3: invalid floating point constant size
-./src/objfmts/bin/tests/float-err.asm:4: overflow in floating point expression
-./src/objfmts/bin/tests/float-err.asm:5: underflow in floating point expression
-./src/objfmts/bin/tests/float-err.asm:8: invalid floating point constant size
-./src/objfmts/bin/tests/float-err.asm:9: invalid floating point constant size
-./src/objfmts/bin/tests/float-err.asm:11: overflow in floating point expression
-./src/objfmts/bin/tests/float-err.asm:12: underflow in floating point expression
+-:2: invalid floating point constant size
+-:3: invalid floating point constant size
+-:4: overflow in floating point expression
+-:5: underflow in floating point expression
+-:8: invalid floating point constant size
+-:9: invalid floating point constant size
+-:11: overflow in floating point expression
+-:12: underflow in floating point expression
diff --git a/modules/objfmts/bin/tests/integer-warn.errwarn b/modules/objfmts/bin/tests/integer-warn.errwarn
index 973e8d39..09d82f10 100644
--- a/modules/objfmts/bin/tests/integer-warn.errwarn
+++ b/modules/objfmts/bin/tests/integer-warn.errwarn
@@ -1,2 +1,2 @@
-./src/objfmts/bin/tests/integer-warn.asm:5: warning: Numeric constant too large for internal format
-./src/objfmts/bin/tests/integer-warn.asm:6: warning: Numeric constant too large for internal format
+-:5: warning: Numeric constant too large for internal format
+-:6: warning: Numeric constant too large for internal format
diff --git a/modules/objfmts/bin/tests/reserve-err.errwarn b/modules/objfmts/bin/tests/reserve-err.errwarn
index 0203a4c9..25fb790a 100644
--- a/modules/objfmts/bin/tests/reserve-err.errwarn
+++ b/modules/objfmts/bin/tests/reserve-err.errwarn
@@ -1,6 +1,6 @@
-./src/objfmts/bin/tests/reserve-err.asm:4: expression must not contain floating point value
-./src/objfmts/bin/tests/reserve-err.asm:5: expression must not contain floating point value
-./src/objfmts/bin/tests/reserve-err.asm:7: attempt to reserve non-constant quantity of space
-./src/objfmts/bin/tests/reserve-err.asm:11: expression must not contain floating point value
-./src/objfmts/bin/tests/reserve-err.asm:12: expression must not contain floating point value
-./src/objfmts/bin/tests/reserve-err.asm:14: attempt to reserve non-constant quantity of space
+-:4: expression must not contain floating point value
+-:5: expression must not contain floating point value
+-:7: attempt to reserve non-constant quantity of space
+-:11: expression must not contain floating point value
+-:12: expression must not contain floating point value
+-:14: attempt to reserve non-constant quantity of space
diff --git a/modules/objfmts/bin/tests/reserve.errwarn b/modules/objfmts/bin/tests/reserve.errwarn
index 48d4cc0c..fb0d7223 100644
--- a/modules/objfmts/bin/tests/reserve.errwarn
+++ b/modules/objfmts/bin/tests/reserve.errwarn
@@ -1,4 +1,4 @@
-./src/objfmts/bin/tests/reserve.asm:2: warning: uninitialized space declared in code/data section: zeroing
-./src/objfmts/bin/tests/reserve.asm:3: warning: uninitialized space declared in code/data section: zeroing
-./src/objfmts/bin/tests/reserve.asm:4: warning: uninitialized space declared in code/data section: zeroing
-./src/objfmts/bin/tests/reserve.asm:5: warning: uninitialized space declared in code/data section: zeroing
+-:2: warning: uninitialized space declared in code/data section: zeroing
+-:3: warning: uninitialized space declared in code/data section: zeroing
+-:4: warning: uninitialized space declared in code/data section: zeroing
+-:5: warning: uninitialized space declared in code/data section: zeroing
diff --git a/out_test.sh b/out_test.sh
index 64b90f2b..7adc1d25 100755
--- a/out_test.sh
+++ b/out_test.sh
@@ -20,14 +20,14 @@ for asm in ${srcdir}/$2/*.asm
 do
     a=`echo ${asm} | sed 's,^.*/,,;s,.asm$,,'`
     o=${a}$5
-    oh=${o}.hx
+    oh=${a}.hx
     og=`echo ${asm} | sed 's,.asm$,.hex,'`
     e=${a}.ew
     eg=`echo ${asm} | sed 's,.asm$,.errwarn,'`
 
     echo $ECHO_N "$1: Testing $3 for ${a} return value ... $ECHO_C"
     # Run within a subshell to prevent signal messages from displaying.
-    sh -c "./yasm $4 ${asm} -o ${o} 2>${e}" 2>/dev/null
+    sh -c "cat ${asm} | ./yasm $4 -o ${o} 2>${e}" 2>/dev/null
     status=$?
     if test $status -gt 128; then
 	# We should never get a coredump!
@@ -44,9 +44,10 @@ do
 	    passedct=`expr $passedct + 1`
 	    echo $ECHO_N "$1: Testing $3 for ${a} error/warnings ... $ECHO_C"
 	    # We got errors, check to see if they match:
-    	    cat ${e} | sed "s,${srcdir}/,./," >${e}.2
-    	    mv ${e}.2 ${e}
-	    if diff -w ${eg} ${e} > /dev/null; then
+    	    #cat ${e} | sed "s,${srcdir}/,./," >${e}.2
+    	    #mv ${e}.2 ${e}
+	    diff -w ${eg} ${e} > /dev/null
+	    if test $? -eq 0; then
 		# Error/warnings match, it passes!
 		echo "PASS."
 		passedct=`expr $passedct + 1`
@@ -67,13 +68,15 @@ do
 	    passedct=`expr $passedct + 1`
 	    echo $ECHO_N "$1: Testing $3 for ${a} output file ... $ECHO_C"
 	    ${PERL} ${srcdir}/test_hd.pl ${o} > ${oh}
-	    if diff ${og} ${oh} > /dev/null; then
+	    diff ${og} ${oh} > /dev/null
+	    if test $? -eq 0; then
 		echo "PASS."
 		passedct=`expr $passedct + 1`
 		echo $ECHO_N "$1: Testing $3 for ${a} error/warnings ... $ECHO_C"
-		cat ${e} | sed "s,${srcdir}/,./," >${e}.2
-		mv ${e}.2 ${e}
-		if diff -w ${eg} ${e} > /dev/null; then
+		#cat ${e} | sed "s,${srcdir}/,./," >${e}.2
+		#mv ${e}.2 ${e}
+		diff -w ${eg} ${e} > /dev/null
+		if test $? -eq 0; then
 		    # Both object file and error/warnings match, it passes!
 		    echo "PASS."
 		    passedct=`expr $passedct + 1`
diff --git a/src/arch/x86/tests/addrop-err.errwarn b/src/arch/x86/tests/addrop-err.errwarn
index 500ba51f..72040ee7 100644
--- a/src/arch/x86/tests/addrop-err.errwarn
+++ b/src/arch/x86/tests/addrop-err.errwarn
@@ -1 +1 @@
-./src/arch/x86/tests/addrop-err.asm:2: invalid effective address (displacement size)
+-:2: invalid effective address (displacement size)
diff --git a/src/arch/x86/tests/cpubasic-err.errwarn b/src/arch/x86/tests/cpubasic-err.errwarn
index b89784fc..c278d28d 100644
--- a/src/arch/x86/tests/cpubasic-err.errwarn
+++ b/src/arch/x86/tests/cpubasic-err.errwarn
@@ -1 +1 @@
-./src/arch/x86/tests/cpubasic-err.asm:2: invalid combination of opcode and operands
+-:2: invalid combination of opcode and operands
diff --git a/src/arch/x86/tests/div-err.errwarn b/src/arch/x86/tests/div-err.errwarn
index aab24906..4b6340e7 100644
--- a/src/arch/x86/tests/div-err.errwarn
+++ b/src/arch/x86/tests/div-err.errwarn
@@ -1,4 +1,4 @@
-./src/arch/x86/tests/div-err.asm:1: cannot override register size
-./src/arch/x86/tests/div-err.asm:3: cannot override register size
-./src/arch/x86/tests/div-err.asm:4: cannot override register size
-./src/arch/x86/tests/div-err.asm:5: cannot override register size
+-:1: cannot override register size
+-:3: cannot override register size
+-:4: cannot override register size
+-:5: cannot override register size
diff --git a/src/arch/x86/tests/lds-err.errwarn b/src/arch/x86/tests/lds-err.errwarn
index 5f1faa1e..601d1d06 100644
--- a/src/arch/x86/tests/lds-err.errwarn
+++ b/src/arch/x86/tests/lds-err.errwarn
@@ -1,4 +1,4 @@
-./src/arch/x86/tests/lds-err.asm:2: invalid combination of opcode and operands
-./src/arch/x86/tests/lds-err.asm:3: invalid combination of opcode and operands
-./src/arch/x86/tests/lds-err.asm:5: invalid combination of opcode and operands
-./src/arch/x86/tests/lds-err.asm:6: invalid combination of opcode and operands
+-:2: invalid combination of opcode and operands
+-:3: invalid combination of opcode and operands
+-:5: invalid combination of opcode and operands
+-:6: invalid combination of opcode and operands
diff --git a/src/arch/x86/tests/opsize-err.errwarn b/src/arch/x86/tests/opsize-err.errwarn
index 5b884bd8..c8ebb1e4 100644
--- a/src/arch/x86/tests/opsize-err.errwarn
+++ b/src/arch/x86/tests/opsize-err.errwarn
@@ -1 +1 @@
-./src/arch/x86/tests/opsize-err.asm:3: invalid combination of opcode and operands
+-:3: invalid combination of opcode and operands
diff --git a/src/objfmts/bin/tests/float-err.errwarn b/src/objfmts/bin/tests/float-err.errwarn
index 469e7e45..f890432d 100644
--- a/src/objfmts/bin/tests/float-err.errwarn
+++ b/src/objfmts/bin/tests/float-err.errwarn
@@ -1,8 +1,8 @@
-./src/objfmts/bin/tests/float-err.asm:2: invalid floating point constant size
-./src/objfmts/bin/tests/float-err.asm:3: invalid floating point constant size
-./src/objfmts/bin/tests/float-err.asm:4: overflow in floating point expression
-./src/objfmts/bin/tests/float-err.asm:5: underflow in floating point expression
-./src/objfmts/bin/tests/float-err.asm:8: invalid floating point constant size
-./src/objfmts/bin/tests/float-err.asm:9: invalid floating point constant size
-./src/objfmts/bin/tests/float-err.asm:11: overflow in floating point expression
-./src/objfmts/bin/tests/float-err.asm:12: underflow in floating point expression
+-:2: invalid floating point constant size
+-:3: invalid floating point constant size
+-:4: overflow in floating point expression
+-:5: underflow in floating point expression
+-:8: invalid floating point constant size
+-:9: invalid floating point constant size
+-:11: overflow in floating point expression
+-:12: underflow in floating point expression
diff --git a/src/objfmts/bin/tests/integer-warn.errwarn b/src/objfmts/bin/tests/integer-warn.errwarn
index 973e8d39..09d82f10 100644
--- a/src/objfmts/bin/tests/integer-warn.errwarn
+++ b/src/objfmts/bin/tests/integer-warn.errwarn
@@ -1,2 +1,2 @@
-./src/objfmts/bin/tests/integer-warn.asm:5: warning: Numeric constant too large for internal format
-./src/objfmts/bin/tests/integer-warn.asm:6: warning: Numeric constant too large for internal format
+-:5: warning: Numeric constant too large for internal format
+-:6: warning: Numeric constant too large for internal format
diff --git a/src/objfmts/bin/tests/reserve-err.errwarn b/src/objfmts/bin/tests/reserve-err.errwarn
index 0203a4c9..25fb790a 100644
--- a/src/objfmts/bin/tests/reserve-err.errwarn
+++ b/src/objfmts/bin/tests/reserve-err.errwarn
@@ -1,6 +1,6 @@
-./src/objfmts/bin/tests/reserve-err.asm:4: expression must not contain floating point value
-./src/objfmts/bin/tests/reserve-err.asm:5: expression must not contain floating point value
-./src/objfmts/bin/tests/reserve-err.asm:7: attempt to reserve non-constant quantity of space
-./src/objfmts/bin/tests/reserve-err.asm:11: expression must not contain floating point value
-./src/objfmts/bin/tests/reserve-err.asm:12: expression must not contain floating point value
-./src/objfmts/bin/tests/reserve-err.asm:14: attempt to reserve non-constant quantity of space
+-:4: expression must not contain floating point value
+-:5: expression must not contain floating point value
+-:7: attempt to reserve non-constant quantity of space
+-:11: expression must not contain floating point value
+-:12: expression must not contain floating point value
+-:14: attempt to reserve non-constant quantity of space
diff --git a/src/objfmts/bin/tests/reserve.errwarn b/src/objfmts/bin/tests/reserve.errwarn
index 48d4cc0c..fb0d7223 100644
--- a/src/objfmts/bin/tests/reserve.errwarn
+++ b/src/objfmts/bin/tests/reserve.errwarn
@@ -1,4 +1,4 @@
-./src/objfmts/bin/tests/reserve.asm:2: warning: uninitialized space declared in code/data section: zeroing
-./src/objfmts/bin/tests/reserve.asm:3: warning: uninitialized space declared in code/data section: zeroing
-./src/objfmts/bin/tests/reserve.asm:4: warning: uninitialized space declared in code/data section: zeroing
-./src/objfmts/bin/tests/reserve.asm:5: warning: uninitialized space declared in code/data section: zeroing
+-:2: warning: uninitialized space declared in code/data section: zeroing
+-:3: warning: uninitialized space declared in code/data section: zeroing
+-:4: warning: uninitialized space declared in code/data section: zeroing
+-:5: warning: uninitialized space declared in code/data section: zeroing