diff --git a/tests-extra/tests/dnssec/no_resign/data/example.zone.1 b/tests-extra/tests/dnssec/no_resign/data/example.zone.1
deleted file mode 100644
index 1f3cfac659e16af88fe6f05d9e0231b18f09f224..0000000000000000000000000000000000000000
--- a/tests-extra/tests/dnssec/no_resign/data/example.zone.1
+++ /dev/null
@@ -1,75 +0,0 @@
-; File written on Mon Sep 8 14:59:12 2014
-; dnssec_signzone version 9.9.0
-example. 3600 IN SOA ns1.exAmpLe. BUGS.x.w.example. 1081539377 3600 300 3600000 3600
-example. 3600 IN RRSIG SOA 5 1 3600 20500101000000 20140908115912 35721 example. eUi219ENFoSmkCstQZ0D/eYNg3amKIdX8HvW1qHwM2rSv9Q7XaCI2NBy ki0poLwEuabZf8SHm2Kqh7EA35UFKYkEhEwtN/292ROuHVkZRCUzM3lD 9PT1NPkleqT3JcjiBRy3BCTirnGX5qQXK9qKW08fIawvNhwexI3e5hjS QUU=
-example. 3600 IN NS ns1.example.
-example. 3600 IN NS ns2.example.
-example. 3600 IN RRSIG NS 5 1 3600 20500101000000 20140908115912 35721 example. XRYbz0NL/bcF4uOH+puXe5hSJgmG9wX+sWz7ksi3Vl4HO5InUkyltxkn CdWw0M8cfpM8FM30inACCOOfBUEbyFL7TWUjfTwk3jKDX+7gm5FkItNE 2ZMLK0QnyjWQOiE5G15+cvV31eQHBRFpYLrQBIeGiL+V9aDYafTLV+Yt 0e0=
-example. 3600 IN MX 1 XX.example.
-example. 3600 IN RRSIG MX 5 1 3600 20500101000000 20140908115912 35721 example. ejvossk9ErTnwuBQ0bcfwRXOvXeIJ419x/AphtwAJMtsj01kASdszAi1 Rzlo1CSca18Z6nq0XZQ1KeDjLg07WEWS1WU8l30RAKgWawlCjjJeeOTy r0GJ2IYhtbFDm9BB3u6EUmrD5/1/1NBchvWATMCo4FfspGNwZ7BgiUB3 ne4=
-example. 3600 IN NSEC a.example. NS SOA MX RRSIG NSEC DNSKEY
-example. 3600 IN RRSIG NSEC 5 1 3600 20500101000000 20140908115912 35721 exAMple. X20KQj2os3I3fMWGXLoNccWhbP53v95PwHrKZJPCf0KawwAMsGNXfKfT 9mDLGi4AJMImmJJfufSI/Za1clHQ5n5t2Ru5w0W4QAPkpBaWuQSU/5WU IV54lCVtBBgTMuf3zpMnRgda2Q/o1XoFvN3+5eFvk0Qgs3m4OxBIfeJu Z7c=
-example. 3600 IN DNSKEY 256 3 5 AwEAAdcURIq28DnbSgdwnQjjX/9ihQAgPylq7HHnMjQOm59fGPMnsjy/ AkpcNxadAVGRycM7jZHloPyp7Tty/11J9wKDsLR86YChcYk9KXFKakdr EE1jchkL7KYL7g0bUTAIJSDLhsn6TyLILzgTX6Ru4mCceS4wLJ30LSi+ DR4cockH
-example. 3600 IN DNSKEY 257 3 5 AwEAAeMNmQ/1/6yfFfp7jOqy2M7AGBtuSzZJFpnUqrcAmTTI+RxX9vN0 1Z5CpAs9nhYTVyLEQLaGQBwkrF+QBIPJ6DQ0SvHJEWEAN25tyvWmDdUj eDnevEpbQbkdaV+XQJ3SMWGf7OtzGo0BC4vO5ecw+zGteWT/UUbX9XkK 3vWOirLAF1s5kNEEnUt+kIbr50vz+qOfvWa+ldWHSt2T2Ds6fMVkdE84 gyb3mE0syQbEuSdgOO6Vko4qn9FtJ2Uz0L2i8vKb1chT+f7RISQhicTL X/RQgH0kV80UCBtn4CEgE6Cx5Yv+z50li0I4bNRI1BLBqJneCeN/eqQs /pYNJhZg4d8=
-example. 3600 IN RRSIG DNSKEY 5 1 3600 20500101000000 20140908115912 35721 example. zft/jYjZDK2eq6twehtmp6W3UgZQBVhDjDauBwGG6jimkZ00PwAL4Eh5 1ZM/nGnw8CPt6YxXK32FGoLy9VQTOgFUfp0myZiRggH1At7RSBusDyOA I/BaZhJ+X1hCG2wfvPfiD9irPHB11az+isrms4FmQrWsPkyF/A3ZJqcl DpM=
-example. 3600 IN RRSIG DNSKEY 5 1 3600 20500101000000 20140908115912 65014 example. Sso2em1SJhXTZTVEnnfEZaK7VdSSbw7Ytd3cJuDEi7qVgbMJpNCZg1Of S2VIMlmf3sdzMrMOFbbXzdyAATHCmqBTqcMYEzSAH+mzc3hletbLM683 ChR3c8PJL1hUbHAGl3va8hK5jRsXaNlDjnOuyFQsiEBZU0lXFHyqvENR OBg7CJlDZeC8mdzaoTOLvklJFk6b8ktROYfjyaACVwFhQENIs1mxI12N YrjwDZV3ZHweDVfbh5qIjj855NwsDqJWahg0fBdbQA9B667KCIesuxp/ HstbKk7Ild193Ye5Rcqvtg5vesoOeQZducYtLLztr/hDLAWn9tEa0R2N /HzGSA==
-*.a.example. 3600 IN A 192.0.2.11
-ns1.a.example. 3600 IN A 192.0.2.5
-ns2.a.example. 3600 IN A 192.0.2.6
-ns1.b.example. 3600 IN A 192.0.2.7
-ns2.b.example. 3600 IN A 192.0.2.8
-b.example. 3600 IN NS ns1.b.example.
-b.example. 3600 IN NS ns2.b.example.
-b.example. 3600 IN NS NS2.b.eXample.
-b.example. 3600 IN NSEC ns1.example. NS RRSIG NSEC
-b.example. 3600 IN RRSIG NSEC 5 2 3600 20500101000000 20140908115912 35721 example. gXx+XR8khxgHGl4Zc5H2Fk+ekZQMFyb8qVGGztE+sGh6YD8ERZyBi6J/ GaL+PF7iDO9qJvrOHmULssCgiiTooWhnG8ezXt429ADB+8bsd9qjoyU1 cAcYL6zXHpYdf8LOTSetEaaoZISF0buD3UMOmErSZ+z5liN09V+woZqu 2K0=
-a.example. 3600 IN NS nS1.A.example.
-a.example. 3600 IN NS ns2.a.example.
-a.example. 3600 IN DS 57855 5 1 B6DCD485719ADCA18E5F3D48A2331627FDD3636B
-a.example. 3600 IN RRSIG DS 5 2 3600 20500101000000 20140908115912 35721 example. X5GpSOMM71nyseLAMDsZ0ClXiQknr4KNhnde+WYsSeQwSmHjxE7cyhrt KBrhRpaCTwjGn2ydmYteRWkeCGhatr19zqdHVbu0KCbX2RQ+dv2FUu2o aw4yzIGGPsw38BxwCECauLiPIAN9cx57QIIGNRxMsestpQf1xgdNrBPS p/s=
-a.example. 3600 IN NSEC ai.example. NS DS RRSIG NSEC
-a.example. 3600 IN RRSIG NSEC 5 2 3600 20500101000000 20140908115912 35721 example. ISCOL3yUf66kEwYq3mGbc8atYg0q4Be2U86zfisEBsFcp95VE4roe7hA Zn8tvo9CgyiZ0oPpWcFdwThD7kJlDz6pW0yaUNL0m6vfVGmPJSSUITNC QUleyQKTv43UyyLGxYBazpdQkVgETD29uFI77Kb2p8sThWgD6/incQjE 4s0=
-*.to-nxdomain.example. 3600 IN CNAME nxdOMAin.eXAmple.
-*.to-nxdomain.example. 3600 IN RRSIG CNAME 5 2 3600 20500101000000 20140908115912 35721 example. WMK7tl1ialmOHlfJfr4Xi2Q0Vm1nxWfZgyxIMKWp3ZtaYssdDgGeu/hw xu26bztP6KZdBAtODP4m80DNNyTkTBABAlHGhlRzzdtuJUxDf106OdzX wmHYF3RUUghosTByoOk9jo4ZxqZczYJXTSPD/f8CJbe0w2Jj8u3KXuNV pao=
-*.to-nxdomain.example. 3600 IN NSEC *.w.example. CNAME RRSIG NSEC
-*.to-nxdomain.example. 3600 IN RRSIG NSEC 5 2 3600 20500101000000 20140908115912 35721 example. YKLAdVvMKdkBjkCAc7pANAiWsKnG1HPcbi8H7D+sIeXN879yk5VLxrxb sMvBlLKqAiRJvT/bfUg7Q1oUNs6hCJgI6GdfNjU4iWVOTixj1rwbUCoG HqEJdOpHsqcTIa7h3Cw46JRPZvv4Cb0nMidOdYlW4y6ibLaIO0WIy7Ds 1o8=
-ns1.example. 3600 IN A 192.0.2.1
-ns1.example. 3600 IN RRSIG A 5 2 3600 20500101000000 20140908115912 35721 example. RFN2tl028ynt2E2piY5fvvLdjgp1kAVoGk5DT6Quzufteakyh3tvMp+d JHh5udX6xjYF9Ah06/LrDTHMXcK2wi6xW06d6xVoQFe/D4l1bY+giIjF 14cQXpk457ubi4Slg2JTOJFZ2pL8TtE6/Ac+CP+YqwzW4o3qoibOB+Xr uoc=
-ns1.example. 3600 IN NSEC ns2.example. A RRSIG NSEC
-ns1.example. 3600 IN RRSIG NSEC 5 2 3600 20500101000000 20140908115912 35721 example. gU9b8lPWyU89ul+pZKFjynLg7QDQI0vpsd4o9ACJk/S0Kgc1H26WHgDJ CLrZLo954KEbR/05rHhQ+BRgpeFg9yLjIto2MjcMP+OpzDZPRQVa596J NIGPeQqAEPTFv3K5+PWz7YVonbLk0vXvfJ5jyeSWvo3rITmA5ReEOwHb sg4=
-*.w.example. 3600 IN MX 1 ai.example.
-*.w.example. 3600 IN RRSIG MX 5 2 3600 20500101000000 20140908115912 35721 example. Jnrp1CsAoXv41ZaIRUMi5ELE7O5hY1NurfaOm/610C79CI+ItgMsVO5R I3RQOVuxWAdFIec+B+uoECJCFybQEBiMJpR7xcUpD2GliPJGpYRTF1T3 kyq+8DQwRJd3wvPD9HNn8TZ6GRNzrsNkvwn6oQyOl0rALw+BqoT0CR+F 3BU=
-*.w.example. 3600 IN NSEC x.w.example. MX RRSIG NSEC
-*.w.example. 3600 IN RRSIG NSEC 5 2 3600 20500101000000 20140908115912 35721 example. OE/NteBXdX6rUE6YrqpbfhVE/Tt3/pe/ESPDdirdoQTdd5s3O53W9MfZ P0EgAYVfGWXL31m0miZGJRjMhmhndp6oGKtGDC8GOE++iWH0896fbfJO GyIiEMU9jjyQiEySU23qd8gYVoF1bqlTER2WOKVjELwE4Vhog+wW+F7u suI=
-x.w.example. 3600 IN MX 1 xx.example.
-x.w.example. 3600 IN RRSIG MX 5 3 3600 20500101000000 20140908115912 35721 example. t6zcmnIJrWQD0H58Kw541izgtSZFfBn4vR5yidnrZSt0qlzNR6608VFe 6TtDxTxNlF/eefcBPnON0FCm7CEezOGoWNkBmTYTOcbdgNoIsR5sN4QZ 6OW5XzT16JM/yZByBxiO/pereunqIUHvPkv1pJPbGLBzzGxVLpc9FWQY mpQ=
-x.w.example. 3600 IN NSEC x.y.w.example. MX RRSIG NSEC
-x.w.example. 3600 IN RRSIG NSEC 5 3 3600 20500101000000 20140908115912 35721 example. qSKOIR3CWEpGZ6dJHZCbwv5m6Wv+0sO7Dr2eFaQE4FU0Zw9xUa9z5U7v 5PaDlHCVxRq/cD7I6/0oKVC79uVZ14HK3QGhhuNyR2moJ8ih5MkjAqLP D0yV1y0atSs85KzFZ8Lj0gwYy21hZ7RmtCg6/aCEa0XMk4InUgErypDO 5/0=
-x.y.w.example. 3600 IN MX 1 xx.example.
-x.y.w.example. 3600 IN RRSIG MX 5 4 3600 20500101000000 20140908115912 35721 example. J2GbHhAyuIV0uhaSX5M4OAX9qKX88KH7eZrd0JKuzn3O64fPIAtJzOXU nt1LBuPPk+Not0SoZHe47VJLObx8WtHsWLIKcb5CbXy5ccR47eLQcDvm wwZznPqpztThY5N6tf+8ZcDXJrGDaeN+xxa3tYgwWHAl513+9gHwrQHC uJs=
-x.y.w.example. 3600 IN NSEC xx.example. MX RRSIG NSEC
-x.y.w.example. 3600 IN RRSIG NSEC 5 4 3600 20500101000000 20140908115912 35721 example. lPtK1L/OHJFHH1uAo8bLjJZBtEOF1fqZLosDcWz4snaSB+Eiva8cVNqT qhuwbVtDK3yECPNrl2jsegVaax5yUuqUbZEU81tbpDDOA86WpSPjykij kagCaie3kEfxQGP4BkmwG3v5qDn8ABmJI0m2/giFV4rczsn+INGkV3Kj REE=
-*.to-apex.example. 3600 IN CNAME example.
-*.to-apex.example. 3600 IN RRSIG CNAME 5 2 3600 20500101000000 20140908115912 35721 example. F9jwC5zU4KAGNDqLMS4n1molS0X4IgKSBzyxdCJYo8tUMwrKVViVhmiT 3W+9YGEd999ODbZxrS73sWYf5e3ckzkVDqH9PsDf0YUUJaxsn0+mHufN GRLKOTSZPFDH8ENK1EpEfdIhcHV6EZy3+sm4yY8dai2E3SgfRQSB41bF VIk=
-*.to-apex.example. 3600 IN NSEC *.to-nxdomain.example. CNAME RRSIG NSEC
-*.to-apex.example. 3600 IN RRSIG NSEC 5 2 3600 20500101000000 20140908115912 35721 example. ZX5r61rjIve+amNKzbImn9uqI1kpIxOG2n6YHEnqNLYNLMg0jRQZ+r7u s+1L6RKeYeuZwNd+W3mKGU4ysHg6ZEZrRmPp+c/RTdtDb6hUYclISFIS RGS++Twjj8xTpWNpAHCD7od9RNQvRecIlKWxQqAy2EOchjHiW4tvceev UeA=
-xx.example. 3600 IN A 192.0.2.10
-xx.example. 3600 IN RRSIG A 5 2 3600 20500101000000 20140908115912 35721 example. t+h8JbOnvj4YbldhiSYmDBn0A7890Ovt4mo1+QYA7AuqR2ZyzlMOxr6R 15Sb2bPuaYNl7vrCNn0kKjljfiHp3r/x+Afl6wfwrEIn1QIufBw9bQVk YT5xpkXay+PFK4kp2+MIsNUriBz73wAar/fQaWs7VKfp6rFsZFLdAEYo pYo=
-xx.example. 3600 IN HINFO "KLH-10" "TOPS-20"
-xx.example. 3600 IN RRSIG HINFO 5 2 3600 20500101000000 20140908115912 35721 example. Cr8KJMUOhPj711WbHNbdvs4XhOK5lIsI0J1jASOVSD4Z8zEX3K7Q5iCL R2GYyJbYC4EhX2FQ+yJIGs7XEQ7VCN+Ur7LSVmEMkXPYGeiOFD4zm9XO VR3d+nOn6zRqA0v2YJ/k17526X7Jy76/WajN9z7khqs6r0tiX+nzAOGs LxY=
-xx.example. 3600 IN AAAA 2001:db8::f00:baaa
-xx.example. 3600 IN RRSIG AAAA 5 2 3600 20500101000000 20140908115912 35721 example. F9OfD+NISAkcmCBTj3cQ4xJ4tWJVmHnfMEtcaic4sh7apICS6hllJ/Yw f8CwdrFe+k9qII14EgT/LcMYKVuokYRxjB947hrr5TTnh9QVAtLN/C+/ kITslpj/zWmGSNyeUQrlDPCYjEsNG0XAv2aYConmyaSubsrJVmLKS5aV ygA=
-xx.example. 3600 IN NSEC example. A HINFO AAAA RRSIG NSEC
-xx.example. 3600 IN RRSIG NSEC 5 2 3600 20500101000000 20140908115912 35721 example. VOsK6bM+BRbqjb1JR/Ihv0OAeqs0JIQsIM5usysR+qu+jAECoN9eSBaw /4OudXJ8AUCIo/Ew1aVYbfRTy5pGCbfD2Iwb0kPBIAtQq3I2k+r64+tg LIN00Dpv3WVbeiiPCaXR0FH0EXiJAJYQ2fJBaTuoLN1stXQM6WHmoVQ9 7ck=
-ns2.example. 3600 IN A 192.0.2.2
-ns2.example. 3600 IN RRSIG A 5 2 3600 20500101000000 20140908115912 35721 example. Bj944ofhclaYOXNuNLSvUTU91cnUd+lVK86M6AXDz7dcUFGSGbabejFC +Ci/jthTAWKj4Hnyf265rNzq2C2XyfWSsktY4lqmT0JNmWi7168S/RSn nktNln1TZHZSOAozKz1IOCVDA5WQZFtpP21znjb1DClbkn4pAyG0Uq9J iWE=
-ns2.example. 3600 IN NSEC *.to-apex.example. A RRSIG NSEC
-ns2.example. 3600 IN RRSIG NSEC 5 2 3600 20500101000000 20140908115912 35721 example. e5TzMezHmLQzCQW2aPjptx3R0j5E93eV094e7JDDkJlYR25tRCZIh21S mHe9UPHP0JJTgrGk3dEx8BoanFz0g+nBVSvm9B62mSVtBdvetIgaKr+B G6OYniy/Oeqwy+jV/nzKPgXuuPeVygW4lHzbWQlosGzlzGbLbGntjAuT 2rY=
-ai.example. 3600 IN A 192.0.2.9
-ai.example. 3600 IN RRSIG A 5 2 3600 20500101000000 20140908115912 35721 example. OjdP4QKWwaVlCHEHDdevuIqC4WvDeDtJWSxGNkm0qeg1zPzJIH2HP1IA UCLzyDQMz4/QZAMRw/g60vZscjpbJk78cwFAMdid9WI1fN8ty5MfbPP4 9nSSnKxiFya9NW8FpQjKCqUUuOGbLmUxwaCHYp4qVc+HZ29Qv3x7m+Dp V7I=
-ai.example. 3600 IN HINFO "KLH-10" "ITS"
-ai.example. 3600 IN RRSIG HINFO 5 2 3600 20500101000000 20140908115912 35721 example. jgmJU1v65Ab2huFEZ+xB/u6WmuXn/NHdGM6gihgw5rhf9V7DbFd+86O4 v+qTXXm4j0g36RdWTQVh//rPT9SIgAToEy6rUeazwyjKNP81n2dj/STe oawIL745/8NsWvd31cLsTEM8IJcMNn1+Z/131Dq4UQ+cyDd8IPrV/n7d PIk=
-ai.example. 3600 IN AAAA 2001:db8::f00:baa9
-ai.example. 3600 IN RRSIG AAAA 5 2 3600 20500101000000 20140908115912 35721 example. XEvBDYe8WvsePqoe8UhuuXUEMkrbnPBY5T2JDrn4ux8FQh1eFoPkLsXt 809++XA3t1STUSisrU1MLqVGgMQtTep6o695Rlj/YSQgRgZ0BydwgqiX 6ciSNuTBDdf3csyjbVKSuObWpcnztNVYx4NhoRKp5ouL9Y2DH2lUrc46 +Lg=
-ai.example. 3600 IN NSEC b.example. A HINFO AAAA RRSIG NSEC
-ai.example. 3600 IN RRSIG NSEC 5 2 3600 20500101000000 20140908115912 35721 example. xaK3rgN3f4ROz3ee9BlylWvc2H2wT+VnNbXT4CBJ8w3mpcIz5fuKYkCh jY7PwZqN9bCOv6HK6W6dmuNhELk5ahHCRu7iE5HXRgP8xAPZBZODvnG6 D6tGb0yqmqZ0IFBmW8z+XcH3wvhhJof2QkUsPKX475d2GL7eUQpBuU9F RzA=
diff --git a/tests-extra/tests/dnssec/no_resign/data/example.zone.2 b/tests-extra/tests/dnssec/no_resign/data/example.zone.2
deleted file mode 100644
index 2948bc82218bb90de66878f2f363b88dd39e9f97..0000000000000000000000000000000000000000
--- a/tests-extra/tests/dnssec/no_resign/data/example.zone.2
+++ /dev/null
@@ -1,75 +0,0 @@
-; File written on Mon Sep 8 14:59:12 2014
-; dnssec_signzone version 9.9.0
-example. 3600 IN SOA ns1.exAmpLe. BUGS.x.w.example. 1081539377 3600 300 3600000 3600
-example. 3600 IN RRSIG SOA 5 1 3600 20500101000000 20140908115912 35721 example. eUi219ENFoSmkCstQZ0D/eYNg3amKIdX8HvW1qHwM2rSv9Q7XaCI2NBy ki0poLwEuabZf8SHm2Kqh7EA35UFKYkEhEwtN/292ROuHVkZRCUzM3lD 9PT1NPkleqT3JcjiBRy3BCTirnGX5qQXK9qKW08fIawvNhwexI3e5hjS QUU=
-example. 3600 IN NS ns1.example.
-example. 3600 IN NS ns2.example.
-example. 3600 IN RRSIG NS 5 1 3600 20500101000000 20140908115912 35721 example. XRYbz0NL/bcF4uOH+puXe5hSJgmG9wX+sWz7ksi3Vl4HO5InUkyltxkn CdWw0M8cfpM8FM30inACCOOfBUEbyFL7TWUjfTwk3jKDX+7gm5FkItNE 2ZMLK0QnyjWQOiE5G15+cvV31eQHBRFpYLrQBIeGiL+V9aDYafTLV+Yt 0e0=
-example. 3600 IN MX 1 XX.example.
-example. 3600 IN RRSIG MX 5 1 3600 20500101000000 20140908115912 35721 example. ejvossk9ErTnwuBQ0bcfwRXOvXeIJ419x/AphtwAJMtsj01kASdszAi1 Rzlo1CSca18Z6nq0XZQ1KeDjLg07WEWS1WU8l30RAKgWawlCjjJeeOTy r0GJ2IYhtbFDm9BB3u6EUmrD5/1/1NBchvWATMCo4FfspGNwZ7BgiUB3 ne4=
-example. 3600 IN NSEC A.example. NS SOA MX RRSIG NSEC DNSKEY
-example. 3600 IN RRSIG NSEC 5 1 3600 20500101000000 20140908115912 35721 exAMple. X20KQj2os3I3fMWGXLoNccWhbP53v95PwHrKZJPCf0KawwAMsGNXfKfT 9mDLGi4AJMImmJJfufSI/Za1clHQ5n5t2Ru5w0W4QAPkpBaWuQSU/5WU IV54lCVtBBgTMuf3zpMnRgda2Q/o1XoFvN3+5eFvk0Qgs3m4OxBIfeJu Z7c=
-example. 3600 IN DNSKEY 256 3 5 AwEAAdcURIq28DnbSgdwnQjjX/9ihQAgPylq7HHnMjQOm59fGPMnsjy/ AkpcNxadAVGRycM7jZHloPyp7Tty/11J9wKDsLR86YChcYk9KXFKakdr EE1jchkL7KYL7g0bUTAIJSDLhsn6TyLILzgTX6Ru4mCceS4wLJ30LSi+ DR4cockH
-example. 3600 IN DNSKEY 257 3 5 AwEAAeMNmQ/1/6yfFfp7jOqy2M7AGBtuSzZJFpnUqrcAmTTI+RxX9vN0 1Z5CpAs9nhYTVyLEQLaGQBwkrF+QBIPJ6DQ0SvHJEWEAN25tyvWmDdUj eDnevEpbQbkdaV+XQJ3SMWGf7OtzGo0BC4vO5ecw+zGteWT/UUbX9XkK 3vWOirLAF1s5kNEEnUt+kIbr50vz+qOfvWa+ldWHSt2T2Ds6fMVkdE84 gyb3mE0syQbEuSdgOO6Vko4qn9FtJ2Uz0L2i8vKb1chT+f7RISQhicTL X/RQgH0kV80UCBtn4CEgE6Cx5Yv+z50li0I4bNRI1BLBqJneCeN/eqQs /pYNJhZg4d8=
-example. 3600 IN RRSIG DNSKEY 5 1 3600 20500101000000 20140908115912 35721 example. zft/jYjZDK2eq6twehtmp6W3UgZQBVhDjDauBwGG6jimkZ00PwAL4Eh5 1ZM/nGnw8CPt6YxXK32FGoLy9VQTOgFUfp0myZiRggH1At7RSBusDyOA I/BaZhJ+X1hCG2wfvPfiD9irPHB11az+isrms4FmQrWsPkyF/A3ZJqcl DpM=
-example. 3600 IN RRSIG DNSKEY 5 1 3600 20500101000000 20140908115912 65014 example. Sso2em1SJhXTZTVEnnfEZaK7VdSSbw7Ytd3cJuDEi7qVgbMJpNCZg1Of S2VIMlmf3sdzMrMOFbbXzdyAATHCmqBTqcMYEzSAH+mzc3hletbLM683 ChR3c8PJL1hUbHAGl3va8hK5jRsXaNlDjnOuyFQsiEBZU0lXFHyqvENR OBg7CJlDZeC8mdzaoTOLvklJFk6b8ktROYfjyaACVwFhQENIs1mxI12N YrjwDZV3ZHweDVfbh5qIjj855NwsDqJWahg0fBdbQA9B667KCIesuxp/ HstbKk7Ild193Ye5Rcqvtg5vesoOeQZducYtLLztr/hDLAWn9tEa0R2N /HzGSA==
-*.a.example. 3600 IN A 192.0.2.11
-ns1.a.example. 3600 IN A 192.0.2.5
-ns2.a.example. 3600 IN A 192.0.2.6
-ns1.b.example. 3600 IN A 192.0.2.7
-ns2.b.example. 3600 IN A 192.0.2.8
-b.example. 3600 IN NS ns1.b.example.
-b.example. 3600 IN NS ns2.b.example.
-b.example. 3600 IN NS NS2.b.eXample.
-b.example. 3600 IN NSEC ns1.example. NS RRSIG NSEC
-b.example. 3600 IN RRSIG NSEC 5 2 3600 20500101000000 20140908115912 35721 example. gXx+XR8khxgHGl4Zc5H2Fk+ekZQMFyb8qVGGztE+sGh6YD8ERZyBi6J/ GaL+PF7iDO9qJvrOHmULssCgiiTooWhnG8ezXt429ADB+8bsd9qjoyU1 cAcYL6zXHpYdf8LOTSetEaaoZISF0buD3UMOmErSZ+z5liN09V+woZqu 2K0=
-a.example. 3600 IN NS nS1.A.example.
-a.example. 3600 IN NS ns2.a.example.
-a.example. 3600 IN DS 57855 5 1 B6DCD485719ADCA18E5F3D48A2331627FDD3636B
-a.example. 3600 IN RRSIG DS 5 2 3600 20500101000000 20140908115912 35721 example. X5GpSOMM71nyseLAMDsZ0ClXiQknr4KNhnde+WYsSeQwSmHjxE7cyhrt KBrhRpaCTwjGn2ydmYteRWkeCGhatr19zqdHVbu0KCbX2RQ+dv2FUu2o aw4yzIGGPsw38BxwCECauLiPIAN9cx57QIIGNRxMsestpQf1xgdNrBPS p/s=
-a.example. 3600 IN NSEC ai.example. NS DS RRSIG NSEC
-a.example. 3600 IN RRSIG NSEC 5 2 3600 20500101000000 20140908115912 35721 example. ISCOL3yUf66kEwYq3mGbc8atYg0q4Be2U86zfisEBsFcp95VE4roe7hA Zn8tvo9CgyiZ0oPpWcFdwThD7kJlDz6pW0yaUNL0m6vfVGmPJSSUITNC QUleyQKTv43UyyLGxYBazpdQkVgETD29uFI77Kb2p8sThWgD6/incQjE 4s0=
-*.to-nxdomain.example. 3600 IN CNAME nxdOMAin.eXAmple.
-*.to-nxdomain.example. 3600 IN RRSIG CNAME 5 2 3600 20500101000000 20140908115912 35721 example. WMK7tl1ialmOHlfJfr4Xi2Q0Vm1nxWfZgyxIMKWp3ZtaYssdDgGeu/hw xu26bztP6KZdBAtODP4m80DNNyTkTBABAlHGhlRzzdtuJUxDf106OdzX wmHYF3RUUghosTByoOk9jo4ZxqZczYJXTSPD/f8CJbe0w2Jj8u3KXuNV pao=
-*.to-nxdomain.example. 3600 IN NSEC *.w.example. CNAME RRSIG NSEC
-*.to-nxdomain.example. 3600 IN RRSIG NSEC 5 2 3600 20500101000000 20140908115912 35721 example. YKLAdVvMKdkBjkCAc7pANAiWsKnG1HPcbi8H7D+sIeXN879yk5VLxrxb sMvBlLKqAiRJvT/bfUg7Q1oUNs6hCJgI6GdfNjU4iWVOTixj1rwbUCoG HqEJdOpHsqcTIa7h3Cw46JRPZvv4Cb0nMidOdYlW4y6ibLaIO0WIy7Ds 1o8=
-ns1.example. 3600 IN A 192.0.2.1
-ns1.example. 3600 IN RRSIG A 5 2 3600 20500101000000 20140908115912 35721 example. RFN2tl028ynt2E2piY5fvvLdjgp1kAVoGk5DT6Quzufteakyh3tvMp+d JHh5udX6xjYF9Ah06/LrDTHMXcK2wi6xW06d6xVoQFe/D4l1bY+giIjF 14cQXpk457ubi4Slg2JTOJFZ2pL8TtE6/Ac+CP+YqwzW4o3qoibOB+Xr uoc=
-ns1.example. 3600 IN NSEC ns2.example. A RRSIG NSEC
-ns1.example. 3600 IN RRSIG NSEC 5 2 3600 20500101000000 20140908115912 35721 example. gU9b8lPWyU89ul+pZKFjynLg7QDQI0vpsd4o9ACJk/S0Kgc1H26WHgDJ CLrZLo954KEbR/05rHhQ+BRgpeFg9yLjIto2MjcMP+OpzDZPRQVa596J NIGPeQqAEPTFv3K5+PWz7YVonbLk0vXvfJ5jyeSWvo3rITmA5ReEOwHb sg4=
-*.w.example. 3600 IN MX 1 ai.example.
-*.w.example. 3600 IN RRSIG MX 5 2 3600 20500101000000 20140908115912 35721 example. Jnrp1CsAoXv41ZaIRUMi5ELE7O5hY1NurfaOm/610C79CI+ItgMsVO5R I3RQOVuxWAdFIec+B+uoECJCFybQEBiMJpR7xcUpD2GliPJGpYRTF1T3 kyq+8DQwRJd3wvPD9HNn8TZ6GRNzrsNkvwn6oQyOl0rALw+BqoT0CR+F 3BU=
-*.w.example. 3600 IN NSEC x.w.example. MX RRSIG NSEC
-*.w.example. 3600 IN RRSIG NSEC 5 2 3600 20500101000000 20140908115912 35721 example. OE/NteBXdX6rUE6YrqpbfhVE/Tt3/pe/ESPDdirdoQTdd5s3O53W9MfZ P0EgAYVfGWXL31m0miZGJRjMhmhndp6oGKtGDC8GOE++iWH0896fbfJO GyIiEMU9jjyQiEySU23qd8gYVoF1bqlTER2WOKVjELwE4Vhog+wW+F7u suI=
-x.w.example. 3600 IN MX 1 xx.example.
-x.w.example. 3600 IN RRSIG MX 5 3 3600 20500101000000 20140908115912 35721 example. t6zcmnIJrWQD0H58Kw541izgtSZFfBn4vR5yidnrZSt0qlzNR6608VFe 6TtDxTxNlF/eefcBPnON0FCm7CEezOGoWNkBmTYTOcbdgNoIsR5sN4QZ 6OW5XzT16JM/yZByBxiO/pereunqIUHvPkv1pJPbGLBzzGxVLpc9FWQY mpQ=
-x.w.example. 3600 IN NSEC x.y.w.example. MX RRSIG NSEC
-x.w.example. 3600 IN RRSIG NSEC 5 3 3600 20500101000000 20140908115912 35721 example. qSKOIR3CWEpGZ6dJHZCbwv5m6Wv+0sO7Dr2eFaQE4FU0Zw9xUa9z5U7v 5PaDlHCVxRq/cD7I6/0oKVC79uVZ14HK3QGhhuNyR2moJ8ih5MkjAqLP D0yV1y0atSs85KzFZ8Lj0gwYy21hZ7RmtCg6/aCEa0XMk4InUgErypDO 5/0=
-x.y.w.example. 3600 IN MX 1 xx.example.
-x.y.w.example. 3600 IN RRSIG MX 5 4 3600 20500101000000 20140908115912 35721 example. J2GbHhAyuIV0uhaSX5M4OAX9qKX88KH7eZrd0JKuzn3O64fPIAtJzOXU nt1LBuPPk+Not0SoZHe47VJLObx8WtHsWLIKcb5CbXy5ccR47eLQcDvm wwZznPqpztThY5N6tf+8ZcDXJrGDaeN+xxa3tYgwWHAl513+9gHwrQHC uJs=
-x.y.w.example. 3600 IN NSEC xx.example. MX RRSIG NSEC
-x.y.w.example. 3600 IN RRSIG NSEC 5 4 3600 20500101000000 20140908115912 35721 example. lPtK1L/OHJFHH1uAo8bLjJZBtEOF1fqZLosDcWz4snaSB+Eiva8cVNqT qhuwbVtDK3yECPNrl2jsegVaax5yUuqUbZEU81tbpDDOA86WpSPjykij kagCaie3kEfxQGP4BkmwG3v5qDn8ABmJI0m2/giFV4rczsn+INGkV3Kj REE=
-*.to-apex.example. 3600 IN CNAME example.
-*.to-apex.example. 3600 IN RRSIG CNAME 5 2 3600 20500101000000 20140908115912 35721 example. F9jwC5zU4KAGNDqLMS4n1molS0X4IgKSBzyxdCJYo8tUMwrKVViVhmiT 3W+9YGEd999ODbZxrS73sWYf5e3ckzkVDqH9PsDf0YUUJaxsn0+mHufN GRLKOTSZPFDH8ENK1EpEfdIhcHV6EZy3+sm4yY8dai2E3SgfRQSB41bF VIk=
-*.to-apex.example. 3600 IN NSEC *.to-nxdomain.example. CNAME RRSIG NSEC
-*.to-apex.example. 3600 IN RRSIG NSEC 5 2 3600 20500101000000 20140908115912 35721 example. ZX5r61rjIve+amNKzbImn9uqI1kpIxOG2n6YHEnqNLYNLMg0jRQZ+r7u s+1L6RKeYeuZwNd+W3mKGU4ysHg6ZEZrRmPp+c/RTdtDb6hUYclISFIS RGS++Twjj8xTpWNpAHCD7od9RNQvRecIlKWxQqAy2EOchjHiW4tvceev UeA=
-xx.example. 3600 IN A 192.0.2.10
-xx.example. 3600 IN RRSIG A 5 2 3600 20500101000000 20140908115912 35721 example. t+h8JbOnvj4YbldhiSYmDBn0A7890Ovt4mo1+QYA7AuqR2ZyzlMOxr6R 15Sb2bPuaYNl7vrCNn0kKjljfiHp3r/x+Afl6wfwrEIn1QIufBw9bQVk YT5xpkXay+PFK4kp2+MIsNUriBz73wAar/fQaWs7VKfp6rFsZFLdAEYo pYo=
-xx.example. 3600 IN HINFO "KLH-10" "TOPS-20"
-xx.example. 3600 IN RRSIG HINFO 5 2 3600 20500101000000 20140908115912 35721 example. Cr8KJMUOhPj711WbHNbdvs4XhOK5lIsI0J1jASOVSD4Z8zEX3K7Q5iCL R2GYyJbYC4EhX2FQ+yJIGs7XEQ7VCN+Ur7LSVmEMkXPYGeiOFD4zm9XO VR3d+nOn6zRqA0v2YJ/k17526X7Jy76/WajN9z7khqs6r0tiX+nzAOGs LxY=
-xx.example. 3600 IN AAAA 2001:db8::f00:baaa
-xx.example. 3600 IN RRSIG AAAA 5 2 3600 20500101000000 20140908115912 35721 example. F9OfD+NISAkcmCBTj3cQ4xJ4tWJVmHnfMEtcaic4sh7apICS6hllJ/Yw f8CwdrFe+k9qII14EgT/LcMYKVuokYRxjB947hrr5TTnh9QVAtLN/C+/ kITslpj/zWmGSNyeUQrlDPCYjEsNG0XAv2aYConmyaSubsrJVmLKS5aV ygA=
-xx.example. 3600 IN NSEC example. A HINFO AAAA RRSIG NSEC
-xx.example. 3600 IN RRSIG NSEC 5 2 3600 20500101000000 20140908115912 35721 example. VOsK6bM+BRbqjb1JR/Ihv0OAeqs0JIQsIM5usysR+qu+jAECoN9eSBaw /4OudXJ8AUCIo/Ew1aVYbfRTy5pGCbfD2Iwb0kPBIAtQq3I2k+r64+tg LIN00Dpv3WVbeiiPCaXR0FH0EXiJAJYQ2fJBaTuoLN1stXQM6WHmoVQ9 7ck=
-ns2.example. 3600 IN A 192.0.2.2
-ns2.example. 3600 IN RRSIG A 5 2 3600 20500101000000 20140908115912 35721 example. Bj944ofhclaYOXNuNLSvUTU91cnUd+lVK86M6AXDz7dcUFGSGbabejFC +Ci/jthTAWKj4Hnyf265rNzq2C2XyfWSsktY4lqmT0JNmWi7168S/RSn nktNln1TZHZSOAozKz1IOCVDA5WQZFtpP21znjb1DClbkn4pAyG0Uq9J iWE=
-ns2.example. 3600 IN NSEC *.to-apex.example. A RRSIG NSEC
-ns2.example. 3600 IN RRSIG NSEC 5 2 3600 20500101000000 20140908115912 35721 example. e5TzMezHmLQzCQW2aPjptx3R0j5E93eV094e7JDDkJlYR25tRCZIh21S mHe9UPHP0JJTgrGk3dEx8BoanFz0g+nBVSvm9B62mSVtBdvetIgaKr+B G6OYniy/Oeqwy+jV/nzKPgXuuPeVygW4lHzbWQlosGzlzGbLbGntjAuT 2rY=
-ai.example. 3600 IN A 192.0.2.9
-ai.example. 3600 IN RRSIG A 5 2 3600 20500101000000 20140908115912 35721 example. OjdP4QKWwaVlCHEHDdevuIqC4WvDeDtJWSxGNkm0qeg1zPzJIH2HP1IA UCLzyDQMz4/QZAMRw/g60vZscjpbJk78cwFAMdid9WI1fN8ty5MfbPP4 9nSSnKxiFya9NW8FpQjKCqUUuOGbLmUxwaCHYp4qVc+HZ29Qv3x7m+Dp V7I=
-ai.example. 3600 IN HINFO "KLH-10" "ITS"
-ai.example. 3600 IN RRSIG HINFO 5 2 3600 20500101000000 20140908115912 35721 example. jgmJU1v65Ab2huFEZ+xB/u6WmuXn/NHdGM6gihgw5rhf9V7DbFd+86O4 v+qTXXm4j0g36RdWTQVh//rPT9SIgAToEy6rUeazwyjKNP81n2dj/STe oawIL745/8NsWvd31cLsTEM8IJcMNn1+Z/131Dq4UQ+cyDd8IPrV/n7d PIk=
-ai.example. 3600 IN AAAA 2001:db8::f00:baa9
-ai.example. 3600 IN RRSIG AAAA 5 2 3600 20500101000000 20140908115912 35721 example. XEvBDYe8WvsePqoe8UhuuXUEMkrbnPBY5T2JDrn4ux8FQh1eFoPkLsXt 809++XA3t1STUSisrU1MLqVGgMQtTep6o695Rlj/YSQgRgZ0BydwgqiX 6ciSNuTBDdf3csyjbVKSuObWpcnztNVYx4NhoRKp5ouL9Y2DH2lUrc46 +Lg=
-ai.example. 3600 IN NSEC b.example. A HINFO AAAA RRSIG NSEC
-ai.example. 3600 IN RRSIG NSEC 5 2 3600 20500101000000 20140908115912 35721 example. xaK3rgN3f4ROz3ee9BlylWvc2H2wT+VnNbXT4CBJ8w3mpcIz5fuKYkCh jY7PwZqN9bCOv6HK6W6dmuNhELk5ahHCRu7iE5HXRgP8xAPZBZODvnG6 D6tGb0yqmqZ0IFBmW8z+XcH3wvhhJof2QkUsPKX475d2GL7eUQpBuU9F RzA=
diff --git a/tests-extra/tests/dnssec/no_resign/test.py b/tests-extra/tests/dnssec/no_resign/test.py
index 26d559c5b3cef9b269ae86eb9aaa44b1004b902b..d738db3ead7ab5a1b9e1cd7a7171caf7877686b5 100644
--- a/tests-extra/tests/dnssec/no_resign/test.py
+++ b/tests-extra/tests/dnssec/no_resign/test.py
@@ -60,26 +60,4 @@ if old_nsec_serial < new_nsec_serial:
compare(old_nsec3_serial, new_nsec3_serial, "NSEC3 zone got resigned")
compare(old_static_serial, new_static_serial, "static zone got resigned")
-prev_serial = new_static_serial
-
-# Switch the static zone for the one with different case in records
-master.update_zonefile(static_zone, 1)
-master.stop()
-master.start()
-
-serial = master.zone_wait(static_zone)
-
-compare(prev_serial, serial, "static zone got resigned after case change")
-
-# Switch the static zone again, this time change case in NSEC only
-# Zone should be resigned, as the NSEC's RRSIG is no longer valid
-master.update_zonefile(static_zone, 2)
-master.stop()
-master.start()
-
-serial = master.zone_wait(static_zone)
-
-if (serial <= prev_serial):
- set_err("Ignored NSEC change")
-
t.stop()