Cleanup and added ASCIIZ test

pyasm/asm_tests/tests/aalpha

@@ -1,7 +1,7 @@
-; test file, old syntax tests
+; test file, new syntax
         org     0100
         law     1
         hlt
         end
-;|0100 004001
-;|0101 000000
+;|$1   004000 + 1
+;|     000000

pyasm/asm_tests/tests/aalpha.NEW

@@ -1,7 +0,0 @@
-; test file, new syntax
-        org     0100
-        law     1
-        hlt
-        end
-;|$1   004000 + 1
-;|     000000

pyasm/asm_tests/tests/alpha

@@ -4,6 +4,6 @@
         hlt
         end
 
-;!0100 004002       ; is actually 004001
-;|0101 000000
-;!0102 000001       ; address outside block
+;!$1   004000 + 2   ; is actually 004001
+;|     000000
+;!     000001       ; address outside block

pyasm/asm_tests/tests/alpha.NEW

@@ -1,9 +0,0 @@
-; deliberate errors at lines 7 and 9
-        org     0100
-        law     1
-        hlt
-        end
-
-;!$1   004000 + 2   ; is actually 004001
-;|     000000
-;!     000001       ; address outside block

pyasm/asm_tests/tests/asciiz

@@ -0,0 +1,21 @@
+; test ASCIIZ pseudo-op
+        org     0100
+
+print   equ     0200
+
+start   law     str
+        jms     print
+        hlt
+
+str     asciiz  'str'
+str2    asciiz  'str0'
+
+        end     start
+;|$1   0004000+.+3
+;|     0034000+0200
+;|     0000000
+;|     0071564   ; 'st'
+;|     0071000   ; 'r\0'
+;|     0071564   ; 'st'
+;|     0071060   ; 'r0'
+;|     0000000   ; zero byte

pyasm/asm_tests/tests/beta

@@ -6,7 +6,7 @@
         law     2
         hlt
         end
-;|0100 004001
-;|0101 000000
-;|0200 004002
-;|0201 000000
+;|$1   004000 + 1
+;|     000000
+;|$2   004000 + 2
+;|     000000

pyasm/asm_tests/tests/beta.NEW

@@ -1,12 +0,0 @@
-; test file with two ORG blocks
-        org     0100
-        law     1
-        hlt
-        org     0200
-        law     2
-        hlt
-        end
-;|$1   004000 + 1
-;|     000000
-;|$2   004000 + 2
-;|     000000

pyasm/asm_tests/tests/kappa

@@ -8,7 +8,7 @@
         hlt
         end
 
-;|0100 004001
-;|0101 000000
-;|0102 004002
-;|0103 000000
+;|$1   004000 + 1
+;|     000000
+;|     004000 + 2
+;|     000000

pyasm/asm_tests/tests/kappa.NEW

@@ -1,14 +0,0 @@
-; test file with two adjacent ORG blocks
-        org     0100
-        law     1
-        hlt
-
-        org     0102
-        law     2
-        hlt
-        end
-
-;|$1   004000 + 1
-;|     000000
-;|     004000 + 2
-;|     000000