summaryrefslogtreecommitdiffstats
path: root/tests/zscanner/data
diff options
context:
space:
mode:
authorDaniel Salzman <daniel.salzman@nic.cz>2018-03-12 11:16:20 +0100
committerDaniel Salzman <daniel.salzman@nic.cz>2018-03-12 13:37:09 +0100
commit9bddf37934cb30bd2a262e4cec94f849b7bf4263 (patch)
treee376ef8502cfad54ffb24207ce8ac354d789c578 /tests/zscanner/data
parentdnssec: move to libdnssec (diff)
downloadknot-9bddf37934cb30bd2a262e4cec94f849b7bf4263.tar.xz
knot-9bddf37934cb30bd2a262e4cec94f849b7bf4263.zip
zscanner: move to libzscanner
Diffstat (limited to 'tests/zscanner/data')
-rw-r--r--tests/zscanner/data/00-0_general.in24
-rw-r--r--tests/zscanner/data/00-0_general.out68
-rw-r--r--tests/zscanner/data/00-1_general.in7
-rw-r--r--tests/zscanner/data/00-1_general.out2
-rw-r--r--tests/zscanner/data/00-2_general.in1
-rw-r--r--tests/zscanner/data/00-2_general.out2
-rw-r--r--tests/zscanner/data/00-3_general.in4
-rw-r--r--tests/zscanner/data/00-3_general.out6
-rw-r--r--tests/zscanner/data/00-4_general.in0
-rw-r--r--tests/zscanner/data/00-4_general.out0
-rw-r--r--tests/zscanner/data/01_owner.in37
-rw-r--r--tests/zscanner/data/01_owner.out138
-rw-r--r--tests/zscanner/data/02_class.in10
-rw-r--r--tests/zscanner/data/02_class.out16
-rw-r--r--tests/zscanner/data/03_rrttl.in26
-rw-r--r--tests/zscanner/data/03_rrttl.out100
-rw-r--r--tests/zscanner/data/04-0_ORIGIN.in29
-rw-r--r--tests/zscanner/data/04-0_ORIGIN.out86
-rw-r--r--tests/zscanner/data/04-1_ORIGIN.in4
-rw-r--r--tests/zscanner/data/04-1_ORIGIN.out2
-rw-r--r--tests/zscanner/data/04-2_ORIGIN.in4
-rw-r--r--tests/zscanner/data/04-2_ORIGIN.out2
-rw-r--r--tests/zscanner/data/04-3_ORIGIN.in4
-rw-r--r--tests/zscanner/data/04-3_ORIGIN.out2
-rw-r--r--tests/zscanner/data/04-4_ORIGIN.in4
-rw-r--r--tests/zscanner/data/04-4_ORIGIN.out2
-rw-r--r--tests/zscanner/data/04-5_ORIGIN.in4
-rw-r--r--tests/zscanner/data/04-5_ORIGIN.out2
-rw-r--r--tests/zscanner/data/04-6_ORIGIN.in4
-rw-r--r--tests/zscanner/data/04-6_ORIGIN.out2
-rw-r--r--tests/zscanner/data/04-7_ORIGIN.in4
-rw-r--r--tests/zscanner/data/04-7_ORIGIN.out2
-rw-r--r--tests/zscanner/data/04-8_ORIGIN.in4
-rw-r--r--tests/zscanner/data/04-8_ORIGIN.out2
-rw-r--r--tests/zscanner/data/04-9_ORIGIN.in4
-rw-r--r--tests/zscanner/data/04-9_ORIGIN.out2
-rw-r--r--tests/zscanner/data/05-0_TTL.in36
-rw-r--r--tests/zscanner/data/05-0_TTL.out92
-rw-r--r--tests/zscanner/data/05-1_TTL.in4
-rw-r--r--tests/zscanner/data/05-1_TTL.out2
-rw-r--r--tests/zscanner/data/05-2_TTL.in4
-rw-r--r--tests/zscanner/data/05-2_TTL.out2
-rw-r--r--tests/zscanner/data/05-3_TTL.in4
-rw-r--r--tests/zscanner/data/05-3_TTL.out2
-rw-r--r--tests/zscanner/data/05-4_TTL.in4
-rw-r--r--tests/zscanner/data/05-4_TTL.out2
-rw-r--r--tests/zscanner/data/06-0_INCLUDE.in29
-rw-r--r--tests/zscanner/data/06-0_INCLUDE.out138
-rw-r--r--tests/zscanner/data/06-1_INCLUDE.in5
-rw-r--r--tests/zscanner/data/06-1_INCLUDE.out2
-rw-r--r--tests/zscanner/data/06-2_INCLUDE.in5
-rw-r--r--tests/zscanner/data/06-2_INCLUDE.out2
-rw-r--r--tests/zscanner/data/06-3_INCLUDE.in5
-rw-r--r--tests/zscanner/data/06-3_INCLUDE.out2
-rw-r--r--tests/zscanner/data/06-4_INCLUDE.in5
-rw-r--r--tests/zscanner/data/06-4_INCLUDE.out2
-rw-r--r--tests/zscanner/data/06-5_INCLUDE.in5
-rw-r--r--tests/zscanner/data/06-5_INCLUDE.out0
-rw-r--r--tests/zscanner/data/06-6_INCLUDE.in5
-rw-r--r--tests/zscanner/data/06-6_INCLUDE.out4
-rw-r--r--tests/zscanner/data/06-7_INCLUDE.in5
-rw-r--r--tests/zscanner/data/06-7_INCLUDE.out4
-rw-r--r--tests/zscanner/data/06-8_INCLUDE.in5
-rw-r--r--tests/zscanner/data/06-8_INCLUDE.out12
-rw-r--r--tests/zscanner/data/07-0-rdata.in1
-rw-r--r--tests/zscanner/data/07-0-rdata.out2
-rw-r--r--tests/zscanner/data/07-1-rdata.in1
-rw-r--r--tests/zscanner/data/07-1-rdata.out2
-rw-r--r--tests/zscanner/data/07-2-rdata.in1
-rw-r--r--tests/zscanner/data/07-2-rdata.out6
-rw-r--r--tests/zscanner/data/07-3-rdata.in1
-rw-r--r--tests/zscanner/data/07-3-rdata.out6
-rw-r--r--tests/zscanner/data/07-4-rdata.in1
-rw-r--r--tests/zscanner/data/07-4-rdata.out6
-rw-r--r--tests/zscanner/data/10_A.in19
-rw-r--r--tests/zscanner/data/10_A.out50
-rw-r--r--tests/zscanner/data/11_AAAA.in21
-rw-r--r--tests/zscanner/data/11_AAAA.out62
-rw-r--r--tests/zscanner/data/12_TXT.in37
-rw-r--r--tests/zscanner/data/12_TXT.out138
-rw-r--r--tests/zscanner/data/13_SPF.in14
-rw-r--r--tests/zscanner/data/13_SPF.out32
-rw-r--r--tests/zscanner/data/14_NS.in38
-rw-r--r--tests/zscanner/data/14_NS.out144
-rw-r--r--tests/zscanner/data/15_CNAME.in14
-rw-r--r--tests/zscanner/data/15_CNAME.out32
-rw-r--r--tests/zscanner/data/16_PTR.in14
-rw-r--r--tests/zscanner/data/16_PTR.out32
-rw-r--r--tests/zscanner/data/17_DNAME.in14
-rw-r--r--tests/zscanner/data/17_DNAME.out32
-rw-r--r--tests/zscanner/data/18_MX.in23
-rw-r--r--tests/zscanner/data/18_MX.out62
-rw-r--r--tests/zscanner/data/19_AFSDB.in14
-rw-r--r--tests/zscanner/data/19_AFSDB.out32
-rw-r--r--tests/zscanner/data/20_RT.in14
-rw-r--r--tests/zscanner/data/20_RT.out32
-rw-r--r--tests/zscanner/data/21_KX.in14
-rw-r--r--tests/zscanner/data/21_KX.out32
-rw-r--r--tests/zscanner/data/22_HINFO.in26
-rw-r--r--tests/zscanner/data/22_HINFO.out88
-rw-r--r--tests/zscanner/data/23_MINFO.in18
-rw-r--r--tests/zscanner/data/23_MINFO.out48
-rw-r--r--tests/zscanner/data/24_RP.in14
-rw-r--r--tests/zscanner/data/24_RP.out32
-rw-r--r--tests/zscanner/data/25_SOA.in31
-rw-r--r--tests/zscanner/data/25_SOA.out74
-rw-r--r--tests/zscanner/data/26_SRV.in25
-rw-r--r--tests/zscanner/data/26_SRV.out66
-rw-r--r--tests/zscanner/data/27_NAPTR.in20
-rw-r--r--tests/zscanner/data/27_NAPTR.out56
-rw-r--r--tests/zscanner/data/28_TYPE.in27
-rw-r--r--tests/zscanner/data/28_TYPE.out64
-rw-r--r--tests/zscanner/data/29_CERT.in58
-rw-r--r--tests/zscanner/data/29_CERT.out244
-rw-r--r--tests/zscanner/data/30_KEY.in31
-rw-r--r--tests/zscanner/data/30_KEY.out86
-rw-r--r--tests/zscanner/data/31_DNSKEY.in32
-rw-r--r--tests/zscanner/data/31_DNSKEY.out92
-rw-r--r--tests/zscanner/data/32_APL.in30
-rw-r--r--tests/zscanner/data/32_APL.out104
-rw-r--r--tests/zscanner/data/33_DS.in23
-rw-r--r--tests/zscanner/data/33_DS.out62
-rw-r--r--tests/zscanner/data/34_SSHFP.in21
-rw-r--r--tests/zscanner/data/34_SSHFP.out54
-rw-r--r--tests/zscanner/data/35_IPSECKEY.in29
-rw-r--r--tests/zscanner/data/35_IPSECKEY.out94
-rw-r--r--tests/zscanner/data/36_RRSIG.in45
-rw-r--r--tests/zscanner/data/36_RRSIG.out134
-rw-r--r--tests/zscanner/data/37_NSEC.in20
-rw-r--r--tests/zscanner/data/37_NSEC.out64
-rw-r--r--tests/zscanner/data/38_DHCID.in26
-rw-r--r--tests/zscanner/data/38_DHCID.out72
-rw-r--r--tests/zscanner/data/39_NSEC3.in46
-rw-r--r--tests/zscanner/data/39_NSEC3.out144
-rw-r--r--tests/zscanner/data/40_NSEC3PARAM.in23
-rw-r--r--tests/zscanner/data/40_NSEC3PARAM.out58
-rw-r--r--tests/zscanner/data/41_TLSA.in21
-rw-r--r--tests/zscanner/data/41_TLSA.out54
-rw-r--r--tests/zscanner/data/42_LOC.in64
-rw-r--r--tests/zscanner/data/42_LOC.out248
-rw-r--r--tests/zscanner/data/43_EUI48.in22
-rw-r--r--tests/zscanner/data/43_EUI48.out60
-rw-r--r--tests/zscanner/data/44_EUI64.in22
-rw-r--r--tests/zscanner/data/44_EUI64.out60
-rw-r--r--tests/zscanner/data/45_NID.in14
-rw-r--r--tests/zscanner/data/45_NID.out32
-rw-r--r--tests/zscanner/data/46_L32.in21
-rw-r--r--tests/zscanner/data/46_L32.out54
-rw-r--r--tests/zscanner/data/47_L64.in23
-rw-r--r--tests/zscanner/data/47_L64.out62
-rw-r--r--tests/zscanner/data/48_LP.in14
-rw-r--r--tests/zscanner/data/48_LP.out32
-rw-r--r--tests/zscanner/data/49_CDS.in23
-rw-r--r--tests/zscanner/data/49_CDS.out62
-rw-r--r--tests/zscanner/data/50_CDNSKEY.in32
-rw-r--r--tests/zscanner/data/50_CDNSKEY.out92
-rw-r--r--tests/zscanner/data/51_URI.in22
-rw-r--r--tests/zscanner/data/51_URI.out60
-rw-r--r--tests/zscanner/data/52_CAA.in23
-rw-r--r--tests/zscanner/data/52_CAA.out70
-rw-r--r--tests/zscanner/data/includes/include19
-rw-r--r--tests/zscanner/data/includes/include26
-rw-r--r--tests/zscanner/data/includes/include30
-rw-r--r--tests/zscanner/data/includes/include41
-rw-r--r--tests/zscanner/data/includes/include51
-rw-r--r--tests/zscanner/data/includes/include61
166 files changed, 0 insertions, 5326 deletions
diff --git a/tests/zscanner/data/00-0_general.in b/tests/zscanner/data/00-0_general.in
deleted file mode 100644
index de9c3f079..000000000
--- a/tests/zscanner/data/00-0_general.in
+++ /dev/null
@@ -1,24 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-t01 IN 10 NS @ ; All items are mentioned
- IN 10 NS @ ; Same as above without OWNER
-t02 20 IN NS @ ; Switched CLASS and TTL
- 20 IN NS @ ; Same as above without OWNER
-t03 30 NS @ ; Missing CLASS
- 30 NS @ ; Same as above without OWNER
-t04 IN NS @ ; Missing TTL
- IN NS @ ; Same as above without OWNER
-t05 NS @ ; Missing CLASS and TTL
- NS @ ; Same as above without OWNER
-
-@ ( ) NS ( ; Multiline 1/5
- ) () ( ; Multiline 2/5
-
- @ ; Multiline 4/5
- ) (
-) ; Multiline 6/6
-
-; KO
-@ NS ((@)) ; Nested parentheses - ERROR = STOP PROCESSING!
diff --git a/tests/zscanner/data/00-0_general.out b/tests/zscanner/data/00-0_general.out
deleted file mode 100644
index 9acf1cbf2..000000000
--- a/tests/zscanner/data/00-0_general.out
+++ /dev/null
@@ -1,68 +0,0 @@
-OWNER=0374303100
-CLASS=0001
-RRTTL=0000000A
-RTYPE=0002
-RDATA=00
-------
-OWNER=0374303100
-CLASS=0001
-RRTTL=0000000A
-RTYPE=0002
-RDATA=00
-------
-OWNER=0374303200
-CLASS=0001
-RRTTL=00000014
-RTYPE=0002
-RDATA=00
-------
-OWNER=0374303200
-CLASS=0001
-RRTTL=00000014
-RTYPE=0002
-RDATA=00
-------
-OWNER=0374303300
-CLASS=0001
-RRTTL=0000001E
-RTYPE=0002
-RDATA=00
-------
-OWNER=0374303300
-CLASS=0001
-RRTTL=0000001E
-RTYPE=0002
-RDATA=00
-------
-OWNER=0374303400
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=0374303400
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=0374303500
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=0374303500
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-ERROR=ZS_LEFT_PARENTHESIS
-------
diff --git a/tests/zscanner/data/00-1_general.in b/tests/zscanner/data/00-1_general.in
deleted file mode 100644
index 24239098c..000000000
--- a/tests/zscanner/data/00-1_general.in
+++ /dev/null
@@ -1,7 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; KO
-@ TXT ( "text" ; Unclosed multiline block
-
-;comment
diff --git a/tests/zscanner/data/00-1_general.out b/tests/zscanner/data/00-1_general.out
deleted file mode 100644
index 85b0653c3..000000000
--- a/tests/zscanner/data/00-1_general.out
+++ /dev/null
@@ -1,2 +0,0 @@
-ERROR=ZS_UNCLOSED_MULTILINE
-------
diff --git a/tests/zscanner/data/00-2_general.in b/tests/zscanner/data/00-2_general.in
deleted file mode 100644
index 460eeb512..000000000
--- a/tests/zscanner/data/00-2_general.in
+++ /dev/null
@@ -1 +0,0 @@
-$ORIGIN .
diff --git a/tests/zscanner/data/00-2_general.out b/tests/zscanner/data/00-2_general.out
deleted file mode 100644
index 79776a7bc..000000000
--- a/tests/zscanner/data/00-2_general.out
+++ /dev/null
@@ -1,2 +0,0 @@
-ERROR=ZS_DOS_NEWLINE
-------
diff --git a/tests/zscanner/data/00-3_general.in b/tests/zscanner/data/00-3_general.in
deleted file mode 100644
index 6ce107c5a..000000000
--- a/tests/zscanner/data/00-3_general.in
+++ /dev/null
@@ -1,4 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-. NS @ ; No newline \ No newline at end of file
diff --git a/tests/zscanner/data/00-3_general.out b/tests/zscanner/data/00-3_general.out
deleted file mode 100644
index bc066729d..000000000
--- a/tests/zscanner/data/00-3_general.out
+++ /dev/null
@@ -1,6 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
diff --git a/tests/zscanner/data/00-4_general.in b/tests/zscanner/data/00-4_general.in
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/zscanner/data/00-4_general.in
+++ /dev/null
diff --git a/tests/zscanner/data/00-4_general.out b/tests/zscanner/data/00-4_general.out
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/zscanner/data/00-4_general.out
+++ /dev/null
diff --git a/tests/zscanner/data/01_owner.in b/tests/zscanner/data/01_owner.in
deleted file mode 100644
index 0108be3e8..000000000
--- a/tests/zscanner/data/01_owner.in
+++ /dev/null
@@ -1,37 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-. NS @ ; The simplest owner
-tld. NS @ ; FQD tld owner
-tld NS @ ; Relative form
- NS @ ; The previous owner
-*. NS @ ; FQD with asterisk
-* NS @ ; Alone asterisk
-*.* NS @ ; More asterisks
-*a.a*a.** NS @ ; Also possible
-@ NS @ ; Use origin
-0123456789 NS @ ; Digits
-0/25.2.0.192.in-addr.arpa. NS @ ; CIDR notation
-_a_.-b-c-./d/. NS @ ; Allowed characters '_' '-' '/' anywhere
-ABCDEFGHIJKLMNOPQRSTUVWXYZ NS @ ; All upper-case letters
-abcdefghijklmnopqrstuvwxyz NS @ ; All lower-case letters
-\000\0320\ \\\"\.\@\*.tld. NS @ ; Label with special chars
-b.a.9.8.7.6.5.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa. NS @ ; IPv6 reverse
-12345678901234567890123456789012345678901234567890123456789012\051.tld. NS @ ; Label of maximal length
-123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901. NS @ ; Domain name of maximal length
-123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901 NS @ ; Domain name of maximal length (after appending origin)
-
-; KO
-& NS @ ; Bad (unslashed) character
- NS @ ; Bad previous
-.a NS @ ; Leading dot
-@@ NS @ ; Double @@
-.. NS @ ; Missing label between dots
-\1 NS @ ; Slash notation requires 3 digits
-\12 NS @ ; Slash notation requires 3 digits
-12345678901234567890123456789012345678901234567890123456789012\0514.tld. NS @ ; Label exceeded maximal length
-123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012. NS @ ; Domain name exceeded maximal length
-123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012 NS @ ; Domain name exceeded maximal length (after appending origin)
-123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.1 NS @ ; Domain name exceeded maximal length (maximal dname length check is after each valid label)
-123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.123456789012345678901234567890123456789012345678901234567890123 NS @ ; Domain name exceeded maximal length (maximal dname length check is after each valid label)
diff --git a/tests/zscanner/data/01_owner.out b/tests/zscanner/data/01_owner.out
deleted file mode 100644
index 26a8454c8..000000000
--- a/tests/zscanner/data/01_owner.out
+++ /dev/null
@@ -1,138 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=03746C6400
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=03746C6400
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=03746C6400
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=012A00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=012A00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=012A012A00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=022A6103612A61022A2A00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=0A3031323334353637383900
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=04302F3235013201300331393207696E2D61646472046172706100
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=035F615F052D622D632D032F642F00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=1A4142434445464748494A4B4C4D4E4F505152535455565758595A00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=1A6162636465666768696A6B6C6D6E6F707172737475767778797A00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=09002030205C222E402A03746C6400
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=0162016101390138013701360135013001300130013001300130013001300130013001300130013001300130013001300138016201640130013101300130013203697036046172706100
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=3F31323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323303746C6400
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=3F3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333F3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333F3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333D3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303100
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=3F3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333F3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333F3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333D3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303100
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-WARNG=ZS_BAD_OWNER
-------
-WARNG=ZS_BAD_PREVIOUS_OWNER
-------
-WARNG=ZS_BAD_DNAME_CHAR
-------
-WARNG=ZS_BAD_DNAME_CHAR
-------
-WARNG=ZS_BAD_DNAME_CHAR
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_LABEL_OVERFLOW
-------
-WARNG=ZS_DNAME_OVERFLOW
-------
-WARNG=ZS_DNAME_OVERFLOW
-------
-WARNG=ZS_DNAME_OVERFLOW
-------
-WARNG=ZS_DNAME_OVERFLOW
-------
diff --git a/tests/zscanner/data/02_class.in b/tests/zscanner/data/02_class.in
deleted file mode 100644
index c4347e710..000000000
--- a/tests/zscanner/data/02_class.in
+++ /dev/null
@@ -1,10 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ IN NS @ ; The only accepted class IN
-@ in NS @ ; Class in lower-case
-
-; KO
-@ CH NS @ ; Unsupported class
-@ CLASS1 NS @ ; Unsupported notation
diff --git a/tests/zscanner/data/02_class.out b/tests/zscanner/data/02_class.out
deleted file mode 100644
index 69daae31d..000000000
--- a/tests/zscanner/data/02_class.out
+++ /dev/null
@@ -1,16 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-WARNG=ZS_UNSUPPORTED_TYPE
-------
-WARNG=ZS_UNSUPPORTED_TYPE
-------
diff --git a/tests/zscanner/data/03_rrttl.in b/tests/zscanner/data/03_rrttl.in
deleted file mode 100644
index 7c57d734b..000000000
--- a/tests/zscanner/data/03_rrttl.in
+++ /dev/null
@@ -1,26 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ 0 NS @ ; Minimal ttl
-@ 3600 NS @ ; Inner value
-@ 4294967295 NS @ ; Maximal ttl
-@ 1S NS @ ; 1 second (upper-case)
-@ 1s NS @ ; 1 second (lower-case)
-@ 1M NS @ ; 1 minute (upper-case)
-@ 1m NS @ ; 1 minute (lower-case)
-@ 1H NS @ ; 1 hour (upper-case)
-@ 1h NS @ ; 1 hour (lower-case)
-@ 1D NS @ ; 1 day (upper-case)
-@ 1d NS @ ; 1 day (lower-case)
-@ 1W NS @ ; 1 week (upper-case)
-@ 1w NS @ ; 1 week (lower-case)
-@ 1w1d1h1m1s NS @ ; More time units
-@ 1s1m1m NS @ ; Same time units, non decreasing order
-
-; KO
-@ -1 NS @ ; Negative ttl
-@ 4294967296 NS @ ; 32bit overflow
-@ 100000000W NS @ ; 32bit overflow
-@ 4294967295s1w NS @ ; 32bit overflow
-@ 1x NS @ ; Unknown time unit
diff --git a/tests/zscanner/data/03_rrttl.out b/tests/zscanner/data/03_rrttl.out
deleted file mode 100644
index f5cc90767..000000000
--- a/tests/zscanner/data/03_rrttl.out
+++ /dev/null
@@ -1,100 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000000
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000E10
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=FFFFFFFF
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=0000003C
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=0000003C
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000E10
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000E10
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00015180
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00015180
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00093A80
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00093A80
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=000A9A4D
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000079
-RTYPE=0002
-RDATA=00
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_NUMBER32_OVERFLOW
-------
-WARNG=ZS_NUMBER32_OVERFLOW
-------
-WARNG=ZS_NUMBER32_OVERFLOW
-------
-WARNG=ZS_BAD_TIME_UNIT
-------
diff --git a/tests/zscanner/data/04-0_ORIGIN.in b/tests/zscanner/data/04-0_ORIGIN.in
deleted file mode 100644
index 4d65ec4a5..000000000
--- a/tests/zscanner/data/04-0_ORIGIN.in
+++ /dev/null
@@ -1,29 +0,0 @@
-$TTL 1
-
-; OK
-$ORIGIN . ; Root domain
-@ NS @ ; Use origin
-a. NS @ ; Absolute dname
-a NS @ ; Relative dname
-$ORIGIN tld. ; 1. level domain
-@ NS @ ; Use origin
-a. NS @ ; Absolute dname
-a NS @ ; Relative dname
-$ORIGIN second.tld. ; 2. level domain
-@ NS @ ; Use origin
-a. NS @ ; Absolute dname
-a NS @ ; Relative dname
-$ORIGIN \0320\ \\\"\.\@\*.tld. ; Label with special chars
-@ NS @ ; Use origin
-$ORIGIN b.a.9.8.7.6.5.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa. ; IPv6 reverse
-@ NS @ ; Use origin
-$ORIGIN 12345678901234567890123456789012345678901234567890123456789012\051.tld. ; Label of maximal length
-@ NS @ ; Use origin
-$ORIGIN 123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901. ; Domain name of maximal length
-@ NS @ ; Use origin
-$origin . ; Lower-case
-@ NS @ ; Use origin
-
-; KO
-$ORIGIN ; Empty input
-. NS . ; Is OK, but shouldn't be processed due to previous error stop!
diff --git a/tests/zscanner/data/04-0_ORIGIN.out b/tests/zscanner/data/04-0_ORIGIN.out
deleted file mode 100644
index 92dc459fe..000000000
--- a/tests/zscanner/data/04-0_ORIGIN.out
+++ /dev/null
@@ -1,86 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=016100
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=016100
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=03746C6400
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=03746C6400
-------
-OWNER=016100
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=03746C6400
-------
-OWNER=016103746C6400
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=03746C6400
-------
-OWNER=067365636F6E6403746C6400
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=067365636F6E6403746C6400
-------
-OWNER=016100
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=067365636F6E6403746C6400
-------
-OWNER=0161067365636F6E6403746C6400
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=067365636F6E6403746C6400
-------
-OWNER=082030205C222E402A03746C6400
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=082030205C222E402A03746C6400
-------
-OWNER=0162016101390138013701360135013001300130013001300130013001300130013001300130013001300130013001300138016201640130013101300130013203697036046172706100
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=0162016101390138013701360135013001300130013001300130013001300130013001300130013001300130013001300138016201640130013101300130013203697036046172706100
-------
-OWNER=3F31323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323303746C6400
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=3F31323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323303746C6400
-------
-OWNER=3F3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333F3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333F3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333D3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303100
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=3F3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333F3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333F3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333D3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303100
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-ERROR=ZS_BAD_ORIGIN
-------
diff --git a/tests/zscanner/data/04-1_ORIGIN.in b/tests/zscanner/data/04-1_ORIGIN.in
deleted file mode 100644
index 871c0645e..000000000
--- a/tests/zscanner/data/04-1_ORIGIN.in
+++ /dev/null
@@ -1,4 +0,0 @@
-$TTL 1
-
-; KO
-$ORIGIN tld ; Not FQD
diff --git a/tests/zscanner/data/04-1_ORIGIN.out b/tests/zscanner/data/04-1_ORIGIN.out
deleted file mode 100644
index 467de10a8..000000000
--- a/tests/zscanner/data/04-1_ORIGIN.out
+++ /dev/null
@@ -1,2 +0,0 @@
-ERROR=ZS_BAD_ORIGIN
-------
diff --git a/tests/zscanner/data/04-2_ORIGIN.in b/tests/zscanner/data/04-2_ORIGIN.in
deleted file mode 100644
index 8dd2e2026..000000000
--- a/tests/zscanner/data/04-2_ORIGIN.in
+++ /dev/null
@@ -1,4 +0,0 @@
-$TTL 1
-
-; KO
-$ORIGIN % ; Bad (unslashed) character
diff --git a/tests/zscanner/data/04-2_ORIGIN.out b/tests/zscanner/data/04-2_ORIGIN.out
deleted file mode 100644
index 467de10a8..000000000
--- a/tests/zscanner/data/04-2_ORIGIN.out
+++ /dev/null
@@ -1,2 +0,0 @@
-ERROR=ZS_BAD_ORIGIN
-------
diff --git a/tests/zscanner/data/04-3_ORIGIN.in b/tests/zscanner/data/04-3_ORIGIN.in
deleted file mode 100644
index 26d187269..000000000
--- a/tests/zscanner/data/04-3_ORIGIN.in
+++ /dev/null
@@ -1,4 +0,0 @@
-$TTL 1
-
-; KO
-$ORIGIN .. ; Missing label between dots
diff --git a/tests/zscanner/data/04-3_ORIGIN.out b/tests/zscanner/data/04-3_ORIGIN.out
deleted file mode 100644
index b7d67e510..000000000
--- a/tests/zscanner/data/04-3_ORIGIN.out
+++ /dev/null
@@ -1,2 +0,0 @@
-ERROR=ZS_BAD_REST
-------
diff --git a/tests/zscanner/data/04-4_ORIGIN.in b/tests/zscanner/data/04-4_ORIGIN.in
deleted file mode 100644
index 0be4721ff..000000000
--- a/tests/zscanner/data/04-4_ORIGIN.in
+++ /dev/null
@@ -1,4 +0,0 @@
-$TTL 1
-
-; KO
-$ORIGIN \1 ; Slash notation requires 3 digits
diff --git a/tests/zscanner/data/04-4_ORIGIN.out b/tests/zscanner/data/04-4_ORIGIN.out
deleted file mode 100644
index 03a073855..000000000
--- a/tests/zscanner/data/04-4_ORIGIN.out
+++ /dev/null
@@ -1,2 +0,0 @@
-ERROR=ZS_BAD_NUMBER
-------
diff --git a/tests/zscanner/data/04-5_ORIGIN.in b/tests/zscanner/data/04-5_ORIGIN.in
deleted file mode 100644
index 170d465f8..000000000
--- a/tests/zscanner/data/04-5_ORIGIN.in
+++ /dev/null
@@ -1,4 +0,0 @@
-$TTL 1
-
-; KO
-$ORIGIN \12 ; Slash notation requires 3 digits
diff --git a/tests/zscanner/data/04-5_ORIGIN.out b/tests/zscanner/data/04-5_ORIGIN.out
deleted file mode 100644
index 03a073855..000000000
--- a/tests/zscanner/data/04-5_ORIGIN.out
+++ /dev/null
@@ -1,2 +0,0 @@
-ERROR=ZS_BAD_NUMBER
-------
diff --git a/tests/zscanner/data/04-6_ORIGIN.in b/tests/zscanner/data/04-6_ORIGIN.in
deleted file mode 100644
index db9652d8b..000000000
--- a/tests/zscanner/data/04-6_ORIGIN.in
+++ /dev/null
@@ -1,4 +0,0 @@
-$TTL 1
-
-; KO
-$ORIGIN .tld ; Leading dot
diff --git a/tests/zscanner/data/04-6_ORIGIN.out b/tests/zscanner/data/04-6_ORIGIN.out
deleted file mode 100644
index b7d67e510..000000000
--- a/tests/zscanner/data/04-6_ORIGIN.out
+++ /dev/null
@@ -1,2 +0,0 @@
-ERROR=ZS_BAD_REST
-------
diff --git a/tests/zscanner/data/04-7_ORIGIN.in b/tests/zscanner/data/04-7_ORIGIN.in
deleted file mode 100644
index 556646c85..000000000
--- a/tests/zscanner/data/04-7_ORIGIN.in
+++ /dev/null
@@ -1,4 +0,0 @@
-$TTL 1
-
-; KO
-$ORIGIN tld. x ; Unexpected item
diff --git a/tests/zscanner/data/04-7_ORIGIN.out b/tests/zscanner/data/04-7_ORIGIN.out
deleted file mode 100644
index b7d67e510..000000000
--- a/tests/zscanner/data/04-7_ORIGIN.out
+++ /dev/null
@@ -1,2 +0,0 @@
-ERROR=ZS_BAD_REST
-------
diff --git a/tests/zscanner/data/04-8_ORIGIN.in b/tests/zscanner/data/04-8_ORIGIN.in
deleted file mode 100644
index 445cbec7d..000000000
--- a/tests/zscanner/data/04-8_ORIGIN.in
+++ /dev/null
@@ -1,4 +0,0 @@
-$TTL 1
-
-; KO
-$ORIGIN 12345678901234567890123456789012345678901234567890123456789012\0514.tld. ; Label exceeded maximal length
diff --git a/tests/zscanner/data/04-8_ORIGIN.out b/tests/zscanner/data/04-8_ORIGIN.out
deleted file mode 100644
index 788a4958a..000000000
--- a/tests/zscanner/data/04-8_ORIGIN.out
+++ /dev/null
@@ -1,2 +0,0 @@
-ERROR=ZS_LABEL_OVERFLOW
-------
diff --git a/tests/zscanner/data/04-9_ORIGIN.in b/tests/zscanner/data/04-9_ORIGIN.in
deleted file mode 100644
index e0a4b9582..000000000
--- a/tests/zscanner/data/04-9_ORIGIN.in
+++ /dev/null
@@ -1,4 +0,0 @@
-$TTL 1
-
-; KO
-$ORIGIN 123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012. ; Domain name exceeded maximal length
diff --git a/tests/zscanner/data/04-9_ORIGIN.out b/tests/zscanner/data/04-9_ORIGIN.out
deleted file mode 100644
index eef0ab560..000000000
--- a/tests/zscanner/data/04-9_ORIGIN.out
+++ /dev/null
@@ -1,2 +0,0 @@
-ERROR=ZS_DNAME_OVERFLOW
-------
diff --git a/tests/zscanner/data/05-0_TTL.in b/tests/zscanner/data/05-0_TTL.in
deleted file mode 100644
index baa8f38d2..000000000
--- a/tests/zscanner/data/05-0_TTL.in
+++ /dev/null
@@ -1,36 +0,0 @@
-$ORIGIN .
-
-; OK
-$TTL 0 ; Minimal ttl
-@ NS @ ; Use ttl
-$TTL 3600 ; Inner value
-@ NS @ ; Use ttl
-$TTL 4294967295 ; Maximal ttl
-@ NS @ ; Use ttl
-$TTL 1S ; 1 second (upper-case)
-@ NS @ ; Use ttl
-$TTL 1s ; 1 second (lower-case)
-@ NS @ ; Use ttl
-$TTL 1M ; 1 minute (upper-case)
-@ NS @ ; Use ttl
-$TTL 1m ; 1 minute (lower-case)
-@ NS @ ; Use ttl
-$TTL 1H ; 1 hour (upper-case)
-@ NS @ ; Use ttl
-$TTL 1h ; 1 hour (lower-case)
-@ NS @ ; Use ttl
-$TTL 1D ; 1 day (upper-case)
-@ NS @ ; Use ttl
-$TTL 1d ; 1 day (lower-case)
-@ NS @ ; Use ttl
-$TTL 1W ; 1 week (upper-case)
-@ NS @ ; Use ttl
-$TTL 1w ; 1 week (lower-case)
-@ NS @ ; Use ttl
-$TTL 1w1d1h1m1s ; More time units
-@ NS @ ; Use ttl
-$TTL 1s1m1m ; Same time units, non decreasing order
-@ NS @ ; Use ttl
-
-; KO
-$TTL -1 ; Negative ttl
diff --git a/tests/zscanner/data/05-0_TTL.out b/tests/zscanner/data/05-0_TTL.out
deleted file mode 100644
index 93c765161..000000000
--- a/tests/zscanner/data/05-0_TTL.out
+++ /dev/null
@@ -1,92 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000000
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000E10
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=FFFFFFFF
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=0000003C
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=0000003C
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000E10
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000E10
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00015180
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00015180
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00093A80
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00093A80
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=000A9A4D
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000079
-RTYPE=0002
-RDATA=00
-------
-ERROR=ZS_BAD_NUMBER
-------
diff --git a/tests/zscanner/data/05-1_TTL.in b/tests/zscanner/data/05-1_TTL.in
deleted file mode 100644
index 519fe79cc..000000000
--- a/tests/zscanner/data/05-1_TTL.in
+++ /dev/null
@@ -1,4 +0,0 @@
-$ORIGIN .
-
-; KO
-$TTL 4294967296 ; 32bit overflow
diff --git a/tests/zscanner/data/05-1_TTL.out b/tests/zscanner/data/05-1_TTL.out
deleted file mode 100644
index 18492671d..000000000
--- a/tests/zscanner/data/05-1_TTL.out
+++ /dev/null
@@ -1,2 +0,0 @@
-ERROR=ZS_NUMBER32_OVERFLOW
-------
diff --git a/tests/zscanner/data/05-2_TTL.in b/tests/zscanner/data/05-2_TTL.in
deleted file mode 100644
index ed112daa4..000000000
--- a/tests/zscanner/data/05-2_TTL.in
+++ /dev/null
@@ -1,4 +0,0 @@
-$ORIGIN .
-
-; KO
-$TTL 100000000W ; 32bit overflow
diff --git a/tests/zscanner/data/05-2_TTL.out b/tests/zscanner/data/05-2_TTL.out
deleted file mode 100644
index 18492671d..000000000
--- a/tests/zscanner/data/05-2_TTL.out
+++ /dev/null
@@ -1,2 +0,0 @@
-ERROR=ZS_NUMBER32_OVERFLOW
-------
diff --git a/tests/zscanner/data/05-3_TTL.in b/tests/zscanner/data/05-3_TTL.in
deleted file mode 100644
index d96c9ba7c..000000000
--- a/tests/zscanner/data/05-3_TTL.in
+++ /dev/null
@@ -1,4 +0,0 @@
-$ORIGIN .
-
-; KO
-$TTL 4294967295s1w ; 32bit overflow
diff --git a/tests/zscanner/data/05-3_TTL.out b/tests/zscanner/data/05-3_TTL.out
deleted file mode 100644
index 18492671d..000000000
--- a/tests/zscanner/data/05-3_TTL.out
+++ /dev/null
@@ -1,2 +0,0 @@
-ERROR=ZS_NUMBER32_OVERFLOW
-------
diff --git a/tests/zscanner/data/05-4_TTL.in b/tests/zscanner/data/05-4_TTL.in
deleted file mode 100644
index efaf4d0f5..000000000
--- a/tests/zscanner/data/05-4_TTL.in
+++ /dev/null
@@ -1,4 +0,0 @@
-$ORIGIN .
-
-; KO
-$TTL 1x ; Unknown time unit
diff --git a/tests/zscanner/data/05-4_TTL.out b/tests/zscanner/data/05-4_TTL.out
deleted file mode 100644
index d4bef9895..000000000
--- a/tests/zscanner/data/05-4_TTL.out
+++ /dev/null
@@ -1,2 +0,0 @@
-ERROR=ZS_BAD_TIME_UNIT
-------
diff --git a/tests/zscanner/data/06-0_INCLUDE.in b/tests/zscanner/data/06-0_INCLUDE.in
deleted file mode 100644
index 962e6c949..000000000
--- a/tests/zscanner/data/06-0_INCLUDE.in
+++ /dev/null
@@ -1,29 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-0. NS @
-
-$INCLUDE ./includes/include1 ; Relative path without origin
-1. NS @
-
-$INCLUDE "./includes/include2" . ; Quoted filename and the simplest origin
-2. NS @
-
-$INCLUDE ./includes/include\050 tld. ; Simple origin
-3. NS @
-
-$INCLUDE \./includes/include2 _a_.-b-c-./d/. ; Slashed character in file name, allowed characters in origin
-4. NS @
-
-$INCLUDE ./includes/include2 \0320\ \\\"\.\@\*.tld. ; Origin with special chars
-5. NS @
-
-$INCLUDE @TMPDIR@/includes/include2 ; Absolute path without origin
-6. NS @
-
-$INCLUDE @TMPDIR@/includes/include2 tld. ; Absolute path with origin
-7. NS @
-
-; KO (DISABLED - different results)
-;$INCLUDE ; Empty parameters
diff --git a/tests/zscanner/data/06-0_INCLUDE.out b/tests/zscanner/data/06-0_INCLUDE.out
deleted file mode 100644
index 2536f727d..000000000
--- a/tests/zscanner/data/06-0_INCLUDE.out
+++ /dev/null
@@ -1,138 +0,0 @@
-OWNER=013000
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=016100
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=016105746C64316100
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=05746C64316100
-------
-OWNER=016105746C64316200
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=05746C64316200
-------
-OWNER=013100
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=016200
-CLASS=0001
-RRTTL=00000E10
-RTYPE=0002
-RDATA=00
-------
-OWNER=016205746C64316100
-CLASS=0001
-RRTTL=00000E10
-RTYPE=0002
-RDATA=05746C64316100
-------
-OWNER=013200
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=016203746C6400
-CLASS=0001
-RRTTL=00000E10
-RTYPE=0002
-RDATA=03746C6400
-------
-OWNER=016205746C64316100
-CLASS=0001
-RRTTL=00000E10
-RTYPE=0002
-RDATA=05746C64316100
-------
-OWNER=013300
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=0162035F615F052D622D632D032F642F00
-CLASS=0001
-RRTTL=00000E10
-RTYPE=0002
-RDATA=035F615F052D622D632D032F642F00
-------
-OWNER=016205746C64316100
-CLASS=0001
-RRTTL=00000E10
-RTYPE=0002
-RDATA=05746C64316100
-------
-OWNER=013400
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=0162082030205C222E402A03746C6400
-CLASS=0001
-RRTTL=00000E10
-RTYPE=0002
-RDATA=082030205C222E402A03746C6400
-------
-OWNER=016205746C64316100
-CLASS=0001
-RRTTL=00000E10
-RTYPE=0002
-RDATA=05746C64316100
-------
-OWNER=013500
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=016200
-CLASS=0001
-RRTTL=00000E10
-RTYPE=0002
-RDATA=00
-------
-OWNER=016205746C64316100
-CLASS=0001
-RRTTL=00000E10
-RTYPE=0002
-RDATA=05746C64316100
-------
-OWNER=013600
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=016203746C6400
-CLASS=0001
-RRTTL=00000E10
-RTYPE=0002
-RDATA=03746C6400
-------
-OWNER=016205746C64316100
-CLASS=0001
-RRTTL=00000E10
-RTYPE=0002
-RDATA=05746C64316100
-------
-OWNER=013700
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
diff --git a/tests/zscanner/data/06-1_INCLUDE.in b/tests/zscanner/data/06-1_INCLUDE.in
deleted file mode 100644
index 194fb5292..000000000
--- a/tests/zscanner/data/06-1_INCLUDE.in
+++ /dev/null
@@ -1,5 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; KO
-$INCLUDE ./includes/include1 a ; Origin is not FQDN
diff --git a/tests/zscanner/data/06-1_INCLUDE.out b/tests/zscanner/data/06-1_INCLUDE.out
deleted file mode 100644
index 663492132..000000000
--- a/tests/zscanner/data/06-1_INCLUDE.out
+++ /dev/null
@@ -1,2 +0,0 @@
-ERROR=ZS_BAD_INCLUDE_ORIGIN
-------
diff --git a/tests/zscanner/data/06-2_INCLUDE.in b/tests/zscanner/data/06-2_INCLUDE.in
deleted file mode 100644
index 21bcf0539..000000000
--- a/tests/zscanner/data/06-2_INCLUDE.in
+++ /dev/null
@@ -1,5 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; KO
-$INCLUDE ./includes/include1 % ; Bad origin
diff --git a/tests/zscanner/data/06-2_INCLUDE.out b/tests/zscanner/data/06-2_INCLUDE.out
deleted file mode 100644
index 663492132..000000000
--- a/tests/zscanner/data/06-2_INCLUDE.out
+++ /dev/null
@@ -1,2 +0,0 @@
-ERROR=ZS_BAD_INCLUDE_ORIGIN
-------
diff --git a/tests/zscanner/data/06-3_INCLUDE.in b/tests/zscanner/data/06-3_INCLUDE.in
deleted file mode 100644
index f7079b4db..000000000
--- a/tests/zscanner/data/06-3_INCLUDE.in
+++ /dev/null
@@ -1,5 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; KO
-$INCLUDE @TMPDIR@/ ; Given file is a directory
diff --git a/tests/zscanner/data/06-3_INCLUDE.out b/tests/zscanner/data/06-3_INCLUDE.out
deleted file mode 100644
index 6823154d0..000000000
--- a/tests/zscanner/data/06-3_INCLUDE.out
+++ /dev/null
@@ -1,2 +0,0 @@
-ERROR=ZS_FILE_INVALID
-------
diff --git a/tests/zscanner/data/06-4_INCLUDE.in b/tests/zscanner/data/06-4_INCLUDE.in
deleted file mode 100644
index 3cdc79de9..000000000
--- a/tests/zscanner/data/06-4_INCLUDE.in
+++ /dev/null
@@ -1,5 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; KO
-$INCLUDE @TMPDIR@/file-doesnt-exist ; File doesn't exist
diff --git a/tests/zscanner/data/06-4_INCLUDE.out b/tests/zscanner/data/06-4_INCLUDE.out
deleted file mode 100644
index e09e5d1cf..000000000
--- a/tests/zscanner/data/06-4_INCLUDE.out
+++ /dev/null
@@ -1,2 +0,0 @@
-ERROR=ZS_FILE_OPEN
-------
diff --git a/tests/zscanner/data/06-5_INCLUDE.in b/tests/zscanner/data/06-5_INCLUDE.in
deleted file mode 100644
index 1d658120c..000000000
--- a/tests/zscanner/data/06-5_INCLUDE.in
+++ /dev/null
@@ -1,5 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; KO
-$INCLUDE ./includes/include3 ; Blank include file
diff --git a/tests/zscanner/data/06-5_INCLUDE.out b/tests/zscanner/data/06-5_INCLUDE.out
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/zscanner/data/06-5_INCLUDE.out
+++ /dev/null
diff --git a/tests/zscanner/data/06-6_INCLUDE.in b/tests/zscanner/data/06-6_INCLUDE.in
deleted file mode 100644
index cbfda6493..000000000
--- a/tests/zscanner/data/06-6_INCLUDE.in
+++ /dev/null
@@ -1,5 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; KO
-$INCLUDE ./includes/include4 ; Include file contains warning
diff --git a/tests/zscanner/data/06-6_INCLUDE.out b/tests/zscanner/data/06-6_INCLUDE.out
deleted file mode 100644
index a9c0259b4..000000000
--- a/tests/zscanner/data/06-6_INCLUDE.out
+++ /dev/null
@@ -1,4 +0,0 @@
-WARNG=ZS_BAD_RDATA
-------
-ERROR=ZS_UNPROCESSED_INCLUDE
-------
diff --git a/tests/zscanner/data/06-7_INCLUDE.in b/tests/zscanner/data/06-7_INCLUDE.in
deleted file mode 100644
index 24deef71f..000000000
--- a/tests/zscanner/data/06-7_INCLUDE.in
+++ /dev/null
@@ -1,5 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; KO
-$INCLUDE ./includes/include5 ; Include file contains error
diff --git a/tests/zscanner/data/06-7_INCLUDE.out b/tests/zscanner/data/06-7_INCLUDE.out
deleted file mode 100644
index cbbb0c188..000000000
--- a/tests/zscanner/data/06-7_INCLUDE.out
+++ /dev/null
@@ -1,4 +0,0 @@
-ERROR=ZS_BAD_NUMBER
-------
-ERROR=ZS_UNPROCESSED_INCLUDE
-------
diff --git a/tests/zscanner/data/06-8_INCLUDE.in b/tests/zscanner/data/06-8_INCLUDE.in
deleted file mode 100644
index c856668a7..000000000
--- a/tests/zscanner/data/06-8_INCLUDE.in
+++ /dev/null
@@ -1,5 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; KO
-$INCLUDE ./includes/include6 ; Include file contains include
diff --git a/tests/zscanner/data/06-8_INCLUDE.out b/tests/zscanner/data/06-8_INCLUDE.out
deleted file mode 100644
index 4581388e7..000000000
--- a/tests/zscanner/data/06-8_INCLUDE.out
+++ /dev/null
@@ -1,12 +0,0 @@
-OWNER=016200
-CLASS=0001
-RRTTL=00000E10
-RTYPE=0002
-RDATA=00
-------
-OWNER=016205746C64316100
-CLASS=0001
-RRTTL=00000E10
-RTYPE=0002
-RDATA=05746C64316100
-------
diff --git a/tests/zscanner/data/07-0-rdata.in b/tests/zscanner/data/07-0-rdata.in
deleted file mode 100644
index a79403f04..000000000
--- a/tests/zscanner/data/07-0-rdata.in
+++ /dev/null
@@ -1 +0,0 @@
-@ A \ \ No newline at end of file
diff --git a/tests/zscanner/data/07-0-rdata.out b/tests/zscanner/data/07-0-rdata.out
deleted file mode 100644
index ed303f60b..000000000
--- a/tests/zscanner/data/07-0-rdata.out
+++ /dev/null
@@ -1,2 +0,0 @@
-WARNG=ZS_BAD_ADDRESS_CHAR
-------
diff --git a/tests/zscanner/data/07-1-rdata.in b/tests/zscanner/data/07-1-rdata.in
deleted file mode 100644
index 7a5a11ac9..000000000
--- a/tests/zscanner/data/07-1-rdata.in
+++ /dev/null
@@ -1 +0,0 @@
-@ TXT \ \ No newline at end of file
diff --git a/tests/zscanner/data/07-1-rdata.out b/tests/zscanner/data/07-1-rdata.out
deleted file mode 100644
index 1702677c2..000000000
--- a/tests/zscanner/data/07-1-rdata.out
+++ /dev/null
@@ -1,2 +0,0 @@
-WARNG=ZS_BAD_NUMBER
-------
diff --git a/tests/zscanner/data/07-2-rdata.in b/tests/zscanner/data/07-2-rdata.in
deleted file mode 100644
index 7a4c8fe5e..000000000
--- a/tests/zscanner/data/07-2-rdata.in
+++ /dev/null
@@ -1 +0,0 @@
-@ TXT \092 \ No newline at end of file
diff --git a/tests/zscanner/data/07-2-rdata.out b/tests/zscanner/data/07-2-rdata.out
deleted file mode 100644
index 3f52437e5..000000000
--- a/tests/zscanner/data/07-2-rdata.out
+++ /dev/null
@@ -1,6 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000000
-RTYPE=0010
-RDATA=015C
-------
diff --git a/tests/zscanner/data/07-3-rdata.in b/tests/zscanner/data/07-3-rdata.in
deleted file mode 100644
index 338b212ed..000000000
--- a/tests/zscanner/data/07-3-rdata.in
+++ /dev/null
@@ -1 +0,0 @@
-@ TXT \\ \ No newline at end of file
diff --git a/tests/zscanner/data/07-3-rdata.out b/tests/zscanner/data/07-3-rdata.out
deleted file mode 100644
index 3f52437e5..000000000
--- a/tests/zscanner/data/07-3-rdata.out
+++ /dev/null
@@ -1,6 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000000
-RTYPE=0010
-RDATA=015C
-------
diff --git a/tests/zscanner/data/07-4-rdata.in b/tests/zscanner/data/07-4-rdata.in
deleted file mode 100644
index 74a45dd61..000000000
--- a/tests/zscanner/data/07-4-rdata.in
+++ /dev/null
@@ -1 +0,0 @@
-@ TXT \# 2 015C \ No newline at end of file
diff --git a/tests/zscanner/data/07-4-rdata.out b/tests/zscanner/data/07-4-rdata.out
deleted file mode 100644
index 3f52437e5..000000000
--- a/tests/zscanner/data/07-4-rdata.out
+++ /dev/null
@@ -1,6 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000000
-RTYPE=0010
-RDATA=015C
-------
diff --git a/tests/zscanner/data/10_A.in b/tests/zscanner/data/10_A.in
deleted file mode 100644
index 6c7c90a61..000000000
--- a/tests/zscanner/data/10_A.in
+++ /dev/null
@@ -1,19 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ A 0.0.0.0 ; Minimal ipv4 address
-@ A 255.255.255.255 ; Maximal ipv4 address
-@ A \# 4 00000000 ; Hexadecimal rdata
-@ TYPE1 \# 4 00000000 ; TYPE + Hexadecimal rdata
-@ TYPE1 0.0.0.0 ; TYPE
-@ a 0.0.0.0 ; Type in lower-case
-
-; KO
-@ A
-@ A ; Empty rdata
-@ A \# 0 ; Hex empty rdata
-@ A 0.0.0.256 ; 8bit overflow
-@ A 0.0.0 ; Short address
-@ A 0.0.0.A ; Bad character
-@ A 0.0.0.0 1.1.1.1 ; Unexpected item
diff --git a/tests/zscanner/data/10_A.out b/tests/zscanner/data/10_A.out
deleted file mode 100644
index dda68abbd..000000000
--- a/tests/zscanner/data/10_A.out
+++ /dev/null
@@ -1,50 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0001
-RDATA=00000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0001
-RDATA=FFFFFFFF
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0001
-RDATA=00000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0001
-RDATA=00000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0001
-RDATA=00000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0001
-RDATA=00000000
-------
-WARNG=ZS_BAD_ADDRESS_CHAR
-------
-WARNG=ZS_BAD_ADDRESS_CHAR
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_IPV4
-------
-WARNG=ZS_BAD_IPV4
-------
-WARNG=ZS_BAD_ADDRESS_CHAR
-------
-WARNG=ZS_BAD_REST
-------
diff --git a/tests/zscanner/data/11_AAAA.in b/tests/zscanner/data/11_AAAA.in
deleted file mode 100644
index 48c4b37fa..000000000
--- a/tests/zscanner/data/11_AAAA.in
+++ /dev/null
@@ -1,21 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ AAAA 0:0:0:0:0:0:0:0 ; Minimal ipv6 address
-@ AAAA FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF ; Maximal ipv6 address
-@ AAAA \# 16 00000000 00000000 00000000 00000000 ; Hexadecimal rdata
-@ TYPE28 \# 16 00000000 00000000 00000000 00000000 ; TYPE + Hexadecimal rdata
-@ TYPE28 0:0:0:0:0:0:0:0 ; TYPE
-@ AAAA 0::1.2.3.4 ; ipv6 address based on ipv4 address
-@ AAAA :: ; Double colon
-@ aaAA :: ; Type in lower-case
-
-; KO
-@ AAAA
-@ AAAA ; Empty rdata
-@ AAAA \# 0 ; Hex empty rdata
-@ AAAA 0::FFFFF ; 16bit overflow
-@ AAAA 0:0:0:0:0:0:0 ; Short address
-@ AAAA 0:0:0:0:0:0:0:X ; Bad character
-@ AAAA :: :: ; Unexpected item
diff --git a/tests/zscanner/data/11_AAAA.out b/tests/zscanner/data/11_AAAA.out
deleted file mode 100644
index 0cb174a49..000000000
--- a/tests/zscanner/data/11_AAAA.out
+++ /dev/null
@@ -1,62 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001C
-RDATA=00000000000000000000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001C
-RDATA=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001C
-RDATA=00000000000000000000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001C
-RDATA=00000000000000000000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001C
-RDATA=00000000000000000000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001C
-RDATA=00000000000000000000000001020304
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001C
-RDATA=00000000000000000000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001C
-RDATA=00000000000000000000000000000000
-------
-WARNG=ZS_BAD_ADDRESS_CHAR
-------
-WARNG=ZS_BAD_ADDRESS_CHAR
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_IPV6
-------
-WARNG=ZS_BAD_IPV6
-------
-WARNG=ZS_BAD_ADDRESS_CHAR
-------
-WARNG=ZS_BAD_REST
-------
diff --git a/tests/zscanner/data/12_TXT.in b/tests/zscanner/data/12_TXT.in
deleted file mode 100644
index cdd0eaa5e..000000000
--- a/tests/zscanner/data/12_TXT.in
+++ /dev/null
@@ -1,37 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ TXT "" ; Blank string
-@ TXT a ; One char string
-@ TXT \ ; One space char
-@ TXT "\ " ; One space char in quotes
-@ TXT \021 ; One unprintable char
-@ TXT "\\ \"" ; Special chars
-@ TXT "" "test1" "\255" test2 ; Array of text strings
-@ TXT "" "" "" ; Array of blank strings
-@ TXT first \# "\#" ; Array with special string
-@ TXT \0320\ \\\"\;\.\@\*.tld. ; Special domain as a string
-@ TXT " !\"#$%&'()*+,-./0123456789:;<=>?@" ; First part of all printables
-@ TXT "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`" ; Second part of all printables
-@ TXT "abcdefghijklmnopqrstuvwxyz{|}~" ; Third part of all printables
-@ TXT \# 1 00 ; Hexadecimal rdata
-@ TYPE16 \# 1 00 ; TYPE + Hexadecimal rdata
-@ TYPE16 "" ; TYPE
-@ TXT ( ; Special multi-line string
-"first
-second"
-third ; Second string
-)
-@ TXT "abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNabcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNabcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNabcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNabcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMN1234\053" ; Text string of maximal length (255 chars)
-@ TXT "abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNabcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNabcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNabcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNabcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMN1234\0536" ; Minimum overflowed text string which should be divided into two strings.
-@ TXT "abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNabcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNabcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNabcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNabcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMN1234\053\054" ; Minimum overflowed text string which should be divided into two strings (decimal version).
-@ txt "" ; Type in lower-case
-
-; KO
-@ TXT
-@ TXT ; Empty rdata
-@ TXT \# 0 ; Hex empty rdata
-@ TXT \01 ; Missing digit in decimal notation
-@ TXT \256 ; 8bit overflow in decimal notation
-@ TXT """ ; '"' char without forward slash
diff --git a/tests/zscanner/data/12_TXT.out b/tests/zscanner/data/12_TXT.out
deleted file mode 100644
index 283b1e0b3..000000000
--- a/tests/zscanner/data/12_TXT.out
+++ /dev/null
@@ -1,138 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0010
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0010
-RDATA=0161
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0010
-RDATA=0120
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0010
-RDATA=0120
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0010
-RDATA=0115
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0010
-RDATA=035C2022
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0010
-RDATA=0005746573743101FF057465737432
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0010
-RDATA=000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0010
-RDATA=05666972737401230123
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0010
-RDATA=0E2030205C223B2E402A2E746C642E
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0010
-RDATA=21202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F40
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0010
-RDATA=204142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F60
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0010
-RDATA=1E6162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0010
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0010
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0010
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0010
-RDATA=0C66697273740A7365636F6E64057468697264
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0010
-RDATA=FF6162636465666768696A6B6C6D6E6F707172737475767778797A313233343536373839304142434445464748494A4B4C4D4E6162636465666768696A6B6C6D6E6F707172737475767778797A313233343536373839304142434445464748494A4B4C4D4E6162636465666768696A6B6C6D6E6F707172737475767778797A313233343536373839304142434445464748494A4B4C4D4E6162636465666768696A6B6C6D6E6F707172737475767778797A313233343536373839304142434445464748494A4B4C4D4E6162636465666768696A6B6C6D6E6F707172737475767778797A313233343536373839304142434445464748494A4B4C4D4E3132333435
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0010
-RDATA=FF6162636465666768696A6B6C6D6E6F707172737475767778797A313233343536373839304142434445464748494A4B4C4D4E6162636465666768696A6B6C6D6E6F707172737475767778797A313233343536373839304142434445464748494A4B4C4D4E6162636465666768696A6B6C6D6E6F707172737475767778797A313233343536373839304142434445464748494A4B4C4D4E6162636465666768696A6B6C6D6E6F707172737475767778797A313233343536373839304142434445464748494A4B4C4D4E6162636465666768696A6B6C6D6E6F707172737475767778797A313233343536373839304142434445464748494A4B4C4D4E31323334350136
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0010
-RDATA=FF6162636465666768696A6B6C6D6E6F707172737475767778797A313233343536373839304142434445464748494A4B4C4D4E6162636465666768696A6B6C6D6E6F707172737475767778797A313233343536373839304142434445464748494A4B4C4D4E6162636465666768696A6B6C6D6E6F707172737475767778797A313233343536373839304142434445464748494A4B4C4D4E6162636465666768696A6B6C6D6E6F707172737475767778797A313233343536373839304142434445464748494A4B4C4D4E6162636465666768696A6B6C6D6E6F707172737475767778797A313233343536373839304142434445464748494A4B4C4D4E31323334350136
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0010
-RDATA=00
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_NUMBER8_OVERFLOW
-------
-WARNG=ZS_BAD_TEXT
-------
diff --git a/tests/zscanner/data/13_SPF.in b/tests/zscanner/data/13_SPF.in
deleted file mode 100644
index 0ad6c84b5..000000000
--- a/tests/zscanner/data/13_SPF.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; The SPF is the same as the TXT, so there are the differences and basics only.
-
-; OK
-@ SPF "" "test1" "\255" test2 ; Array of text strings
-@ SPF \# 1 00 ; Hexadecimal rdata
-@ TYPE99 \# 1 00 ; TYPE + Hexadecimal rdata
-@ TYPE99 "" ; TYPE
-@ spf "" ; Type in lower-case
-
-; KO
-@ SPF
diff --git a/tests/zscanner/data/13_SPF.out b/tests/zscanner/data/13_SPF.out
deleted file mode 100644
index be7fb3582..000000000
--- a/tests/zscanner/data/13_SPF.out
+++ /dev/null
@@ -1,32 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0063
-RDATA=0005746573743101FF057465737432
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0063
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0063
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0063
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0063
-RDATA=00
-------
-WARNG=ZS_BAD_RDATA
-------
diff --git a/tests/zscanner/data/14_NS.in b/tests/zscanner/data/14_NS.in
deleted file mode 100644
index b56a57982..000000000
--- a/tests/zscanner/data/14_NS.in
+++ /dev/null
@@ -1,38 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ NS . ; The simplest owner
-@ NS tld. ; FQD tld owner
-@ NS tld ; Relative form
-@ NS *. ; FQD with asterisk
-@ NS * ; Alone asterisk
-@ NS *.* ; More asterisks
-@ NS *a.a*a.** ; Also possible
-@ NS @ ; Use origin
-@ NS 0123456789 ; Digits
-@ NS _a_.-b-c-./d/. ; Allowed characters '_' '-' '/' anywhere
-@ NS ABCDEFGHIJKLMNOPQRSTUVWXYZ ; All upper-case letters
-@ NS abcdefghijklmnopqrstuvwxyz ; All lower-case letters
-@ NS \0320\ \\\"\.\@\*.tld. ; Label with special chars
-@ NS b.a.9.8.7.6.5.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa. ; IPv6 reverse
-@ NS 123456789012345678901234567890123456789012345678901234567890123.tld. ; Label of maximal length
-@ NS 123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901. ; Domain name of maximal length
-@ NS 123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901 ; Domain name of maximal length (after appending origin)
-@ TYPE2 \# 1 00 ; TYPE + Hexadecimal rdata
-@ TYPE2 @ ; TYPE
-@ ns @ ; Type in lower-case
-
-; KO
-@ NS
-@ NS ; Empty rdata
-@ NS \# 0 ; Hex empty rdata
-@ NS & ; Bad (unslashed) character
-@ NS @@ ; Double @@
-@ NS .. ; Missing label between dots
-@ NS \1 ; Slash notation requires 3 digits
-@ NS \12 ; Slash notation requires 3 digits
-@ NS 1234567890123456789012345678901234567890123456789012345678901234.tld. ; Label exceeded maximal length
-@ NS 123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012. ; Domain name exceeded maximal length
-@ NS 123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012 ; Domain name exceeded maximal length (after appending origin)
-@ NS . x ; Unexpected item
diff --git a/tests/zscanner/data/14_NS.out b/tests/zscanner/data/14_NS.out
deleted file mode 100644
index 08d739a9b..000000000
--- a/tests/zscanner/data/14_NS.out
+++ /dev/null
@@ -1,144 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=03746C6400
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=03746C6400
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=012A00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=012A00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=012A012A00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=022A6103612A61022A2A00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=0A3031323334353637383900
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=035F615F052D622D632D032F642F00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=1A4142434445464748494A4B4C4D4E4F505152535455565758595A00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=1A6162636465666768696A6B6C6D6E6F707172737475767778797A00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=082030205C222E402A03746C6400
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=0162016101390138013701360135013001300130013001300130013001300130013001300130013001300130013001300138016201640130013101300130013203697036046172706100
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=3F31323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323303746C6400
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=3F3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333F3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333F3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333D3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303100
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=3F3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333F3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333F3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333D3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303100
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0002
-RDATA=00
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_DNAME_CHAR
-------
-WARNG=ZS_BAD_DNAME_CHAR
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_LABEL_OVERFLOW
-------
-WARNG=ZS_DNAME_OVERFLOW
-------
-WARNG=ZS_DNAME_OVERFLOW
-------
-WARNG=ZS_BAD_REST
-------
diff --git a/tests/zscanner/data/15_CNAME.in b/tests/zscanner/data/15_CNAME.in
deleted file mode 100644
index 806b8f9ae..000000000
--- a/tests/zscanner/data/15_CNAME.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; The CNAME is the same as the NS, so there are the differences and basics only.
-
-; OK
-@ CNAME test.example.com ; Relative dname
-@ CNAME \# 1 00 ; Hexadecimal rdata
-@ TYPE5 \# 1 00 ; TYPE + Hexadecimal rdata
-@ TYPE5 @ ; TYPE
-@ cname @ ; Type in lower-case
-
-; KO
-@ CNAME
diff --git a/tests/zscanner/data/15_CNAME.out b/tests/zscanner/data/15_CNAME.out
deleted file mode 100644
index 3c3a55dc0..000000000
--- a/tests/zscanner/data/15_CNAME.out
+++ /dev/null
@@ -1,32 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0005
-RDATA=0474657374076578616D706C6503636F6D00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0005
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0005
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0005
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0005
-RDATA=00
-------
-WARNG=ZS_BAD_RDATA
-------
diff --git a/tests/zscanner/data/16_PTR.in b/tests/zscanner/data/16_PTR.in
deleted file mode 100644
index 3694e7da3..000000000
--- a/tests/zscanner/data/16_PTR.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; The PTR is the same as the NS, so there are the differences and basics only.
-
-; OK
-@ PTR test.example.com ; Relative dname
-@ PTR \# 1 00 ; Hexadecimal rdata
-@ TYPE12 \# 1 00 ; TYPE + Hexadecimal rdata
-@ TYPE12 @ ; TYPE
-@ ptr @ ; Type in lower-case
-
-; KO
-@ PTR
diff --git a/tests/zscanner/data/16_PTR.out b/tests/zscanner/data/16_PTR.out
deleted file mode 100644
index 55d94b9ab..000000000
--- a/tests/zscanner/data/16_PTR.out
+++ /dev/null
@@ -1,32 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000C
-RDATA=0474657374076578616D706C6503636F6D00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000C
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000C
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000C
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000C
-RDATA=00
-------
-WARNG=ZS_BAD_RDATA
-------
diff --git a/tests/zscanner/data/17_DNAME.in b/tests/zscanner/data/17_DNAME.in
deleted file mode 100644
index 5e9ba71db..000000000
--- a/tests/zscanner/data/17_DNAME.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; The DNAME is the same as the NS, so there are the differences and basics only.
-
-; OK
-@ DNAME test.example.com ; Relative dname
-@ DNAME \# 1 00 ; Hexadecimal rdata
-@ TYPE39 \# 1 00 ; TYPE + Hexadecimal rdata
-@ TYPE39 @ ; TYPE
-@ dname @ ; Type in lower-case
-
-; KO
-@ DNAME
diff --git a/tests/zscanner/data/17_DNAME.out b/tests/zscanner/data/17_DNAME.out
deleted file mode 100644
index 35f11d88a..000000000
--- a/tests/zscanner/data/17_DNAME.out
+++ /dev/null
@@ -1,32 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0027
-RDATA=0474657374076578616D706C6503636F6D00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0027
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0027
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0027
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0027
-RDATA=00
-------
-WARNG=ZS_BAD_RDATA
-------
diff --git a/tests/zscanner/data/18_MX.in b/tests/zscanner/data/18_MX.in
deleted file mode 100644
index 61e6afbde..000000000
--- a/tests/zscanner/data/18_MX.in
+++ /dev/null
@@ -1,23 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; For more tests on dname see NS test (same processing)
-
-; OK
-@ MX 0 @ ; Minimal priority
-@ MX 65535 @ ; Maximal priority
-@ MX 1 mail ; Relative dname
-@ MX 1 mail.tld. ; Absolute dname
-@ MX \# 3 0001 00 ; Hexadecimal rdata
-@ TYPE15 \# 3 0001 00 ; TYPE + Hexadecimal rdata
-@ TYPE15 1 @ ; TYPE
-@ mx 1 @ ; Type in lower-case
-
-; KO
-@ MX
-@ MX ; Empty rdata
-@ MX \# 0 ; Hex empty rdata
-@ MX -1 @ ; Negative number
-@ MX 65536 @ ; 16bit overflow
-@ MX 1 $ ; Bad dname
-@ MX 0 @ x ; Unexpected item
diff --git a/tests/zscanner/data/18_MX.out b/tests/zscanner/data/18_MX.out
deleted file mode 100644
index 0a5003852..000000000
--- a/tests/zscanner/data/18_MX.out
+++ /dev/null
@@ -1,62 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000F
-RDATA=000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000F
-RDATA=FFFF00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000F
-RDATA=0001046D61696C00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000F
-RDATA=0001046D61696C03746C6400
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000F
-RDATA=000100
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000F
-RDATA=000100
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000F
-RDATA=000100
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000F
-RDATA=000100
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_NUMBER16_OVERFLOW
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_REST
-------
diff --git a/tests/zscanner/data/19_AFSDB.in b/tests/zscanner/data/19_AFSDB.in
deleted file mode 100644
index be569e49f..000000000
--- a/tests/zscanner/data/19_AFSDB.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; The AFSDB is the same as the MX, so there are the differences and basics only.
-
-; OK
-@ AFSDB 1 mail ; Relative dname
-@ AFSDB \# 3 0001 00 ; Hexadecimal rdata
-@ TYPE18 \# 3 0001 00 ; TYPE + Hexadecimal rdata
-@ TYPE18 1 @ ; TYPE
-@ afsdb 1 @ ; Type in lower-case
-
-; KO
-@ AFSDB
diff --git a/tests/zscanner/data/19_AFSDB.out b/tests/zscanner/data/19_AFSDB.out
deleted file mode 100644
index b5c77eb87..000000000
--- a/tests/zscanner/data/19_AFSDB.out
+++ /dev/null
@@ -1,32 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0012
-RDATA=0001046D61696C00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0012
-RDATA=000100
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0012
-RDATA=000100
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0012
-RDATA=000100
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0012
-RDATA=000100
-------
-WARNG=ZS_BAD_NUMBER
-------
diff --git a/tests/zscanner/data/20_RT.in b/tests/zscanner/data/20_RT.in
deleted file mode 100644
index 3bc774d0c..000000000
--- a/tests/zscanner/data/20_RT.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; The RT is the same as the MX, so there are the differences and basics only.
-
-; OK
-@ RT 1 mail ; Relative dname
-@ RT \# 3 0001 00 ; Hexadecimal rdata
-@ TYPE21 \# 3 0001 00 ; TYPE + Hexadecimal rdata
-@ TYPE21 1 @ ; TYPE
-@ rt 1 @ ; Type in lower-case
-
-; KO
-@ RT
diff --git a/tests/zscanner/data/20_RT.out b/tests/zscanner/data/20_RT.out
deleted file mode 100644
index 8be89a3e4..000000000
--- a/tests/zscanner/data/20_RT.out
+++ /dev/null
@@ -1,32 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0015
-RDATA=0001046D61696C00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0015
-RDATA=000100
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0015
-RDATA=000100
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0015
-RDATA=000100
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0015
-RDATA=000100
-------
-WARNG=ZS_BAD_NUMBER
-------
diff --git a/tests/zscanner/data/21_KX.in b/tests/zscanner/data/21_KX.in
deleted file mode 100644
index 529480db7..000000000
--- a/tests/zscanner/data/21_KX.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; The KX is the same as the MX, so there are the differences and basics only.
-
-; OK
-@ KX 1 mail ; Relative dname
-@ KX \# 3 0001 00 ; Hexadecimal rdata
-@ TYPE36 \# 3 0001 00 ; TYPE + Hexadecimal rdata
-@ TYPE36 1 @ ; TYPE
-@ kx 1 @ ; Type in lower-case
-
-; KO
-@ KX
diff --git a/tests/zscanner/data/21_KX.out b/tests/zscanner/data/21_KX.out
deleted file mode 100644
index 1bc91e695..000000000
--- a/tests/zscanner/data/21_KX.out
+++ /dev/null
@@ -1,32 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0024
-RDATA=0001046D61696C00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0024
-RDATA=000100
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0024
-RDATA=000100
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0024
-RDATA=000100
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0024
-RDATA=000100
-------
-WARNG=ZS_BAD_NUMBER
-------
diff --git a/tests/zscanner/data/22_HINFO.in b/tests/zscanner/data/22_HINFO.in
deleted file mode 100644
index 4cd5ab83d..000000000
--- a/tests/zscanner/data/22_HINFO.in
+++ /dev/null
@@ -1,26 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ HINFO "" "" ; Blank string
-@ HINFO a b ; One char string
-@ HINFO \ \ ; One space char
-@ HINFO "\ " "\ " ; One space char in quotes
-@ HINFO \021 \022 ; One unprintable char
-@ HINFO "\\ \"" "\\ \"" ; Special chars
-@ HINFO first \# ; Array with special string
-@ HINFO \# 2 00 00 ; Hexadecimal rdata
-@ TYPE13 \# 2 00 00 ; TYPE + Hexadecimal rdata
-@ TYPE13 "" "" ; TYPE
-@ HINFO "abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNabcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNabcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNabcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNabcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMN1234\053" "" ; Text string of maximal length (255 chars)
-@ hinfo "" "" ; Type in lower-case
-
-; KO
-@ HINFO
-@ HINFO ; Empty rdata
-@ HINFO \# 0 ; Hex empty rdata
-@ HINFO \01 "" ; Missing digit in decimal notation
-@ HINFO \256 "" ; 8bit overflow in decimal notation
-@ HINFO """ "" ; '"' char without forward slash
-@ HINFO "" "" "" ; Unexpected item
-@ HINFO "abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNabcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNabcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNabcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNabcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMN1234\0536" "" ; Maximal length overflow
diff --git a/tests/zscanner/data/22_HINFO.out b/tests/zscanner/data/22_HINFO.out
deleted file mode 100644
index fa6672963..000000000
--- a/tests/zscanner/data/22_HINFO.out
+++ /dev/null
@@ -1,88 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000D
-RDATA=0000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000D
-RDATA=01610162
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000D
-RDATA=01200120
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000D
-RDATA=01200120
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000D
-RDATA=01150116
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000D
-RDATA=035C2022035C2022
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000D
-RDATA=0566697273740123
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000D
-RDATA=0000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000D
-RDATA=0000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000D
-RDATA=0000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000D
-RDATA=FF6162636465666768696A6B6C6D6E6F707172737475767778797A313233343536373839304142434445464748494A4B4C4D4E6162636465666768696A6B6C6D6E6F707172737475767778797A313233343536373839304142434445464748494A4B4C4D4E6162636465666768696A6B6C6D6E6F707172737475767778797A313233343536373839304142434445464748494A4B4C4D4E6162636465666768696A6B6C6D6E6F707172737475767778797A313233343536373839304142434445464748494A4B4C4D4E6162636465666768696A6B6C6D6E6F707172737475767778797A313233343536373839304142434445464748494A4B4C4D4E313233343500
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000D
-RDATA=0000
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_NUMBER8_OVERFLOW
-------
-WARNG=ZS_BAD_TEXT
-------
-WARNG=ZS_BAD_REST
-------
-WARNG=ZS_ITEM_OVERFLOW
-------
diff --git a/tests/zscanner/data/23_MINFO.in b/tests/zscanner/data/23_MINFO.in
deleted file mode 100644
index 7b34c6008..000000000
--- a/tests/zscanner/data/23_MINFO.in
+++ /dev/null
@@ -1,18 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; For more tests on dname see NS test (same processing)
-
-; OK
-@ MINFO . . ; The simplest dnames
-@ MINFO @ @ ; Use origin
-@ MINFO mail mail.tld. ; Relative and absolute dnames
-@ MINFO \# 2 00 00 ; Hexadecimal rdata
-@ TYPE14 \# 2 00 00 ; TYPE + Hexadecimal rdata
-@ TYPE14 @ @ ; TYPE
-@ minfo @ @ ; Type in lower-case
-
-; KO
-@ MINFO
-@ MINFO ; Empty rdata
-@ MINFO \# 0 ; Hex empty rdata
diff --git a/tests/zscanner/data/23_MINFO.out b/tests/zscanner/data/23_MINFO.out
deleted file mode 100644
index 8154c0c25..000000000
--- a/tests/zscanner/data/23_MINFO.out
+++ /dev/null
@@ -1,48 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000E
-RDATA=0000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000E
-RDATA=0000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000E
-RDATA=046D61696C00046D61696C03746C6400
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000E
-RDATA=0000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000E
-RDATA=0000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000E
-RDATA=0000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=000E
-RDATA=0000
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
diff --git a/tests/zscanner/data/24_RP.in b/tests/zscanner/data/24_RP.in
deleted file mode 100644
index a70d7926c..000000000
--- a/tests/zscanner/data/24_RP.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; The RP is the same as the MINFO, so there are the differences and basics only.
-
-; OK
-@ RP mail mail.tld. ; Relative and absolute dnames
-@ RP \# 2 00 00 ; Hexadecimal rdata
-@ TYPE17 \# 2 00 00 ; TYPE + Hexadecimal rdata
-@ TYPE17 @ @ ; TYPE
-@ rp @ @ ; Type in lower-case
-
-; KO
-@ RP
diff --git a/tests/zscanner/data/24_RP.out b/tests/zscanner/data/24_RP.out
deleted file mode 100644
index d13b1ba82..000000000
--- a/tests/zscanner/data/24_RP.out
+++ /dev/null
@@ -1,32 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0011
-RDATA=046D61696C00046D61696C03746C6400
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0011
-RDATA=0000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0011
-RDATA=0000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0011
-RDATA=0000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0011
-RDATA=0000
-------
-WARNG=ZS_BAD_RDATA
-------
diff --git a/tests/zscanner/data/25_SOA.in b/tests/zscanner/data/25_SOA.in
deleted file mode 100644
index bf093d47e..000000000
--- a/tests/zscanner/data/25_SOA.in
+++ /dev/null
@@ -1,31 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ SOA @ @ 0 0 0 0 0 ; The simplest variant
-@ SOA tld. tld 0 0 0 0 0 ; Absolute and relative dnames.
-@ SOA @ @ 4294967295 0 0 0 0 ; Maximal serial
-@ SOA @ @ 0 4294967295 4294967295 4294967295 4294967295 ; Maximal times
-@ SOA @ @ 0 1d 1h 1m 1s ; Time units
-@ TYPE6 \# 22 00 00 0000000000000000000000000000000000000000 ; TYPE + Hexadecimal rdata
-@ TYPE6 @ @ 0 0 0 0 0 ; TYPE
-@ SOA ns.tld. first\.second.tld. ( ; Multiline record
- 2007120710
- 1w2d3h4m5s
- 2h
- 3m
- 4s
-)
-@ soa @ @ 0 0 0 0 0 ; Type in lower-case
-
-; KO
-@ SOA
-@ SOA ; Empty rdata
-@ SOA \# 0 ; Hex empty rdata
-@ SOA @ @ 1h 0 0 0 0 ; Bad number
-@ SOA @ @ 4294967296 0 0 0 0 ; Serial overflow
-@ SOA @ @ 0 4294967296 0 0 0 ; Refresh overflow
-@ SOA @ @ 0 0 4294967296 0 0 ; Retry overflow
-@ SOA @ @ 0 0 0 4294967296 0 ; Expire overflow
-@ SOA @ @ 0 0 0 0 4294967296 ; Minimum overflow
-@ SOA @ @ 0 0 0 0 0 x ; Unexpected item
diff --git a/tests/zscanner/data/25_SOA.out b/tests/zscanner/data/25_SOA.out
deleted file mode 100644
index f65844217..000000000
--- a/tests/zscanner/data/25_SOA.out
+++ /dev/null
@@ -1,74 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0006
-RDATA=00000000000000000000000000000000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0006
-RDATA=03746C640003746C64000000000000000000000000000000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0006
-RDATA=0000FFFFFFFF00000000000000000000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0006
-RDATA=000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0006
-RDATA=0000000000000001518000000E100000003C00000001
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0006
-RDATA=00000000000000000000000000000000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0006
-RDATA=00000000000000000000000000000000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0006
-RDATA=026E7303746C64000C66697273742E7365636F6E6403746C640077A23B46000C08A500001C20000000B400000004
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0006
-RDATA=00000000000000000000000000000000000000000000
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_NUMBER32_OVERFLOW
-------
-WARNG=ZS_NUMBER32_OVERFLOW
-------
-WARNG=ZS_NUMBER32_OVERFLOW
-------
-WARNG=ZS_NUMBER32_OVERFLOW
-------
-WARNG=ZS_NUMBER32_OVERFLOW
-------
-WARNG=ZS_BAD_REST
-------
diff --git a/tests/zscanner/data/26_SRV.in b/tests/zscanner/data/26_SRV.in
deleted file mode 100644
index 001e1e654..000000000
--- a/tests/zscanner/data/26_SRV.in
+++ /dev/null
@@ -1,25 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ SRV 0 0 0 @ ; The simplest variant
-_ldap._tcp.test.tld. SRV 0 0 0 @ ; Underscores in owner
-@ SRV 65535 65535 65535 @ ; Maximal numbers
-@ SRV 0 0 0 \0320\ \\\"\.\@\*.tld. ; Dname with specials
-@ TYPE33 \# 7 000000000000 00 ; TYPE + Hexadecimal rdata
-@ TYPE33 0 0 0 @ ; TYPE
-@ srv 0 0 0 @ ; Type in lower-case
-
-; KO
-@ SRV
-@ SRV ; Empty rdata
-@ SRV \# 0 ; Hex empty rdata
-@ SRV 1h 0 0 @ ; Bad priority
-@ SRV 0 1h 0 @ ; Bad weight
-@ SRV 0 0 1h @ ; Bad port
-@ SRV 0 0 0 % ; Bad target
-@ SRV 65536 0 0 @ ; Priority overflow
-@ SRV 0 65536 0 @ ; Weight overflow
-@ SRV 0 0 65536 @ ; Port overflow
-@ SRV 0 0 0 @ x ; Unexpected item
-@ SRV 0 0 0 ; Missing item
diff --git a/tests/zscanner/data/26_SRV.out b/tests/zscanner/data/26_SRV.out
deleted file mode 100644
index eadb80413..000000000
--- a/tests/zscanner/data/26_SRV.out
+++ /dev/null
@@ -1,66 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0021
-RDATA=00000000000000
-------
-OWNER=055F6C646170045F746370047465737403746C6400
-CLASS=0001
-RRTTL=00000001
-RTYPE=0021
-RDATA=00000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0021
-RDATA=FFFFFFFFFFFF00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0021
-RDATA=000000000000082030205C222E402A03746C6400
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0021
-RDATA=00000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0021
-RDATA=00000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0021
-RDATA=00000000000000
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_NUMBER16_OVERFLOW
-------
-WARNG=ZS_NUMBER16_OVERFLOW
-------
-WARNG=ZS_NUMBER16_OVERFLOW
-------
-WARNG=ZS_BAD_REST
-------
-WARNG=ZS_BAD_RDATA
-------
diff --git a/tests/zscanner/data/27_NAPTR.in b/tests/zscanner/data/27_NAPTR.in
deleted file mode 100644
index 44fd34608..000000000
--- a/tests/zscanner/data/27_NAPTR.in
+++ /dev/null
@@ -1,20 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ NAPTR 0 0 "" "" "" @ ; The simplest variant
-@ NAPTR 65535 65535 "" "" "" @ ; Maximal numbers
-@ NAPTR 65535 65535 "" "" "!^urn:cid:.+@([^\.]+\.)(.*)$!\\2!i" @ ; Regexp example
-@ NAPTR 0 0 "" "" "" \0320\ \\\"\.\@\*.tld. ; Dname with specials
-@ TYPE35 \# 8 00000000000000 00 ; TYPE + Hexadecimal rdata
-@ TYPE35 0 0 "" "" "" @ ; TYPE
-@ naptr 0 0 "" "" "" @ ; Type in lower-case
-
-; KO
-@ NAPTR
-@ NAPTR ; Empty rdata
-@ NAPTR \# 0 ; Hex empty rdata
-@ NAPTR 65536 0 "" "" "" @ ; Order overflow
-@ NAPTR 0 65536 "" "" "" @ ; Preference overflow
-@ NAPTR 0 0 "" "" "" @ x ; Unexpected item
-@ NAPTR 0 0 "" "" "" ; Missing item
diff --git a/tests/zscanner/data/27_NAPTR.out b/tests/zscanner/data/27_NAPTR.out
deleted file mode 100644
index cc34e26fd..000000000
--- a/tests/zscanner/data/27_NAPTR.out
+++ /dev/null
@@ -1,56 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0023
-RDATA=0000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0023
-RDATA=FFFFFFFF00000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0023
-RDATA=FFFFFFFF00001F215E75726E3A6369643A2E2B40285B5E2E5D2B2E29282E2A2924215C32216900
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0023
-RDATA=00000000000000082030205C222E402A03746C6400
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0023
-RDATA=0000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0023
-RDATA=0000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0023
-RDATA=0000000000000000
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_NUMBER16_OVERFLOW
-------
-WARNG=ZS_NUMBER16_OVERFLOW
-------
-WARNG=ZS_BAD_REST
-------
-WARNG=ZS_BAD_RDATA
-------
diff --git a/tests/zscanner/data/28_TYPE.in b/tests/zscanner/data/28_TYPE.in
deleted file mode 100644
index f8189e86d..000000000
--- a/tests/zscanner/data/28_TYPE.in
+++ /dev/null
@@ -1,27 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ TYPE0 \# 0 ; Minimal type number
-@ TYPE65535 \# 0 ; Maximal type number
-@ TYPE55555 \# 0 ; Without hex rdata
-@ TYPE55555 \# 1 00 ; Without hex rdata
-@ TYPE1 \# 4 00000000 ; Known type
-@ TYPE1 0.0.0.0 ; Known type in text format
-@ TYPE55555 ( ; Multiline begin
- \#
- 5
- 0102 03
- 04 05
- ) ; Multiline end
-@ type55555 \# 0 ; Type in lower-case
-
-; KO
-@ TYPE55555
-@ TYPE55555 ; Without text rdata
-@ TYPE65536 ; Type number overflow
-@ TYPE65535x ; Bad type
-@ TYPE55555 \# ; Missing hex length
-@ TYPE55555 \# 1 0000 ; Too long rdata
-@ TYPE55555 \# 2 00 ; Bad rdata length
-@ TYPE55555 \# 1 00 x ; Unexpected data
diff --git a/tests/zscanner/data/28_TYPE.out b/tests/zscanner/data/28_TYPE.out
deleted file mode 100644
index 0aa409af1..000000000
--- a/tests/zscanner/data/28_TYPE.out
+++ /dev/null
@@ -1,64 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0000
-RDATA=
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=FFFF
-RDATA=
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=D903
-RDATA=
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=D903
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0001
-RDATA=00000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0001
-RDATA=00000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=D903
-RDATA=0102030405
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=D903
-RDATA=
-------
-WARNG=ZS_CANNOT_TEXT_DATA
-------
-WARNG=ZS_CANNOT_TEXT_DATA
-------
-WARNG=ZS_NUMBER16_OVERFLOW
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_RDATA_LENGTH
-------
-WARNG=ZS_BAD_RDATA_LENGTH
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
diff --git a/tests/zscanner/data/29_CERT.in b/tests/zscanner/data/29_CERT.in
deleted file mode 100644
index ee70ce24a..000000000
--- a/tests/zscanner/data/29_CERT.in
+++ /dev/null
@@ -1,58 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ CERT 0 0 0 AA== ; The simplest variant
-@ CERT 65535 65535 255 AA== ; Maximal numbers
-@ CERT PKIX 0 0 AA== ; Certificate type mnemo
-@ CERT SPKI 0 0 AA== ; Certificate type mnemo
-@ CERT PGP 0 0 AA== ; Certificate type mnemo
-@ CERT IPKIX 0 0 AA== ; Certificate type mnemo
-@ CERT ISPKI 0 0 AA== ; Certificate type mnemo
-@ CERT IPGP 0 0 AA== ; Certificate type mnemo
-@ CERT ACPKIX 0 0 AA== ; Certificate type mnemo
-@ CERT IACPKIX 0 0 AA== ; Certificate type mnemo
-@ CERT URI 0 0 AA== ; Certificate type mnemo
-@ CERT OID 0 0 AA== ; Certificate type mnemo
-@ CERT 0 0 RSAMD5 AA== ; Algorithm mnemo
-@ CERT 0 0 DH AA== ; Algorithm mnemo
-@ CERT 0 0 DSA AA== ; Algorithm mnemo
-@ CERT 0 0 RSASHA1 AA== ; Algorithm mnemo
-@ CERT 0 0 DSA-NSEC3-SHA1 AA== ; Algorithm mnemo
-@ CERT 0 0 RSASHA1-NSEC3-SHA1 AA== ; Algorithm mnemo
-@ CERT 0 0 RSASHA256 AA== ; Algorithm mnemo
-@ CERT 0 0 RSASHA512 AA== ; Algorithm mnemo
-@ CERT 0 0 ECC-GOST AA== ; Algorithm mnemo
-@ CERT 0 0 ECDSAP256SHA256 AA== ; Algorithm mnemo
-@ CERT 0 0 ECDSAP384SHA384 AA== ; Algorithm mnemo
-@ CERT 0 0 ED25519 AA== ; Algorithm mnemo
-@ CERT 0 0 ED448 AA== ; Algorithm mnemo
-@ CERT 0 0 INDIRECT AA== ; Algorithm mnemo
-@ CERT 0 0 PRIVATEDNS AA== ; Algorithm mnemo
-@ CERT 0 0 PRIVATEOID AA== ; Algorithm mnemo
-@ CERT 0 0 0 Zm8= ; One char padding
-@ CERT 0 0 0 Zm9v ; Without padding
-@ CERT 0 0 0 Zm9vYg== ; Two base64 blocks
-@ CERT 0 0 0 Zm9v YmE= ; Two base64 blocks with blank space between them
-@ TYPE37 \# 6 000000000000 ; TYPE + Hexadecimal rdata
-@ TYPE37 0 0 0 AA== ; TYPE
-@ cert 0 0 0 AA== ; Type in lower-case
-
-; KO
-@ CERT
-@ CERT ; Empty rdata
-@ CERT \# 0 ; Hex empty rdata
-@ CERT 65536 0 0 AA== ; Type overflow
-@ CERT X 0 0 AA== ; Bad type mnemonic
-@ CERT 0 65536 0 AA== ; Key tag overflow
-@ CERT 0 0 256 AA== ; Algorithm overflow
-@ CERT 0 0 0 A ; Continuous block length must be multiple of 4
-@ CERT 0 0 0 AB ; Continuous block length must be multiple of 4
-@ CERT 0 0 0 ABC ; Continuous block length must be multiple of 4
-@ CERT 0 0 0 AA == ; Continuous block length must be multiple of 4
-@ CERT 0 0 0 A=== ; Bad padding
-@ CERT 0 0 0 = ; Bad padding
-@ CERT 0 0 0 == ; Bad padding
-@ CERT 0 0 0 === ; Bad padding
-@ CERT 0 0 0 ==== ; Bad padding
-@ CERT 0 0 0 ; Missing item
diff --git a/tests/zscanner/data/29_CERT.out b/tests/zscanner/data/29_CERT.out
deleted file mode 100644
index da2c89771..000000000
--- a/tests/zscanner/data/29_CERT.out
+++ /dev/null
@@ -1,244 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=FFFFFFFFFF00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=000100000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=000200000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=000300000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=000400000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=000500000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=000600000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=000700000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=000800000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=00FD00000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=00FE00000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=000000000100
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=000000000200
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=000000000300
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=000000000500
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=000000000600
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=000000000700
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=000000000800
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=000000000A00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=000000000C00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=000000000D00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=000000000E00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=000000000F00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=000000001000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=00000000FC00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=00000000FD00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=00000000FE00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=0000000000666F
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=0000000000666F6F
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=0000000000666F6F62
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=0000000000666F6F6261
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0025
-RDATA=000000000000
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_NUMBER16_OVERFLOW
-------
-WARNG=ZS_BAD_CERT_TYPE
-------
-WARNG=ZS_NUMBER16_OVERFLOW
-------
-WARNG=ZS_NUMBER8_OVERFLOW
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
diff --git a/tests/zscanner/data/30_KEY.in b/tests/zscanner/data/30_KEY.in
deleted file mode 100644
index 263fa0347..000000000
--- a/tests/zscanner/data/30_KEY.in
+++ /dev/null
@@ -1,31 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ KEY 0 0 0 AA== ; The simplest variant
-@ KEY 65535 255 255 AA== ; Maximal numbers
-@ KEY 0 0 0 Zm8= ; One char padding
-@ KEY 0 0 0 Zm9v ; Without padding
-@ KEY 0 0 0 Zm9vYg== ; Two base64 blocks
-@ KEY 0 0 0 Zm9v YmE= ; Two base64 blocks with blank space between them
-@ TYPE25 \# 5 0000000000 ; TYPE + Hexadecimal rdata
-@ TYPE25 0 0 0 AA== ; TYPE
-@ key 0 0 0 AA== ; Type in lower-case
-
-; KO
-@ KEY
-@ KEY ; Empty rdata
-@ KEY \# 0 ; Hex empty rdata
-@ KEY 65536 0 0 AA== ; Type overflow
-@ KEY 0 256 0 AA== ; Key tag overflow
-@ KEY 0 0 256 AA== ; Algorithm overflow
-@ KEY 0 0 0 A ; Continuous block length must be multiple of 4
-@ KEY 0 0 0 AB ; Continuous block length must be multiple of 4
-@ KEY 0 0 0 ABC ; Continuous block length must be multiple of 4
-@ KEY 0 0 0 AA == ; Continuous block length must be multiple of 4
-@ KEY 0 0 0 A=== ; Bad padding
-@ KEY 0 0 0 = ; Bad padding
-@ KEY 0 0 0 == ; Bad padding
-@ KEY 0 0 0 === ; Bad padding
-@ KEY 0 0 0 ==== ; Bad padding
-@ KEY 0 0 0 ; Missing item
diff --git a/tests/zscanner/data/30_KEY.out b/tests/zscanner/data/30_KEY.out
deleted file mode 100644
index 1ec998b17..000000000
--- a/tests/zscanner/data/30_KEY.out
+++ /dev/null
@@ -1,86 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0019
-RDATA=0000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0019
-RDATA=FFFFFFFF00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0019
-RDATA=00000000666F
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0019
-RDATA=00000000666F6F
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0019
-RDATA=00000000666F6F62
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0019
-RDATA=00000000666F6F6261
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0019
-RDATA=0000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0019
-RDATA=0000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0019
-RDATA=0000000000
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_NUMBER16_OVERFLOW
-------
-WARNG=ZS_NUMBER8_OVERFLOW
-------
-WARNG=ZS_NUMBER8_OVERFLOW
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
diff --git a/tests/zscanner/data/31_DNSKEY.in b/tests/zscanner/data/31_DNSKEY.in
deleted file mode 100644
index 871de97e7..000000000
--- a/tests/zscanner/data/31_DNSKEY.in
+++ /dev/null
@@ -1,32 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ DNSKEY 0 0 0 AA== ; The simplest variant
-@ DNSKEY 65535 255 255 AA== ; Maximal numbers
-@ DNSKEY 0 0 RSAMD5 AA== ; Algorithm mnemonic
-@ DNSKEY 0 0 0 Zm8= ; One char padding
-@ DNSKEY 0 0 0 Zm9v ; Without padding
-@ DNSKEY 0 0 0 Zm9vYg== ; Two base64 blocks
-@ DNSKEY 0 0 0 Zm9v YmE= ; Two base64 blocks with blank space between them
-@ TYPE48 \# 5 0000000000 ; TYPE + Hexadecimal rdata
-@ TYPE48 0 0 0 AA== ; TYPE
-@ dnskey 0 0 0 AA== ; Type in lower-case
-
-; KO
-@ DNSKEY
-@ DNSKEY ; Empty rdata
-@ DNSKEY \# 0 ; Hex empty rdata
-@ DNSKEY 65536 0 0 AA== ; Type overflow
-@ DNSKEY 0 256 0 AA== ; Key tag overflow
-@ DNSKEY 0 0 256 AA== ; Algorithm overflow
-@ DNSKEY 0 0 0 A ; Continuous block length must be multiple of 4
-@ DNSKEY 0 0 0 AB ; Continuous block length must be multiple of 4
-@ DNSKEY 0 0 0 ABC ; Continuous block length must be multiple of 4
-@ DNSKEY 0 0 0 AA == ; Continuous block length must be multiple of 4
-@ DNSKEY 0 0 0 A=== ; Bad padding
-@ DNSKEY 0 0 0 = ; Bad padding
-@ DNSKEY 0 0 0 == ; Bad padding
-@ DNSKEY 0 0 0 === ; Bad padding
-@ DNSKEY 0 0 0 ==== ; Bad padding
-@ DNSKEY 0 0 0 ; Missing item
diff --git a/tests/zscanner/data/31_DNSKEY.out b/tests/zscanner/data/31_DNSKEY.out
deleted file mode 100644
index fa034c5dd..000000000
--- a/tests/zscanner/data/31_DNSKEY.out
+++ /dev/null
@@ -1,92 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0030
-RDATA=0000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0030
-RDATA=FFFFFFFF00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0030
-RDATA=0000000100
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0030
-RDATA=00000000666F
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0030
-RDATA=00000000666F6F
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0030
-RDATA=00000000666F6F62
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0030
-RDATA=00000000666F6F6261
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0030
-RDATA=0000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0030
-RDATA=0000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0030
-RDATA=0000000000
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_NUMBER16_OVERFLOW
-------
-WARNG=ZS_NUMBER8_OVERFLOW
-------
-WARNG=ZS_NUMBER8_OVERFLOW
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
diff --git a/tests/zscanner/data/32_APL.in b/tests/zscanner/data/32_APL.in
deleted file mode 100644
index ea9a74717..000000000
--- a/tests/zscanner/data/32_APL.in
+++ /dev/null
@@ -1,30 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ APL ; The simplest variant - blank list
-@ APL 1:0.0.0.0/0 ; Minimal ipv4 prefix length
-@ APL 1:255.255.255.255/32 ; Maximal ipv4 prefix length
-@ APL 1:255.255.255.255/30 ; Prefix length isn't multiple of 8
-@ APL 2:::/0 ; Minimal ipv6 address
-@ APL 2:0::0/0 ; Minimal ipv6 prefix length
-@ APL 2:0::0/128 ; Maximal ipv6 prefix length
-@ APL 2:FFFF:FFFF:FFFF::/2 ; Trailing zeroes test
-@ APL !1:0.0.0.0/0 ; Negation flag
-@ APL 1:0.0.0.0/0 1:255.255.255.255/32 ; More APLs
-@ TYPE42 \# 4 00010000 ; TYPE + Hexadecimal rdata
-@ TYPE42 1:0.0.0.0/0 ; TYPE
-@ APL \# 0 ; Zero length rdata
-@ apl 1:0.0.0.0/0 ; Type in lower-case
-
-; KO
-@ APL 0:0.0.0.0/32 ; Bad address family
-@ APL x:0.0.0.0/32 ; Bad address family
-@ APL !x:0.0.0.0/32 ; Bad address family
-@ APL 2:0.0.0.0/32 ; Address family mismatch
-@ APL 1:0::0/32 ; Address family mismatch
-@ APL 1:0.0.0.0/33 ; Prefix length is too long
-@ APL 2:0::0/129 ; Prefix length is too long
-@ APL 2::/0 ; Bad ipv6 address
-@ APL 2:0::0/x ; Bad prefix length
-@ APL 1:0.0.0.0/ ; Missing prefix length
diff --git a/tests/zscanner/data/32_APL.out b/tests/zscanner/data/32_APL.out
deleted file mode 100644
index 50ec10143..000000000
--- a/tests/zscanner/data/32_APL.out
+++ /dev/null
@@ -1,104 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002A
-RDATA=
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002A
-RDATA=00010000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002A
-RDATA=00012004FFFFFFFF
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002A
-RDATA=00011E04FFFFFFFF
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002A
-RDATA=00020000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002A
-RDATA=00020000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002A
-RDATA=00028000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002A
-RDATA=00020206FFFFFFFFFFFF
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002A
-RDATA=00010080
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002A
-RDATA=0001000000012004FFFFFFFF
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002A
-RDATA=00010000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002A
-RDATA=00010000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002A
-RDATA=
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002A
-RDATA=00010000
-------
-WARNG=ZS_BAD_APL
-------
-WARNG=ZS_BAD_APL
-------
-WARNG=ZS_BAD_APL
-------
-WARNG=ZS_BAD_IPV6
-------
-WARNG=ZS_BAD_ADDRESS_CHAR
-------
-WARNG=ZS_BAD_APL
-------
-WARNG=ZS_BAD_APL
-------
-WARNG=ZS_BAD_IPV6
-------
-WARNG=ZS_BAD_APL
-------
-WARNG=ZS_BAD_APL
-------
diff --git a/tests/zscanner/data/33_DS.in b/tests/zscanner/data/33_DS.in
deleted file mode 100644
index a5d805c3a..000000000
--- a/tests/zscanner/data/33_DS.in
+++ /dev/null
@@ -1,23 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ DS 0 0 0 00 ; The simplest variant
-@ DS 65535 255 255 00 ; Maximal numbers
-@ DS 0 RSAMD5 0 00 ; Algorithm mnemonic
-@ DS 0 0 0 01 02 0304 ; Hex block with blank spaces between them
-@ TYPE43 \# 5 0000000000 ; TYPE + Hexadecimal rdata
-@ TYPE43 0 0 0 00 ; TYPE
-@ ds 0 0 0 00 ; Type in lower-case
-
-; KO
-@ DS
-@ DS ; Empty rdata
-@ DS \# 0 ; Hex empty rdata
-@ DS 65536 0 0 00 ; Key tag overflow
-@ DS 0 256 0 00 ; Algorithm overflow
-@ DS 0 0 256 00 ; Digest type overflow
-@ DS 0 0 0 0 ; Continuous block length must be multiple of 2
-@ DS 0 0 0 00 0 ; Continuous block length must be multiple of 2
-@ DS 0 0 0 XX ; Bad hex character
-@ DS 0 0 0 ; Missing item
diff --git a/tests/zscanner/data/33_DS.out b/tests/zscanner/data/33_DS.out
deleted file mode 100644
index 2257119a7..000000000
--- a/tests/zscanner/data/33_DS.out
+++ /dev/null
@@ -1,62 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002B
-RDATA=0000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002B
-RDATA=FFFFFFFF00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002B
-RDATA=0000010000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002B
-RDATA=0000000001020304
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002B
-RDATA=0000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002B
-RDATA=0000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002B
-RDATA=0000000000
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_NUMBER16_OVERFLOW
-------
-WARNG=ZS_NUMBER8_OVERFLOW
-------
-WARNG=ZS_NUMBER8_OVERFLOW
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
diff --git a/tests/zscanner/data/34_SSHFP.in b/tests/zscanner/data/34_SSHFP.in
deleted file mode 100644
index 89c4de3da..000000000
--- a/tests/zscanner/data/34_SSHFP.in
+++ /dev/null
@@ -1,21 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ SSHFP 0 0 00 ; The simplest variant
-@ SSHFP 255 255 00 ; Maximal numbers
-@ SSHFP 0 0 01 02 0304 ; Hex block with blank spaces between them
-@ TYPE44 \# 3 000000 ; TYPE + Hexadecimal rdata
-@ TYPE44 0 0 00 ; TYPE
-@ sshfp 0 0 00 ; Type in lower-case
-
-; KO
-@ SSHFP
-@ SSHFP ; Empty rdata
-@ SSHFP \# 0 ; Hex empty rdata
-@ SSHFP 256 0 00 ; Algorithm overflow
-@ SSHFP 0 256 00 ; Fp type overflow
-@ SSHFP 0 0 0 ; Continuous block length must be multiple of 2
-@ SSHFP 0 0 00 0 ; Continuous block length must be multiple of 2
-@ SSHFP 0 0 XX ; Bad hex character
-@ SSHFP 0 0 ; Missing item
diff --git a/tests/zscanner/data/34_SSHFP.out b/tests/zscanner/data/34_SSHFP.out
deleted file mode 100644
index da8ce6d8e..000000000
--- a/tests/zscanner/data/34_SSHFP.out
+++ /dev/null
@@ -1,54 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002C
-RDATA=000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002C
-RDATA=FFFF00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002C
-RDATA=000001020304
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002C
-RDATA=000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002C
-RDATA=000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002C
-RDATA=000000
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_NUMBER8_OVERFLOW
-------
-WARNG=ZS_NUMBER8_OVERFLOW
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
diff --git a/tests/zscanner/data/35_IPSECKEY.in b/tests/zscanner/data/35_IPSECKEY.in
deleted file mode 100644
index dc56bd715..000000000
--- a/tests/zscanner/data/35_IPSECKEY.in
+++ /dev/null
@@ -1,29 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ IPSECKEY 0 0 0 . ; The simplest variant - no gw, no key
-@ IPSECKEY 255 3 255 . AA== ; Maximal numbers
-@ IPSECKEY 0 1 0 0.0.0.0 ; IPv4 address
-@ IPSECKEY 0 2 0 :: ; IPv6 address
-@ IPSECKEY 0 3 0 \0320\ \\\"\.\@\*.tld. ; Special chars in domain name
-@ IPSECKEY 0 0 1 . Zm8= ; One char padding
-@ IPSECKEY 0 0 1 . Zm9v ; Without padding
-@ IPSECKEY 0 0 1 . Zm9vYg== ; Two base64 blocks
-@ IPSECKEY 0 0 1 . Zm9v YmE= ; Two base64 blocks with blank space between them
-@ TYPE45 \# 3 000000 ; TYPE + Hexadecimal rdata
-@ TYPE45 0 0 1 . AA== ; TYPE
-@ ipseckey 0 0 1 . AA== ; Type in lower-case
-
-; KO
-@ IPSECKEY
-@ IPSECKEY ; Empty rdata
-@ IPSECKEY \# 0 ; Hex empty rdata
-@ IPSECKEY 256 0 0 . ; Precedence overflow
-@ IPSECKEY 0 4 0 . ; Unknown gateway
-@ IPSECKEY 0 0 256 . AA== ; Algorithm overflow
-@ IPSECKEY 0 0 0 . AA== ; If alg is 0 then key shouldn't be given
-@ IPSECKEY 0 0 0 a% ; Bad domain name char
-@ IPSECKEY 0 0 1 . A ; Continuous block length must be multiple of 4
-@ IPSECKEY 0 0 1 . = ; Bad padding
-@ IPSECKEY 0 0 ; Missing item
diff --git a/tests/zscanner/data/35_IPSECKEY.out b/tests/zscanner/data/35_IPSECKEY.out
deleted file mode 100644
index 718ce22f7..000000000
--- a/tests/zscanner/data/35_IPSECKEY.out
+++ /dev/null
@@ -1,94 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002D
-RDATA=000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002D
-RDATA=FF03FF0000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002D
-RDATA=00010000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002D
-RDATA=00020000000000000000000000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002D
-RDATA=000300082030205C222E402A03746C6400
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002D
-RDATA=000001666F
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002D
-RDATA=000001666F6F
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002D
-RDATA=000001666F6F62
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002D
-RDATA=000001666F6F6261
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002D
-RDATA=000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002D
-RDATA=00000100
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002D
-RDATA=00000100
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_NUMBER8_OVERFLOW
-------
-WARNG=ZS_BAD_GATEWAY
-------
-WARNG=ZS_NUMBER8_OVERFLOW
-------
-WARNG=ZS_BAD_GATEWAY_KEY
-------
-WARNG=ZS_BAD_GATEWAY
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_GATEWAY_KEY
-------
-WARNG=ZS_BAD_NUMBER
-------
diff --git a/tests/zscanner/data/36_RRSIG.in b/tests/zscanner/data/36_RRSIG.in
deleted file mode 100644
index e970fc513..000000000
--- a/tests/zscanner/data/36_RRSIG.in
+++ /dev/null
@@ -1,45 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ RRSIG TYPE0 0 0 0 0 0 0 . AA== ; The simplest variant
-@ RRSIG A 2 3 4 5 6 7 \008. CQ== ; Human visual test - block numbering
-@ RRSIG TYPE65535 255 255 4294967295 4294967295 4294967295 65535 . AA== ; Maximal numbers
-@ RRSIG TYPE0 RSAMD5 0 0 0 0 0 . AA== ; Algorithm mnemonic
-@ RRSIG A 0 0 0 19700101000000 0 0 . AA== ; Minimal date format
-@ RRSIG A 0 0 0 0 21051231235959 0 . AA== ; Maximal date format (zscanner limit)
-@ RRSIG TYPE0 0 0 0 0 0 0 \0320\ \\\"\.\@\*.tld. AA== ; Special chars in domain name
-@ RRSIG A 0 0 0 0 0 0 . Zm8= ; One char padding
-@ RRSIG A 0 0 0 0 0 0 . Zm9v ; Without padding
-@ RRSIG A 0 0 0 0 0 0 . Zm9vYg== ; Two base64 blocks
-@ RRSIG A 0 0 0 0 0 0 . Zm9v YmE= ; Two base64 blocks with blank space between them
-@ TYPE46 \# 20 000100000000000000000000000000000000 00 00 ; TYPE + Hexadecimal rdata
-@ TYPE46 A 0 0 0 0 0 0 . AA== ; TYPE
-@ rrsig A 0 0 0 0 0 0 . AA== ; Type in lower-case
-
-; KO
-@ RRSIG
-@ RRSIG ; Empty rdata
-@ RRSIG \# 0 ; Hex empty rdata
-@ RRSIG X 0 0 0 0 0 0 . AA== ; Unknown type
-@ RRSIG TYPE65536 0 0 0 0 0 0 . AA== ; Type overflow
-@ RRSIG A 256 0 0 0 0 0 . AA== ; Algorithm overflow
-@ RRSIG A 0 256 0 0 0 0 . AA== ; Labels overflow
-@ RRSIG A 0 0 4294967296 0 0 0 . AA== ; TTL overflow
-@ RRSIG A 0 0 0 9294967296 0 0 . AA== ; Sig. exp. overflow
-@ RRSIG A 0 0 0 0 4294967296 0 . AA== ; Sig. inc. overflow
-@ RRSIG A 0 0 0 0 0 65536 . AA== ; Key tag overflow
-@ RRSIG A 0 0 0 0 21060101000000 0 . AA== ; Date overflow
-@ RRSIG A 0 0 0 0 2106010100000x 0 . AA== ; Bad timestamp char
-@ RRSIG A 0 0 0 0 210601010000000 0 . AA== ; Bad timestamp length
-@ RRSIG A 0 0 0 0 0 0 a% AA== ; Bad domain char
-@ RRSIG A 0 0 0 0 0 0 . A ; Continuous block length must be multiple of 4
-@ RRSIG A 0 0 0 0 0 0 . AB ; Continuous block length must be multiple of 4
-@ RRSIG A 0 0 0 0 0 0 . ABC ; Continuous block length must be multiple of 4
-@ RRSIG A 0 0 0 0 0 0 . AA == ; Continuous block length must be multiple of 4
-@ RRSIG A 0 0 0 0 0 0 . A=== ; Bad padding
-@ RRSIG A 0 0 0 0 0 0 . = ; Bad padding
-@ RRSIG A 0 0 0 0 0 0 . == ; Bad padding
-@ RRSIG A 0 0 0 0 0 0 . === ; Bad padding
-@ RRSIG A 0 0 0 0 0 0 . ==== ; Bad padding
-@ RRSIG A 0 0 0 0 0 0 . ; Missing item
diff --git a/tests/zscanner/data/36_RRSIG.out b/tests/zscanner/data/36_RRSIG.out
deleted file mode 100644
index b3d48be8d..000000000
--- a/tests/zscanner/data/36_RRSIG.out
+++ /dev/null
@@ -1,134 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002E
-RDATA=0000000000000000000000000000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002E
-RDATA=00010203000000040000000500000006000701080009
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002E
-RDATA=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002E
-RDATA=0000010000000000000000000000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002E
-RDATA=0001000000000000000000000000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002E
-RDATA=000100000000000000000000FFCEDD7F00000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002E
-RDATA=000000000000000000000000000000000000082030205C222E402A03746C640000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002E
-RDATA=00010000000000000000000000000000000000666F
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002E
-RDATA=00010000000000000000000000000000000000666F6F
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002E
-RDATA=00010000000000000000000000000000000000666F6F62
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002E
-RDATA=00010000000000000000000000000000000000666F6F6261
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002E
-RDATA=0001000000000000000000000000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002E
-RDATA=0001000000000000000000000000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002E
-RDATA=0001000000000000000000000000000000000000
-------
-WARNG=ZS_UNSUPPORTED_TYPE
-------
-WARNG=ZS_UNSUPPORTED_TYPE
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_UNSUPPORTED_TYPE
-------
-WARNG=ZS_NUMBER16_OVERFLOW
-------
-WARNG=ZS_NUMBER8_OVERFLOW
-------
-WARNG=ZS_NUMBER8_OVERFLOW
-------
-WARNG=ZS_NUMBER32_OVERFLOW
-------
-WARNG=ZS_NUMBER32_OVERFLOW
-------
-WARNG=ZS_NUMBER32_OVERFLOW
-------
-WARNG=ZS_NUMBER16_OVERFLOW
-------
-WARNG=ZS_BAD_DATE
-------
-WARNG=ZS_BAD_TIMESTAMP_CHAR
-------
-WARNG=ZS_BAD_TIMESTAMP_LENGTH
-------
-WARNG=ZS_BAD_DNAME_CHAR
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
diff --git a/tests/zscanner/data/37_NSEC.in b/tests/zscanner/data/37_NSEC.in
deleted file mode 100644
index 1efa4ea4b..000000000
--- a/tests/zscanner/data/37_NSEC.in
+++ /dev/null
@@ -1,20 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ NSEC . ; The simplest variant - without bitmap
-@ NSEC \0320\ \\\"\.\@\*.tld. ; Special chars in domain name
-@ NSEC . TYPE0 ; Minimal type number
-@ NSEC . TYPE65535 ; Maximal type number
-@ NSEC . TYPE0 A NS ; First bitmap window
-@ NSEC . TYPE0 TYPE256 TYPE512 TYPE32768 ; First, second, third and 128. bitmap window
-@ TYPE47 \# 1 00 ; TYPE + Hexadecimal rdata
-@ TYPE47 . ; TYPE
-@ nsec . ; Type in lower-case
-
-; KO
-@ NSEC
-@ NSEC ; Empty rdata
-@ NSEC \# 0 ; Hex empty rdata
-@ NSEC . TYPE65536 ; Type number overflow
-@ NSEC . X ; Unknown type
diff --git a/tests/zscanner/data/37_NSEC.out b/tests/zscanner/data/37_NSEC.out
deleted file mode 100644
index 7a62def60..000000000
--- a/tests/zscanner/data/37_NSEC.out
+++ /dev/null
@@ -1,64 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002F
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002F
-RDATA=082030205C222E402A03746C6400
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002F
-RDATA=00000180
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002F
-RDATA=00FF200000000000000000000000000000000000000000000000000000000000000001
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002F
-RDATA=000001E0
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002F
-RDATA=00000180010180020180800180
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002F
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002F
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=002F
-RDATA=00
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_NUMBER16_OVERFLOW
-------
-WARNG=ZS_BAD_BITMAP
-------
diff --git a/tests/zscanner/data/38_DHCID.in b/tests/zscanner/data/38_DHCID.in
deleted file mode 100644
index 4c0642a9b..000000000
--- a/tests/zscanner/data/38_DHCID.in
+++ /dev/null
@@ -1,26 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ DHCID AA== ; The simplest variant
-@ DHCID Zm8= ; One char padding
-@ DHCID Zm9v ; Without padding
-@ DHCID Zm9vYg== ; Two base64 blocks
-@ DHCID Zm9v YmE= ; Two base64 blocks with blank space between them
-@ TYPE49 \# 1 00 ; TYPE + Hexadecimal rdata
-@ TYPE49 AA== ; TYPE
-@ dhcid AA== ; Type in lower-case
-
-; KO
-@ DHCID
-@ DHCID ; Empty rdata
-@ DHCID \# 0 ; Hex empty rdata
-@ DHCID A ; Continuous block length must be multiple of 4
-@ DHCID AB ; Continuous block length must be multiple of 4
-@ DHCID ABC ; Continuous block length must be multiple of 4
-@ DHCID AA == ; Continuous block length must be multiple of 4
-@ DHCID A=== ; Bad padding
-@ DHCID = ; Bad padding
-@ DHCID == ; Bad padding
-@ DHCID === ; Bad padding
-@ DHCID ==== ; Bad padding
diff --git a/tests/zscanner/data/38_DHCID.out b/tests/zscanner/data/38_DHCID.out
deleted file mode 100644
index 8dc8ec915..000000000
--- a/tests/zscanner/data/38_DHCID.out
+++ /dev/null
@@ -1,72 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0031
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0031
-RDATA=666F
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0031
-RDATA=666F6F
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0031
-RDATA=666F6F62
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0031
-RDATA=666F6F6261
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0031
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0031
-RDATA=00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0031
-RDATA=00
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
diff --git a/tests/zscanner/data/39_NSEC3.in b/tests/zscanner/data/39_NSEC3.in
deleted file mode 100644
index cadbfa9d3..000000000
--- a/tests/zscanner/data/39_NSEC3.in
+++ /dev/null
@@ -1,46 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ NSEC3 0 0 0 - 00====== ; The simplest variant - without bitmap
-@ NSEC3 255 255 65535 - 00====== ; Maximal numbers
-@ NSEC3 0 0 0 00FF 00====== ; Hex string
-@ NSEC3 0 0 0 - 00====== ; Eight char padding
-@ NSEC3 0 0 0 - CPNG==== ; Four char padding
-@ NSEC3 0 0 0 - CPNMU=== ; Three char padding
-@ NSEC3 0 0 0 - CPNMUOG= ; One char padding
-@ NSEC3 0 0 0 - CPNMUOJ1 ; Without padding
-@ NSEC3 0 0 0 - CPNMUOJ1E8====== ; Two base32hex blocks
-@ NSEC3 0 0 0 - 00====== TYPE0 ; Minimal type number
-@ NSEC3 0 0 0 - 00====== TYPE65535 ; Maximal type number
-@ NSEC3 0 0 0 - 00====== TYPE0 A NS ; First bitmap window
-@ NSEC3 0 0 0 - 00====== TYPE0 TYPE256 TYPE512 TYPE32768 ; First, second, third and 128. bitmap window
-@ TYPE50 \# 7 00000000000100 ; TYPE + Hexadecimal rdata
-@ TYPE50 0 0 0 - 00====== ; TYPE
-@ nsec3 0 0 0 - 00====== ; Type in lower-case
-
-; KO
-@ NSEC3
-@ NSEC3 ; Empty rdata
-@ NSEC3 \# 0 ; Hex empty rdata
-@ NSEC3 256 0 0 - 00====== ; Algorithm overflow
-@ NSEC3 0 256 0 - 00====== ; Flags overflow
-@ NSEC3 0 0 65536 - 00====== ; Iterations overflow
-@ NSEC3 0 0 0 0 00====== ; Hex block must be multiple of 2
-@ NSEC3 0 0 0 0X 00====== ; Bad hex char
-@ NSEC3 0 0 0 00 FF 00====== ; Hex string with blank space inside
-@ NSEC3 0 0 0 - 1 ; Continuous block length must be multiple of 8
-@ NSEC3 0 0 0 - 12 ; Continuous block length must be multiple of 8
-@ NSEC3 0 0 0 - 123 ; Continuous block length must be multiple of 8
-@ NSEC3 0 0 0 - 1234 ; Continuous block length must be multiple of 8
-@ NSEC3 0 0 0 - 12345 ; Continuous block length must be multiple of 8
-@ NSEC3 0 0 0 - 123456 ; Continuous block length must be multiple of 8
-@ NSEC3 0 0 0 - 1234567 ; Continuous block length must be multiple of 8
-@ NSEC3 0 0 0 - 123456 78 ; Continuous block length must be multiple of 8
-@ NSEC3 0 0 0 - ======== ; Bad padding
-@ NSEC3 0 0 0 - 1======= ; Bad padding
-@ NSEC3 0 0 0 - 123===== ; Bad padding
-@ NSEC3 0 0 0 - 123456== ; Bad padding
-@ NSEC3 0 0 0 - CPNMUOJ1 E8====== ; Two base32hex blocks with blank space between them
-@ NSEC3 0 0 0 - 00====== TYPE65536 ; Type number overflow
-@ NSEC3 0 0 0 - 00====== X ; Unknown type
diff --git a/tests/zscanner/data/39_NSEC3.out b/tests/zscanner/data/39_NSEC3.out
deleted file mode 100644
index 1aaec4f35..000000000
--- a/tests/zscanner/data/39_NSEC3.out
+++ /dev/null
@@ -1,144 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0032
-RDATA=00000000000100
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0032
-RDATA=FFFFFFFF000100
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0032
-RDATA=000000000200FF0100
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0032
-RDATA=00000000000100
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0032
-RDATA=000000000002666F
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0032
-RDATA=000000000003666F6F
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0032
-RDATA=000000000004666F6F62
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0032
-RDATA=000000000005666F6F6261
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0032
-RDATA=000000000006666F6F626172
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0032
-RDATA=00000000000100000180
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0032
-RDATA=00000000000100FF200000000000000000000000000000000000000000000000000000000000000001
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0032
-RDATA=000000000001000001E0
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0032
-RDATA=00000000000100000180010180020180800180
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0032
-RDATA=00000000000100
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0032
-RDATA=00000000000100
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0032
-RDATA=00000000000100
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_NUMBER8_OVERFLOW
-------
-WARNG=ZS_NUMBER8_OVERFLOW
-------
-WARNG=ZS_NUMBER16_OVERFLOW
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_BASE32HEX_CHAR
-------
-WARNG=ZS_BAD_BASE32HEX_CHAR
-------
-WARNG=ZS_BAD_BASE32HEX_CHAR
-------
-WARNG=ZS_BAD_BASE32HEX_CHAR
-------
-WARNG=ZS_BAD_BASE32HEX_CHAR
-------
-WARNG=ZS_BAD_BASE32HEX_CHAR
-------
-WARNG=ZS_BAD_BASE32HEX_CHAR
-------
-WARNG=ZS_BAD_BASE32HEX_CHAR
-------
-WARNG=ZS_BAD_BASE32HEX_CHAR
-------
-WARNG=ZS_BAD_BASE32HEX_CHAR
-------
-WARNG=ZS_BAD_BASE32HEX_CHAR
-------
-WARNG=ZS_BAD_BASE32HEX_CHAR
-------
-WARNG=ZS_BAD_BASE32HEX_CHAR
-------
-WARNG=ZS_BAD_BITMAP
-------
-WARNG=ZS_NUMBER16_OVERFLOW
-------
-WARNG=ZS_BAD_BITMAP
-------
diff --git a/tests/zscanner/data/40_NSEC3PARAM.in b/tests/zscanner/data/40_NSEC3PARAM.in
deleted file mode 100644
index 694e3f730..000000000
--- a/tests/zscanner/data/40_NSEC3PARAM.in
+++ /dev/null
@@ -1,23 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ NSEC3PARAM 0 0 0 - ; The simplest variant
-@ NSEC3PARAM 255 255 65535 - ; Maximal numbers
-@ NSEC3PARAM 0 0 0 0102FF ; Hex string
-@ TYPE51 \# 5 0000000000 ; TYPE + Hexadecimal rdata
-@ TYPE51 0 0 0 - ; TYPE
-@ nsec3param 0 0 0 - ; Type in lower-case
-
-; KO
-@ NSEC3PARAM
-@ NSEC3PARAM ; Empty rdata
-@ NSEC3PARAM \# 0 ; Hex empty rdata
-@ NSEC3PARAM 256 0 0 00 ; Algorithm overflow
-@ NSEC3PARAM 0 256 0 00 ; Flags overflow
-@ NSEC3PARAM 0 0 65536 00 ; Iterations overflow
-@ NSEC3PARAM 0 0 0 0 ; Hex block length must be multiple of 2
-@ NSEC3PARAM 0 0 0 0x ; Bad hex char
-@ NSEC3PARAM 0 0 0 00 00 ; Hex block must not contain blank spaces
-@ NSEC3PARAM 0 0 0 00 x ; Unexpected item
-@ NSEC3PARAM 0 0 0 ; Missing item
diff --git a/tests/zscanner/data/40_NSEC3PARAM.out b/tests/zscanner/data/40_NSEC3PARAM.out
deleted file mode 100644
index 83b9bb19e..000000000
--- a/tests/zscanner/data/40_NSEC3PARAM.out
+++ /dev/null
@@ -1,58 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0033
-RDATA=0000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0033
-RDATA=FFFFFFFF00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0033
-RDATA=00000000030102FF
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0033
-RDATA=0000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0033
-RDATA=0000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0033
-RDATA=0000000000
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_NUMBER8_OVERFLOW
-------
-WARNG=ZS_NUMBER8_OVERFLOW
-------
-WARNG=ZS_NUMBER16_OVERFLOW
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_REST
-------
-WARNG=ZS_BAD_REST
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
diff --git a/tests/zscanner/data/41_TLSA.in b/tests/zscanner/data/41_TLSA.in
deleted file mode 100644
index 927498e53..000000000
--- a/tests/zscanner/data/41_TLSA.in
+++ /dev/null
@@ -1,21 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ TLSA 0 0 0 00 ; The simplest variant
-@ TLSA 255 255 255 00 ; Maximal numbers
-@ TLSA 0 0 0 0102 00 FF ; Hex string with blank spaces inside
-@ TYPE52 \# 4 00000000 ; TYPE + Hexadecimal rdata
-@ TYPE52 0 0 0 00 ; TYPE
-@ tlsa 0 0 0 00 ; Type in lower-case
-
-; KO
-@ TLSA
-@ TLSA ; Empty rdata
-@ TLSA \# 0 ; Hex empty rdata
-@ TLSA 256 0 0 00 ; Algorithm overflow
-@ TLSA 0 256 0 00 ; Flags overflow
-@ TLSA 0 0 256 00 ; Iterations overflow
-@ TLSA 0 0 0 0 ; Hex block length must be multiple of 2
-@ TLSA 0 0 0 0x ; Bad hex char
-@ TLSA 0 0 0 ; Missing item
diff --git a/tests/zscanner/data/41_TLSA.out b/tests/zscanner/data/41_TLSA.out
deleted file mode 100644
index 6f5b6a154..000000000
--- a/tests/zscanner/data/41_TLSA.out
+++ /dev/null
@@ -1,54 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0034
-RDATA=00000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0034
-RDATA=FFFFFF00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0034
-RDATA=000000010200FF
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0034
-RDATA=00000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0034
-RDATA=00000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0034
-RDATA=00000000
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_NUMBER8_OVERFLOW
-------
-WARNG=ZS_NUMBER8_OVERFLOW
-------
-WARNG=ZS_NUMBER8_OVERFLOW
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
diff --git a/tests/zscanner/data/42_LOC.in b/tests/zscanner/data/42_LOC.in
deleted file mode 100644
index 9eaae1dd6..000000000
--- a/tests/zscanner/data/42_LOC.in
+++ /dev/null
@@ -1,64 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ LOC 1 N 1 E 0 ; The simplest case
-@ LOC 0 1 N 1 E 0 ; Combination of parameters
-@ LOC 0 0 1 N 1 E 0 ; Combination of parameters
-@ LOC 1 N 0 1 E 0 ; Combination of parameters
-@ LOC 1 N 0 0 1 E 0 ; Combination of parameters
-@ LOC 1 N 0 0 1 E 0m ; Combination of parameters
-@ LOC 1 N 1 E 0 1 ; Combination of parameters
-@ LOC 1 N 1 E 0 1m ; Combination of parameters
-@ LOC 1 N 1 E 0 0 1 ; Combination of parameters
-@ LOC 1 N 1 E 0 0 1m ; Combination of parameters
-@ LOC 1 N 1 E 0 0 0 1 ; Combination of parameters
-@ LOC 1 N 1 E 0 0 0 1m ; Combination of parameters
-@ LOC 0 0 0 N 0 0 0 E -100000.00 0 0 0 ; Minimal values
-@ LOC 90 59 59.999 S 180 59 59.999 W 42849672.95m 90000000.00m 90000000.00m 90000000.00m ; Maximal values
-@ LOC 0 S 0 0 0.001 W 0 ; Float dd.ddd test
-@ LOC 0 S 0 0 0.01 W 0 ; Float dd.ddd test
-@ LOC 0 S 0 0 0.1 W 0 ; Float dd.ddd test
-@ LOC 0 S 0 0 1.0 W 0 ; Float dd.ddd test
-@ LOC 0 S 0 0 10 W 0 ; Float dd.ddd test
-@ LOC 0 S 0 W 0 0.01 ; Number to [mantisa,exponent] test
-@ LOC 0 S 0 W 0 0.10 ; Number to [mantisa,exponent] test
-@ LOC 0 S 0 W 0 1.0 ; Number to [mantisa,exponent] test
-@ LOC 0 S 0 W 0 10 ; Number to [mantisa,exponent] test
-@ LOC 0 S 0 W 0 100 ; Number to [mantisa,exponent] test
-@ LOC 0 S 0 W 0 1000 ; Number to [mantisa,exponent] test
-@ LOC 0 S 0 W 0 10000 ; Number to [mantisa,exponent] test
-@ LOC 0 S 0 W 0 100000 ; Number to [mantisa,exponent] test
-@ LOC 0 S 0 W 0 1000000 ; Number to [mantisa,exponent] test
-@ LOC 0 S 0 W 0 10000000 ; Number to [mantisa,exponent] test
-@ LOC \# 16 00 00 00 00 00000000 00000000 00000000 ; Hexadecimal rdata
-@ TYPE29 \# 16 00 00 00 00 00000000 00000000 00000000 ; TYPE + Hexadecimal rdata
-@ TYPE29 0 N 0 E 0 ; TYPE
-@ loc 0 N 0 E 0 ; Type in lower-case
-
-; KO
-@ LOC
-@ LOC ; Empty rdata
-@ LOC \# 0 ; Hex empty rdata
-@ LOC 91 0 0 N 0 0 0 E 0 0 0 0 ; Degree overflow
-@ LOC 0 60 0 N 0 0 0 E 0 0 0 0 ; Minute overflow
-@ LOC 0 0 60 0 N 0 0 0 E 0 0 0 0 ; Second overflow
-@ LOC 0 0 0 N 181 0 0 E 0 0 0 0 ; Degree overflow
-@ LOC 0 0 0 N 0 60 0 E 0 0 0 0 ; Minute overflow
-@ LOC 0 0 0 N 0 0 60 E 0 0 0 0 ; Second overflow
-@ LOC 0 0 0 N 0 0 0 E 42849672.96 0 0 0 ; Altitude overflow
-@ LOC 0 0 0 N 0 0 0 E 42849673 0 0 0 ; Altitude overflow
-@ LOC 0 0 0 N 0 0 0 E -100000.01 0 0 0 ; Altitude underflow
-@ LOC 0 0 0 N 0 0 0 E -100001 0 0 0 ; Altitude underflow
-@ LOC 0 0 0 N 0 0 0 E 0 90000000.01 0 0 ; Size overflow
-@ LOC 0 0 0 N 0 0 0 E 0 90000001 0 0 ; Size overflow
-@ LOC 0 0 0 N 0 0 0 E 0 0 90000000.01 0 ; HP overflow
-@ LOC 0 0 0 N 0 0 0 E 0 0 90000001 0 ; HP overflow
-@ LOC 0 0 0 N 0 0 0 E 0 0 0 90000000.01 ; VP overflow
-@ LOC 0 0 0 N 0 0 0 E 0 0 0 90000001 ; VP overflow
-@ LOC 1 1 E 0 ; Missing N or S
-@ LOC 1 x 1 E 0 ; Bad letter
-@ LOC 1 N 1 0 ; Missing E or W
-@ LOC 1 N 1 x 0 ; Bad letter
-@ LOC 1 N 1 E ; Missing altitude
-@ LOC 0 0 0 N 0 0 0 E 0 0 0 0 x ; Unexpected item
diff --git a/tests/zscanner/data/42_LOC.out b/tests/zscanner/data/42_LOC.out
deleted file mode 100644
index 730cc3b9f..000000000
--- a/tests/zscanner/data/42_LOC.out
+++ /dev/null
@@ -1,248 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=001216138036EE808036EE8000989680
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=001216138000EA608036EE8000989680
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=00121613800003E88036EE8000989680
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=001216138036EE808000EA6000989680
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=001216138036EE80800003E800989680
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=001216138036EE80800003E800989680
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=001216138036EE808036EE8000989680
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=001216138036EE808036EE8000989680
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=000012138036EE808036EE8000989680
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=000012138036EE808036EE8000989680
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=000000128036EE808036EE8000989680
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=000000128036EE808036EE8000989680
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=00000000800000008000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=009999996C79388159295F81FFFFFFFF
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=00121613800000007FFFFFFF00989680
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=00121613800000007FFFFFF600989680
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=00121613800000007FFFFF9C00989680
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=00121613800000007FFFFC1800989680
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=00121613800000007FFFD8F000989680
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=00101613800000008000000000989680
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=00111613800000008000000000989680
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=00121613800000008000000000989680
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=00131613800000008000000000989680
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=00141613800000008000000000989680
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=00151613800000008000000000989680
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=00161613800000008000000000989680
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=00171613800000008000000000989680
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=00181613800000008000000000989680
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=00191613800000008000000000989680
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=00000000000000000000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=00000000000000000000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=00121613800000008000000000989680
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=001D
-RDATA=00121613800000008000000000989680
-------
-WARNG=ZS_BAD_LOC_DATA
-------
-WARNG=ZS_BAD_LOC_DATA
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_LOC_DATA
-------
-WARNG=ZS_BAD_LOC_DATA
-------
-WARNG=ZS_BAD_LOC_DATA
-------
-WARNG=ZS_BAD_LOC_DATA
-------
-WARNG=ZS_BAD_LOC_DATA
-------
-WARNG=ZS_BAD_LOC_DATA
-------
diff --git a/tests/zscanner/data/43_EUI48.in b/tests/zscanner/data/43_EUI48.in
deleted file mode 100644
index a2abbec5c..000000000
--- a/tests/zscanner/data/43_EUI48.in
+++ /dev/null
@@ -1,22 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ EUI48 00-00-00-00-00-00 ; The simplest case
-@ EUI48 FF-FF-FF-FF-FF-FF ; The maximal case
-@ EUI48 aa-bb-cc-dd-ee-ff ; Lower-case
-@ EUI48 \# 6 000000000000 ; Hexadecimal rdata
-@ TYPE108 \# 6 000000000000 ; TYPE + Hexadecimal rdata
-@ TYPE108 00-00-00-00-00-00 ; TYPE
-@ eui48 00-00-00-00-00-00 ; Type in lower-case
-
-; KO
-@ EUI48
-@ EUI48 ; Empty rdata
-@ EUI48 \# 0 ; Hex empty rdata
-@ EUI48 00-00-00-00-00 ; Too few hex pairs
-@ EUI48 00-00-00-00-00-00-00 ; Too many hex pairs
-@ EUI48 00-00-00-00-00-0 ; Missing char in a hex pair
-@ EUI48 00:00-00-00-00-00 ; Bad separator
-@ EUI48 00-00-00-x0-00-00 ; Bad character
-@ EUI48 00-00-00-00-00-00 x ; Unexpected item
diff --git a/tests/zscanner/data/43_EUI48.out b/tests/zscanner/data/43_EUI48.out
deleted file mode 100644
index a54a31472..000000000
--- a/tests/zscanner/data/43_EUI48.out
+++ /dev/null
@@ -1,60 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=006C
-RDATA=000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=006C
-RDATA=FFFFFFFFFFFF
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=006C
-RDATA=AABBCCDDEEFF
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=006C
-RDATA=000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=006C
-RDATA=000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=006C
-RDATA=000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=006C
-RDATA=000000000000
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_EUI_LENGTH
-------
-WARNG=ZS_BAD_EUI_LENGTH
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_CHAR_DASH
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_REST
-------
diff --git a/tests/zscanner/data/44_EUI64.in b/tests/zscanner/data/44_EUI64.in
deleted file mode 100644
index 10f6346cc..000000000
--- a/tests/zscanner/data/44_EUI64.in
+++ /dev/null
@@ -1,22 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ EUI64 00-00-00-00-00-00-00-00 ; The simplest case
-@ EUI64 FF-FF-FF-FF-FF-FF-FF-FF ; The maximal case
-@ EUI64 aa-bb-cc-dd-ee-ff-01-02 ; Lower-case
-@ EUI64 \# 8 0000000000000000 ; Hexadecimal rdata
-@ TYPE109 \# 8 0000000000000000 ; TYPE + Hexadecimal rdata
-@ TYPE109 00-00-00-00-00-00-00-00 ; TYPE
-@ eui64 00-00-00-00-00-00-00-00 ; Type in lower-case
-
-; KO
-@ EUI64
-@ EUI64 ; Empty rdata
-@ EUI64 \# 0 ; Hex empty rdata
-@ EUI64 00-00-00-00-00-00-00 ; Too few hex pairs
-@ EUI64 00-00-00-00-00-00-00-00-00 ; Too many hex pairs
-@ EUI64 00-00-00-00-00-00-00-0 ; Missing char in a hex pair
-@ EUI64 00:00-00-00-00-00-00-00 ; Bad separator
-@ EUI64 00-00-00-x0-00-00-00-00 ; Bad character
-@ EUI64 00-00-00-00-00-00-00-00 x ; Unexpected item
diff --git a/tests/zscanner/data/44_EUI64.out b/tests/zscanner/data/44_EUI64.out
deleted file mode 100644
index 4cce5f532..000000000
--- a/tests/zscanner/data/44_EUI64.out
+++ /dev/null
@@ -1,60 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=006D
-RDATA=0000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=006D
-RDATA=FFFFFFFFFFFFFFFF
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=006D
-RDATA=AABBCCDDEEFF0102
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=006D
-RDATA=0000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=006D
-RDATA=0000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=006D
-RDATA=0000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=006D
-RDATA=0000000000000000
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_EUI_LENGTH
-------
-WARNG=ZS_BAD_EUI_LENGTH
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_CHAR_DASH
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_REST
-------
diff --git a/tests/zscanner/data/45_NID.in b/tests/zscanner/data/45_NID.in
deleted file mode 100644
index a85f9c350..000000000
--- a/tests/zscanner/data/45_NID.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; The NID is the same as the L64, so there are the differences and basics only.
-
-; OK
-@ NID 0 0000:0000:0000:0000 ; The simplest case
-@ NID \# 10 00000000000000000000 ; Hexadecimal rdata
-@ TYPE104 \# 10 00000000000000000000 ; TYPE + Hexadecimal rdata
-@ TYPE104 0 0000:0000:0000:0000 ; TYPE
-@ nid 0 0000:0000:0000:0000 ; Type in lower-case
-
-; KO
-@ NID
diff --git a/tests/zscanner/data/45_NID.out b/tests/zscanner/data/45_NID.out
deleted file mode 100644
index a2bfb4c44..000000000
--- a/tests/zscanner/data/45_NID.out
+++ /dev/null
@@ -1,32 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0068
-RDATA=00000000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0068
-RDATA=00000000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0068
-RDATA=00000000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0068
-RDATA=00000000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0068
-RDATA=00000000000000000000
-------
-WARNG=ZS_BAD_NUMBER
-------
diff --git a/tests/zscanner/data/46_L32.in b/tests/zscanner/data/46_L32.in
deleted file mode 100644
index 866e95394..000000000
--- a/tests/zscanner/data/46_L32.in
+++ /dev/null
@@ -1,21 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ L32 0 0.0.0.0 ; The simplest case
-@ L32 65535 255.255.255.255 ; The maximal case
-@ L32 \# 6 000000000000 ; Hexadecimal rdata
-@ TYPE105 \# 6 000000000000 ; TYPE + Hexadecimal rdata
-@ TYPE105 0 0.0.0.0 ; TYPE
-@ l32 0 0.0.0.0 ; Type in lower-case
-
-; KO
-@ L32
-@ L32 ; Empty rdata
-@ L32 \# 0 ; Hex empty rdata
-@ L32 65536 0.0.0.0 ; Too big preference
-@ L32 0 0.0.0.256 ; 8-bit overflow
-@ L32 0 0.0.0 ; Short address
-@ L32 0 0.0.0.0.0 ; Long address
-@ L32 0 0.0.0.x ; Bad character
-@ L32 0 0.0.0.0 x ; Unexpected item
diff --git a/tests/zscanner/data/46_L32.out b/tests/zscanner/data/46_L32.out
deleted file mode 100644
index e9c77b5f6..000000000
--- a/tests/zscanner/data/46_L32.out
+++ /dev/null
@@ -1,54 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0069
-RDATA=000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0069
-RDATA=FFFFFFFFFFFF
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0069
-RDATA=000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0069
-RDATA=000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0069
-RDATA=000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0069
-RDATA=000000000000
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_NUMBER16_OVERFLOW
-------
-WARNG=ZS_BAD_IPV4
-------
-WARNG=ZS_BAD_IPV4
-------
-WARNG=ZS_BAD_IPV4
-------
-WARNG=ZS_BAD_ADDRESS_CHAR
-------
-WARNG=ZS_BAD_REST
-------
diff --git a/tests/zscanner/data/47_L64.in b/tests/zscanner/data/47_L64.in
deleted file mode 100644
index b4aabf370..000000000
--- a/tests/zscanner/data/47_L64.in
+++ /dev/null
@@ -1,23 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ L64 0 0000:0000:0000:0000 ; The simplest case
-@ L64 65535 FFFF:FFFF:FFFF:FFFF ; The maximal case
-@ L64 0 abcd:ef00:0000:0000 ; Lower-case
-@ L64 \# 10 00000000000000000000 ; Hexadecimal rdata
-@ TYPE106 \# 10 00000000000000000000 ; TYPE + Hexadecimal rdata
-@ TYPE106 0 0000:0000:0000:0000 ; TYPE
-@ l64 0 0000:0000:0000:0000 ; Type in lower-case
-
-; KO
-@ L64
-@ L64 ; Empty rdata
-@ L64 \# 0 ; Hex empty rdata
-@ L64 65536 ; Too big preference
-@ L64 0 0000:0000:0000 ; Missing label
-@ L64 0 0000:0000:0000:0000:0000 ; Too many labels
-@ L64 0 0000:0000:0000:000 ; Missing hex character
-@ L64 0 0000:0000:0000-0000 ; Bad separator
-@ L64 0 0000:0000:0000:x000 ; Bad hex character
-@ L64 0 0000:0000:0000:0000 x ; Unexpected item
diff --git a/tests/zscanner/data/47_L64.out b/tests/zscanner/data/47_L64.out
deleted file mode 100644
index 106ee588b..000000000
--- a/tests/zscanner/data/47_L64.out
+++ /dev/null
@@ -1,62 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=006A
-RDATA=00000000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=006A
-RDATA=FFFFFFFFFFFFFFFFFFFF
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=006A
-RDATA=0000ABCDEF0000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=006A
-RDATA=00000000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=006A
-RDATA=00000000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=006A
-RDATA=00000000000000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=006A
-RDATA=00000000000000000000
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_NUMBER16_OVERFLOW
-------
-WARNG=ZS_BAD_L64_LENGTH
-------
-WARNG=ZS_BAD_L64_LENGTH
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_CHAR_COLON
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_REST
-------
diff --git a/tests/zscanner/data/48_LP.in b/tests/zscanner/data/48_LP.in
deleted file mode 100644
index bc537d0ea..000000000
--- a/tests/zscanner/data/48_LP.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; The LP is the same as the MX, so there are the differences and basics only.
-
-; OK
-@ LP 1 mail ; Relative dname
-@ LP \# 3 0001 00 ; Hexadecimal rdata
-@ TYPE107 \# 3 0001 00 ; TYPE + Hexadecimal rdata
-@ TYPE107 1 @ ; TYPE
-@ lp 1 @ ; Type in lower-case
-
-; KO
-@ LP
diff --git a/tests/zscanner/data/48_LP.out b/tests/zscanner/data/48_LP.out
deleted file mode 100644
index 4961c7e90..000000000
--- a/tests/zscanner/data/48_LP.out
+++ /dev/null
@@ -1,32 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=006B
-RDATA=0001046D61696C00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=006B
-RDATA=000100
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=006B
-RDATA=000100
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=006B
-RDATA=000100
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=006B
-RDATA=000100
-------
-WARNG=ZS_BAD_NUMBER
-------
diff --git a/tests/zscanner/data/49_CDS.in b/tests/zscanner/data/49_CDS.in
deleted file mode 100644
index 7b6c3477e..000000000
--- a/tests/zscanner/data/49_CDS.in
+++ /dev/null
@@ -1,23 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ CDS 0 0 0 00 ; The simplest variant
-@ CDS 65535 255 255 00 ; Maximal numbers
-@ CDS 0 RSAMD5 0 00 ; Algorithm mnemonic
-@ CDS 0 0 0 01 02 0304 ; Hex block with blank spaces between them
-@ TYPE59 \# 5 0000000000 ; TYPE + Hexadecimal rdata
-@ TYPE59 0 0 0 00 ; TYPE
-@ cds 0 0 0 00 ; Type in lower-case
-
-; KO
-@ CDS
-@ CDS ; Empty rdata
-@ CDS \# 0 ; Hex empty rdata
-@ CDS 65536 0 0 00 ; Key tag overflow
-@ CDS 0 256 0 00 ; Algorithm overflow
-@ CDS 0 0 256 00 ; Digest type overflow
-@ CDS 0 0 0 0 ; Continuous block length must be multiple of 2
-@ CDS 0 0 0 00 0 ; Continuous block length must be multiple of 2
-@ CDS 0 0 0 XX ; Bad hex character
-@ CDS 0 0 0 ; Missing item
diff --git a/tests/zscanner/data/49_CDS.out b/tests/zscanner/data/49_CDS.out
deleted file mode 100644
index de4072253..000000000
--- a/tests/zscanner/data/49_CDS.out
+++ /dev/null
@@ -1,62 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=003B
-RDATA=0000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=003B
-RDATA=FFFFFFFF00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=003B
-RDATA=0000010000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=003B
-RDATA=0000000001020304
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=003B
-RDATA=0000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=003B
-RDATA=0000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=003B
-RDATA=0000000000
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_NUMBER16_OVERFLOW
-------
-WARNG=ZS_NUMBER8_OVERFLOW
-------
-WARNG=ZS_NUMBER8_OVERFLOW
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
diff --git a/tests/zscanner/data/50_CDNSKEY.in b/tests/zscanner/data/50_CDNSKEY.in
deleted file mode 100644
index dc91462d8..000000000
--- a/tests/zscanner/data/50_CDNSKEY.in
+++ /dev/null
@@ -1,32 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ CDNSKEY 0 0 0 AA== ; The simplest variant
-@ CDNSKEY 65535 255 255 AA== ; Maximal numbers
-@ CDNSKEY 0 0 RSAMD5 AA== ; Algorithm mnemonic
-@ CDNSKEY 0 0 0 Zm8= ; One char padding
-@ CDNSKEY 0 0 0 Zm9v ; Without padding
-@ CDNSKEY 0 0 0 Zm9vYg== ; Two base64 blocks
-@ CDNSKEY 0 0 0 Zm9v YmE= ; Two base64 blocks with blank space between them
-@ TYPE60 \# 5 0000000000 ; TYPE + Hexadecimal rdata
-@ TYPE60 0 0 0 AA== ; TYPE
-@ cdnskey 0 0 0 AA== ; Type in lower-case
-
-; KO
-@ CDNSKEY
-@ CDNSKEY ; Empty rdata
-@ CDNSKEY \# 0 ; Hex empty rdata
-@ CDNSKEY 65536 0 0 AA== ; Type overflow
-@ CDNSKEY 0 256 0 AA== ; Key tag overflow
-@ CDNSKEY 0 0 256 AA== ; Algorithm overflow
-@ CDNSKEY 0 0 0 A ; Continuous block length must be multiple of 4
-@ CDNSKEY 0 0 0 AB ; Continuous block length must be multiple of 4
-@ CDNSKEY 0 0 0 ABC ; Continuous block length must be multiple of 4
-@ CDNSKEY 0 0 0 AA == ; Continuous block length must be multiple of 4
-@ CDNSKEY 0 0 0 A=== ; Bad padding
-@ CDNSKEY 0 0 0 = ; Bad padding
-@ CDNSKEY 0 0 0 == ; Bad padding
-@ CDNSKEY 0 0 0 === ; Bad padding
-@ CDNSKEY 0 0 0 ==== ; Bad padding
-@ CDNSKEY 0 0 0 ; Missing item
diff --git a/tests/zscanner/data/50_CDNSKEY.out b/tests/zscanner/data/50_CDNSKEY.out
deleted file mode 100644
index 31003139b..000000000
--- a/tests/zscanner/data/50_CDNSKEY.out
+++ /dev/null
@@ -1,92 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=003C
-RDATA=0000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=003C
-RDATA=FFFFFFFF00
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=003C
-RDATA=0000000100
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=003C
-RDATA=00000000666F
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=003C
-RDATA=00000000666F6F
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=003C
-RDATA=00000000666F6F62
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=003C
-RDATA=00000000666F6F6261
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=003C
-RDATA=0000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=003C
-RDATA=0000000000
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=003C
-RDATA=0000000000
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_NUMBER16_OVERFLOW
-------
-WARNG=ZS_NUMBER8_OVERFLOW
-------
-WARNG=ZS_NUMBER8_OVERFLOW
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_BASE64_CHAR
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
-WARNG=ZS_BAD_RDATA
-------
diff --git a/tests/zscanner/data/51_URI.in b/tests/zscanner/data/51_URI.in
deleted file mode 100644
index 8d18f4272..000000000
--- a/tests/zscanner/data/51_URI.in
+++ /dev/null
@@ -1,22 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ URI 0 0 a ; The simplest variant
-@ URI 65535 65535 ftp://a ; Maximal priority and weight
-@ URI 0 0 "ftp://a" ; Quoted target
-@ URI 0 0 012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 ; Target longer than 255
-@ TYPE256 \# 5 0000000061 ; TYPE + Hexadecimal rdata
-@ TYPE256 0 0 a ; TYPE
-@ uri 0 0 a ; Type in lower-case
-
-; OK extensions
-@ URI 0 0 "" ; Empty target
-
-; KO
-@ URI
-@ URI ; Empty rdata
-@ URI \# 0 ; Hex empty rdata
-@ URI 65536 0 a ; Priority overflow
-@ URI 0 65536 a ; Weight overflow
-@ URI 0 0 a a ; Unexpected item
diff --git a/tests/zscanner/data/51_URI.out b/tests/zscanner/data/51_URI.out
deleted file mode 100644
index 9dcf93395..000000000
--- a/tests/zscanner/data/51_URI.out
+++ /dev/null
@@ -1,60 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0100
-RDATA=0000000061
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0100
-RDATA=FFFFFFFF6674703A2F2F61
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0100
-RDATA=000000006674703A2F2F61
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0100
-RDATA=00000000303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0100
-RDATA=0000000061
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0100
-RDATA=0000000061
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0100
-RDATA=0000000061
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0100
-RDATA=00000000
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_NUMBER16_OVERFLOW
-------
-WARNG=ZS_NUMBER16_OVERFLOW
-------
-WARNG=ZS_BAD_REST
-------
diff --git a/tests/zscanner/data/52_CAA.in b/tests/zscanner/data/52_CAA.in
deleted file mode 100644
index 7043ce560..000000000
--- a/tests/zscanner/data/52_CAA.in
+++ /dev/null
@@ -1,23 +0,0 @@
-$ORIGIN .
-$TTL 1
-
-; OK
-@ CAA 0 a a ; The simplest variant
-@ CAA 255 a a ; Maximal flags
-@ CAA 0 a "a ; b" ; Quoted value
-@ CAA 0 a 012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 ; Value longer than 255
-@ TYPE257 \# 4 00016161 ; TYPE + Hexadecimal rdata
-@ TYPE257 0 a a ; TYPE
-@ caa 0 a a ; Type in lower-case
-
-; OK fallbacks and extensions
-@ CAA 0 "" a ; Empty tag
-@ CAA 0 "a" a ; Quoted tag
-@ CAA 0 abcdefghijklmnopqrstuvwxyz0123456789 a ; All allowed characters, longer than 15
-
-; KO
-@ CAA
-@ CAA ; Empty rdata
-@ CAA \# 0 ; Hex empty rdata
-@ CAA 256 a a ; Flags overflow
-@ CAA 0 a a a ; Unexpected item
diff --git a/tests/zscanner/data/52_CAA.out b/tests/zscanner/data/52_CAA.out
deleted file mode 100644
index e5eefdf3e..000000000
--- a/tests/zscanner/data/52_CAA.out
+++ /dev/null
@@ -1,70 +0,0 @@
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0101
-RDATA=00016161
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0101
-RDATA=FF016161
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0101
-RDATA=00016161203B2062
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0101
-RDATA=000161303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0101
-RDATA=00016161
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0101
-RDATA=00016161
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0101
-RDATA=00016161
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0101
-RDATA=000061
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0101
-RDATA=00016161
-------
-OWNER=00
-CLASS=0001
-RRTTL=00000001
-RTYPE=0101
-RDATA=00246162636465666768696A6B6C6D6E6F707172737475767778797A3031323334353637383961
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_NUMBER
-------
-WARNG=ZS_BAD_HEX_CHAR
-------
-WARNG=ZS_NUMBER8_OVERFLOW
-------
-WARNG=ZS_BAD_REST
-------
diff --git a/tests/zscanner/data/includes/include1 b/tests/zscanner/data/includes/include1
deleted file mode 100644
index 9de185968..000000000
--- a/tests/zscanner/data/includes/include1
+++ /dev/null
@@ -1,9 +0,0 @@
-$TTL 1
-
-a NS @
-
-$ORIGIN tld1a.
-a NS @
-
-$ORIGIN tld1b.
-a NS @
diff --git a/tests/zscanner/data/includes/include2 b/tests/zscanner/data/includes/include2
deleted file mode 100644
index 1e14e9601..000000000
--- a/tests/zscanner/data/includes/include2
+++ /dev/null
@@ -1,6 +0,0 @@
-$TTL 1H
-
-b NS @
-
-$ORIGIN tld1a.
-b NS @
diff --git a/tests/zscanner/data/includes/include3 b/tests/zscanner/data/includes/include3
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/zscanner/data/includes/include3
+++ /dev/null
diff --git a/tests/zscanner/data/includes/include4 b/tests/zscanner/data/includes/include4
deleted file mode 100644
index 7e8d5e29e..000000000
--- a/tests/zscanner/data/includes/include4
+++ /dev/null
@@ -1 +0,0 @@
-a NS ; Missing data
diff --git a/tests/zscanner/data/includes/include5 b/tests/zscanner/data/includes/include5
deleted file mode 100644
index ac98e01b6..000000000
--- a/tests/zscanner/data/includes/include5
+++ /dev/null
@@ -1 +0,0 @@
-$TTL x ; Bad number
diff --git a/tests/zscanner/data/includes/include6 b/tests/zscanner/data/includes/include6
deleted file mode 100644
index b5e8cb84b..000000000
--- a/tests/zscanner/data/includes/include6
+++ /dev/null
@@ -1 +0,0 @@
-$INCLUDE include2 ; Include in include