diff -Naur simulavr/regress/test_opcodes/test_COM.py milkymist/cores/softusb/navre_regress/test_opcodes/test_COM.py
--- simulavr/regress/test_opcodes/test_COM.py	2010-08-15 12:04:19.000000000 +0200
+++ milkymist/cores/softusb/navre_regress/test_opcodes/test_COM.py	2010-08-15 22:19:39.000000000 +0200
@@ -58,7 +58,7 @@
 		got = self.anal_regs[self.Rd]
 		
 		if expect != got:
-			self.fail('COM r%02d: 0x%02x & 0x%02x = (expect=%02x, got=%02x)' % (
+			self.fail('COM r%02d: 0x%02x = (expect=%02x, got=%02x)' % (
 				self.Rd, self.Vd, expect, got))
 
 		expect_sreg = 0
diff -Naur simulavr/regress/test_opcodes/test_NEG.py milkymist/cores/softusb/navre_regress/test_opcodes/test_NEG.py
--- simulavr/regress/test_opcodes/test_NEG.py	2010-08-15 12:04:19.000000000 +0200
+++ milkymist/cores/softusb/navre_regress/test_opcodes/test_NEG.py	2010-08-15 22:18:28.000000000 +0200
@@ -58,7 +58,7 @@
 		got = self.anal_regs[self.Rd]
 		
 		if expect != got:
-			self.fail('NEG r%02d: 0x%02x & 0x%02x = (expect=%02x, got=%02x)' % (
+			self.fail('NEG r%02d: 0x%02x = (expect=%02x, got=%02x)' % (
 				self.Rd, self.Vd, expect, got))
 
 		expect_sreg = 0
diff -Naur simulavr/regress/test_opcodes/test_SBRC.py milkymist/cores/softusb/navre_regress/test_opcodes/test_SBRC.py
--- simulavr/regress/test_opcodes/test_SBRC.py	2010-08-15 12:04:19.000000000 +0200
+++ milkymist/cores/softusb/navre_regress/test_opcodes/test_SBRC.py	2010-08-15 22:18:04.000000000 +0200
@@ -84,7 +84,7 @@
 	v = %d
 	ni = %d
 	def fail(self,s):
-		raise SBRC_r%03d_b%d_v%02x_ni%d_TestFail, s
+		raise SBRC_r%02d_b%d_v%02x_ni%d_TestFail, s
 """
 
 #
diff -Naur simulavr/regress/test_opcodes/test_SBRS.py milkymist/cores/softusb/navre_regress/test_opcodes/test_SBRS.py
--- simulavr/regress/test_opcodes/test_SBRS.py	2010-08-15 12:04:19.000000000 +0200
+++ milkymist/cores/softusb/navre_regress/test_opcodes/test_SBRS.py	2010-08-15 22:19:17.000000000 +0200
@@ -84,7 +84,7 @@
 	v = %d
 	ni = %d
 	def fail(self,s):
-		raise SRBS_r%03d_b%d_v%02x_ni%d_TestFail, s
+		raise SRBS_r%02d_b%d_v%02x_ni%d_TestFail, s
 """
 
 #
