diff --git a/README.md b/README.md
index 7263c4c..0ab3647 100644
--- a/README.md
+++ b/README.md
@@ -48,19 +48,31 @@ Similar API to `dns.js` and `native-dns-packet`.
 }
 ```
 
-Install
+Install with git
 -------
 
-You can use git to install v1.x (and get updates) or just v1.0.x (and only get patches).
-The API will not break until v2.
+You can use git to install v1.x like so:
 
 ```bash
 # latest of v1.x
 npm install 'git+https://git@git.daplie.com:Daplie/dns-suite#v1'
 ```
 
-Don't have git? You can bow down to the gods of the centralized, monopolized, concentrated, dictatornet
-(as we like to call it here at Daplie Labs):
+If you want to be more specific to v1.0.x or exactly v1.0.2 you can do so like this:
+
+```
+# latest of v1.0.x
+npm install 'git+https://git@git.daplie.com:Daplie/dns-suite#v1.0'
+
+# exactly v1.0.2
+npm install 'git+https://git@git.daplie.com:Daplie/dns-suite#v1.0.2'
+```
+
+Install without git
+-------
+
+Don't have git? Well you can also bow down to the gods of the centralized, monopolized, concentrated, dictatornet
+(as we like to call it here at Daplie Labs), if that's how you roll:
 
 ```
 npm install --save dns-suite
diff --git a/packer/type.soa.js b/packer/type.soa.js
index f80ba99..c716c72 100644
--- a/packer/type.soa.js
+++ b/packer/type.soa.js
@@ -1,10 +1,24 @@
 (function (exports) {
 'use strict';
 
+// Value              Meaning/Use
+// Primary NS         Variable length. The name of the Primary Master for the domain. May be a label, pointer, or any combination
+// Admin MB           Variable length. The administrator's mailbox. May be a label, pointer, or any combination
+// Serial Number      Unsigned 32-bit integer
+// Refresh Interval   Unsigned 32-bit integer
+// Retry Interval     Unsigned 32-bit integer
+// Expiration Limit   Unsigned 32-bit integer
+// Minimum TTL        Unsigned 32-bit integer
 
 
 
 exports.DNS_PACKER_TYPE_SOA = function (ab, dv, total, record) {
+  if(!record.name_server){
+    throw new Error("no name server for SOA record");
+  }
+  if(!record.email_addr){
+    throw new Error("ne email address for SOA record");
+  }
   if(!record.sn){
     throw new Error("no serial number for SOA record");
   }
@@ -21,8 +35,51 @@ exports.DNS_PACKER_TYPE_SOA = function (ab, dv, total, record) {
     throw new Error("no serial number for SOA record");
   }
 
-  
-  
+  var soaLen = 20; // take into account sn, ref, ret, ex, and nx 
+                  //  (32-bits each. 4Bytes * 5 = 20)
+  var rdLenIndex = total;
+  total += 2; // Save space for RDLENGTH
+
+  // pack name_server which is a sequence of labels
+  record.name_server.split('.').forEach(function(label){
+    soaLen += 1 + label.length;
+
+    dv.setUint8(total, label.length, false);
+    total += 1;
+
+    label.split('').forEach(function(ch) {
+      dv.setUint8(total, ch.charCodeAt(0), false);
+      total += 1;
+    });
+  });
+
+  // pack email address which is a sequence of labels
+  record.email_addr.split('.').forEach(function (label){
+    soaLen += 1 + label.length;
+
+    dv.setUint8(total, label.length, false);
+    total += 1;
+
+    label.split('').forEach(function (ch){
+      dv.setUint8(total, ch.charCodeAt(0), false);
+      total += 1;
+    });
+  });
+
+  // pack all 32-bit values
+  dv.setUint32(total, parseInt(record.sn, 10), false);
+  total+=4;
+  dv.setUint32(total, parseInt(record.ref, 10), false);
+  total+=4;
+  dv.setUint32(total, parseInt(record.ret, 10), false);
+  total+=4;  
+  dv.setUint32(total, parseInt(record.ex, 10), false);
+  total+=4;
+  dv.setUint32(total, parseInt(record.nx, 10), false);
+  total+=4;
+
+  // RDLENGTH
+  dv.setUint16(rdLenIndex, soaLen, false);
 
   return total;
 };
diff --git a/packer/type.srv.js b/packer/type.srv.js
index 63b8440..dee2731 100644
--- a/packer/type.srv.js
+++ b/packer/type.srv.js
@@ -36,7 +36,7 @@ exports.DNS_PACKER_TYPE_SRV = function (ab, dv, total, record) {
   var srvLen = 6; // 16-bit priority, weight and port = 6 Bytes
   var rdLenIndex = total;
 
-  total+=2;
+  total+=2; // space for RDLENGTH
 
   dv.setUint16(total, parseInt(record.priority, 10), false);
   total+=2;
@@ -55,18 +55,14 @@ exports.DNS_PACKER_TYPE_SRV = function (ab, dv, total, record) {
 
     label.split('').forEach(function (ch) {
       dv.setUint8(total, ch.charCodeAt(0), false);
-      total +=1;
+      total += 1;
     });
   });
 
-
   // RDLENGTH
 
   dv.setUint16(rdLenIndex, srvLen, false);
   
-  
-
-
   return total;
 };
 
diff --git a/parser/type.soa.js b/parser/type.soa.js
index 1a3f834..534197a 100644
--- a/parser/type.soa.js
+++ b/parser/type.soa.js
@@ -1,8 +1,6 @@
 (function (exports) {
 'use strict';
 
-// TODO. Not yet implemented. Do we need to include the name server and email address record properties???
-
 // Value              Meaning/Use
 // Primary NS         Variable length. The name of the Primary Master for the domain. May be a label, pointer, or any combination
 // Admin MB           Variable length. The administrator's mailbox. May be a label, pointer, or any combination
@@ -49,7 +47,6 @@ exports.DNS_PARSER_TYPE_SOA = function (ab, packet, record) {
 
     record.email_addr = unpackLabels(new Uint8Array(ab), record.rdstart + offset, { byteLength: 0, cpcount: 0, labels: [], name: '' }).name;
   }
-
   // Serial Number
   record.sn = dv.getUint32(dv.byteLength - 20, false);
   // Refresh Interval
diff --git a/parser/type.srv.js b/parser/type.srv.js
index 3628d82..63ebcde 100644
--- a/parser/type.srv.js
+++ b/parser/type.srv.js
@@ -1,6 +1,5 @@
 (function (exports) {
 'use strict';
-// TODO. Not yet implemented
 
 // SRV identifies the host(s) that will support a particular service. It
 // is a general purpose RR to discover any service.
diff --git a/test/soa_test/google.com.soa.0.bin b/test/soa_test/google.com.soa.0.bin
new file mode 100644
index 0000000..dd9cc9a
Binary files /dev/null and b/test/soa_test/google.com.soa.0.bin differ
diff --git a/test/soa_test/test.google.com.soa.0.json b/test/soa_test/google.com.soa.0.json
similarity index 88%
rename from test/soa_test/test.google.com.soa.0.json
rename to test/soa_test/google.com.soa.0.json
index 00ed0c9..cb84dc8 100644
--- a/test/soa_test/test.google.com.soa.0.json
+++ b/test/soa_test/google.com.soa.0.json
@@ -1,6 +1,6 @@
 {
   "header": {
-    "id": 32561,
+    "id": 52080,
     "qr": 1,
     "opcode": 0,
     "aa": 0,
@@ -47,7 +47,9 @@
       "rdstart": 40,
       "rdlength": 38,
       "ttl": 59,
-      "sn": 149683348,
+      "name_server": "ns3.google.com",
+      "email_addr": "dns-admin.google.com",
+      "sn": 150355194,
       "ref": 900,
       "ret": 900,
       "ex": 1800,
diff --git a/test/soa_test/google.com.soa.query.bin b/test/soa_test/google.com.soa.query.bin
new file mode 100644
index 0000000..ca6b44b
Binary files /dev/null and b/test/soa_test/google.com.soa.query.bin differ
diff --git a/test/soa_test/test.google.com.soa.query.json b/test/soa_test/google.com.soa.query.json
similarity index 92%
rename from test/soa_test/test.google.com.soa.query.json
rename to test/soa_test/google.com.soa.query.json
index 0b77bf4..ab5efda 100644
--- a/test/soa_test/test.google.com.soa.query.json
+++ b/test/soa_test/google.com.soa.query.json
@@ -1,6 +1,6 @@
 {
   "header": {
-    "id": 32561,
+    "id": 52080,
     "qr": 0,
     "opcode": 0,
     "aa": 0,
diff --git a/test/soa_test/test.america.com.soa.0.bin b/test/soa_test/test.america.com.soa.0.bin
deleted file mode 100644
index 484d202..0000000
Binary files a/test/soa_test/test.america.com.soa.0.bin and /dev/null differ
diff --git a/test/soa_test/test.america.com.soa.0.json b/test/soa_test/test.america.com.soa.0.json
deleted file mode 100644
index 16062f9..0000000
--- a/test/soa_test/test.america.com.soa.0.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "header": {
-    "id": 60816,
-    "qr": 1,
-    "opcode": 0,
-    "aa": 0,
-    "tc": 0,
-    "rd": 1,
-    "ra": 1,
-    "res1": 0,
-    "res2": 0,
-    "res3": 0,
-    "rcode": 0
-  },
-  "qdcount": 1,
-  "ancount": 1,
-  "nscount": 0,
-  "arcount": 0,
-  "question": [
-    {
-      "name": "america.com",
-      "type": 6,
-      "typeName": "SOA",
-      "class": 1,
-      "className": "IN",
-      "byteLength": 17,
-      "labels": [
-        "america",
-        "com"
-      ],
-      "cpcount": 0
-    }
-  ],
-  "answer": [
-    {
-      "name": "america.com",
-      "type": 6,
-      "typeName": "SOA",
-      "class": 1,
-      "className": "IN",
-      "byteLength": 68,
-      "labels": [
-        "america",
-        "com"
-      ],
-      "cpcount": 1,
-      "rdstart": 41,
-      "rdlength": 56,
-      "ttl": 3599,
-      "sn": 2016050200,
-      "ref": 28800,
-      "ret": 7200,
-      "ex": 604800,
-      "nx": 3600
-    }
-  ],
-  "authority": [],
-  "edns_options": [],
-  "additional": [],
-  "byteLength": 97
-}
\ No newline at end of file
diff --git a/test/soa_test/test.america.com.soa.query.bin b/test/soa_test/test.america.com.soa.query.bin
deleted file mode 100644
index a4e7bfc..0000000
Binary files a/test/soa_test/test.america.com.soa.query.bin and /dev/null differ
diff --git a/test/soa_test/test.america.com.soa.query.json b/test/soa_test/test.america.com.soa.query.json
deleted file mode 100644
index cfef659..0000000
--- a/test/soa_test/test.america.com.soa.query.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "header": {
-    "id": 60816,
-    "qr": 0,
-    "opcode": 0,
-    "aa": 0,
-    "tc": 0,
-    "rd": 1,
-    "ra": 0,
-    "rcode": 0
-  },
-  "question": [
-    {
-      "name": "america.com",
-      "typeName": "SOA",
-      "className": "IN"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/test/soa_test/test.daplie.com.soa.0.bin b/test/soa_test/test.daplie.com.soa.0.bin
deleted file mode 100644
index d9c2ac4..0000000
Binary files a/test/soa_test/test.daplie.com.soa.0.bin and /dev/null differ
diff --git a/test/soa_test/test.daplie.com.soa.0.json b/test/soa_test/test.daplie.com.soa.0.json
deleted file mode 100644
index 910c526..0000000
--- a/test/soa_test/test.daplie.com.soa.0.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "header": {
-    "id": 60281,
-    "qr": 1,
-    "opcode": 0,
-    "aa": 0,
-    "tc": 0,
-    "rd": 1,
-    "ra": 1,
-    "res1": 0,
-    "res2": 0,
-    "res3": 0,
-    "rcode": 0
-  },
-  "qdcount": 1,
-  "ancount": 1,
-  "nscount": 0,
-  "arcount": 0,
-  "question": [
-    {
-      "name": "daplie.com",
-      "type": 6,
-      "typeName": "SOA",
-      "class": 1,
-      "className": "IN",
-      "byteLength": 16,
-      "labels": [
-        "daplie",
-        "com"
-      ],
-      "cpcount": 0
-    }
-  ],
-  "answer": [
-    {
-      "name": "daplie.com",
-      "type": 6,
-      "typeName": "SOA",
-      "class": 1,
-      "className": "IN",
-      "byteLength": 67,
-      "labels": [
-        "daplie",
-        "com"
-      ],
-      "cpcount": 1,
-      "rdstart": 40,
-      "rdlength": 55,
-      "ttl": 0,
-      "sn": 2017020100,
-      "ref": 10800,
-      "ret": 3600,
-      "ex": 1209600,
-      "nx": 1800
-    }
-  ],
-  "authority": [],
-  "edns_options": [],
-  "additional": [],
-  "byteLength": 95
-}
\ No newline at end of file
diff --git a/test/soa_test/test.daplie.com.soa.query.bin b/test/soa_test/test.daplie.com.soa.query.bin
deleted file mode 100644
index 6ae4d8f..0000000
Binary files a/test/soa_test/test.daplie.com.soa.query.bin and /dev/null differ
diff --git a/test/soa_test/test.daplie.com.soa.query.json b/test/soa_test/test.daplie.com.soa.query.json
deleted file mode 100644
index 2b7561a..0000000
--- a/test/soa_test/test.daplie.com.soa.query.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "header": {
-    "id": 60281,
-    "qr": 0,
-    "opcode": 0,
-    "aa": 0,
-    "tc": 0,
-    "rd": 1,
-    "ra": 0,
-    "rcode": 0
-  },
-  "question": [
-    {
-      "name": "daplie.com",
-      "typeName": "SOA",
-      "className": "IN"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/test/soa_test/test.doesntexisit.google.com.soa.0.bin b/test/soa_test/test.doesntexisit.google.com.soa.0.bin
deleted file mode 100644
index c1b128a..0000000
Binary files a/test/soa_test/test.doesntexisit.google.com.soa.0.bin and /dev/null differ
diff --git a/test/soa_test/test.doesntexisit.google.com.soa.0.json b/test/soa_test/test.doesntexisit.google.com.soa.0.json
deleted file mode 100644
index 4225714..0000000
--- a/test/soa_test/test.doesntexisit.google.com.soa.0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "header": {
-    "id": 14537,
-    "qr": 1,
-    "opcode": 0,
-    "aa": 0,
-    "tc": 0,
-    "rd": 1,
-    "ra": 1,
-    "res1": 0,
-    "res2": 0,
-    "res3": 0,
-    "rcode": 3
-  },
-  "qdcount": 1,
-  "ancount": 0,
-  "nscount": 1,
-  "arcount": 0,
-  "question": [
-    {
-      "name": "doesntexisit.google.com",
-      "type": 6,
-      "typeName": "SOA",
-      "class": 1,
-      "className": "IN",
-      "byteLength": 29,
-      "labels": [
-        "doesntexisit",
-        "google",
-        "com"
-      ],
-      "cpcount": 0
-    }
-  ],
-  "answer": [],
-  "authority": [
-    {
-      "name": "google.com",
-      "type": 6,
-      "typeName": "SOA",
-      "class": 1,
-      "className": "IN",
-      "byteLength": 50,
-      "labels": [
-        "google",
-        "com"
-      ],
-      "cpcount": 1,
-      "rdstart": 53,
-      "rdlength": 38,
-      "ttl": 59,
-      "sn": 149710188,
-      "ref": 900,
-      "ret": 900,
-      "ex": 1800,
-      "nx": 60
-    }
-  ],
-  "edns_options": [],
-  "additional": [],
-  "byteLength": 91
-}
\ No newline at end of file
diff --git a/test/soa_test/test.doesntexisit.google.com.soa.query.bin b/test/soa_test/test.doesntexisit.google.com.soa.query.bin
deleted file mode 100644
index 06efffc..0000000
Binary files a/test/soa_test/test.doesntexisit.google.com.soa.query.bin and /dev/null differ
diff --git a/test/soa_test/test.doesntexisit.google.com.soa.query.json b/test/soa_test/test.doesntexisit.google.com.soa.query.json
deleted file mode 100644
index b1f950d..0000000
--- a/test/soa_test/test.doesntexisit.google.com.soa.query.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "header": {
-    "id": 14537,
-    "qr": 0,
-    "opcode": 0,
-    "aa": 0,
-    "tc": 0,
-    "rd": 1,
-    "ra": 0,
-    "rcode": 0
-  },
-  "question": [
-    {
-      "name": "doesntexisit.google.com",
-      "typeName": "SOA",
-      "className": "IN"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/test/soa_test/test.facebook.com.soa.0.bin b/test/soa_test/test.facebook.com.soa.0.bin
deleted file mode 100644
index 10a5b34..0000000
Binary files a/test/soa_test/test.facebook.com.soa.0.bin and /dev/null differ
diff --git a/test/soa_test/test.facebook.com.soa.0.json b/test/soa_test/test.facebook.com.soa.0.json
deleted file mode 100644
index d6aeab2..0000000
--- a/test/soa_test/test.facebook.com.soa.0.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "header": {
-    "id": 3582,
-    "qr": 1,
-    "opcode": 0,
-    "aa": 0,
-    "tc": 0,
-    "rd": 1,
-    "ra": 1,
-    "res1": 0,
-    "res2": 0,
-    "res3": 0,
-    "rcode": 0
-  },
-  "qdcount": 1,
-  "ancount": 1,
-  "nscount": 0,
-  "arcount": 0,
-  "question": [
-    {
-      "name": "facebook.com",
-      "type": 6,
-      "typeName": "SOA",
-      "class": 1,
-      "className": "IN",
-      "byteLength": 18,
-      "labels": [
-        "facebook",
-        "com"
-      ],
-      "cpcount": 0
-    }
-  ],
-  "answer": [
-    {
-      "name": "facebook.com",
-      "type": 6,
-      "typeName": "SOA",
-      "class": 1,
-      "className": "IN",
-      "byteLength": 45,
-      "labels": [
-        "facebook",
-        "com"
-      ],
-      "cpcount": 1,
-      "rdstart": 42,
-      "rdlength": 33,
-      "ttl": 119,
-      "sn": 1489109491,
-      "ref": 7200,
-      "ret": 1800,
-      "ex": 604800,
-      "nx": 120
-    }
-  ],
-  "authority": [],
-  "edns_options": [],
-  "additional": [],
-  "byteLength": 75
-}
\ No newline at end of file
diff --git a/test/soa_test/test.facebook.com.soa.query.bin b/test/soa_test/test.facebook.com.soa.query.bin
deleted file mode 100644
index 23e09c4..0000000
Binary files a/test/soa_test/test.facebook.com.soa.query.bin and /dev/null differ
diff --git a/test/soa_test/test.facebook.com.soa.query.json b/test/soa_test/test.facebook.com.soa.query.json
deleted file mode 100644
index 884a7b4..0000000
--- a/test/soa_test/test.facebook.com.soa.query.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "header": {
-    "id": 3582,
-    "qr": 0,
-    "opcode": 0,
-    "aa": 0,
-    "tc": 0,
-    "rd": 1,
-    "ra": 0,
-    "rcode": 0
-  },
-  "question": [
-    {
-      "name": "facebook.com",
-      "typeName": "SOA",
-      "className": "IN"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/test/soa_test/test.gmail.com.soa.0.bin b/test/soa_test/test.gmail.com.soa.0.bin
deleted file mode 100644
index dddc1f6..0000000
Binary files a/test/soa_test/test.gmail.com.soa.0.bin and /dev/null differ
diff --git a/test/soa_test/test.gmail.com.soa.0.json b/test/soa_test/test.gmail.com.soa.0.json
deleted file mode 100644
index 3bc3140..0000000
--- a/test/soa_test/test.gmail.com.soa.0.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "header": {
-    "id": 38325,
-    "qr": 1,
-    "opcode": 0,
-    "aa": 0,
-    "tc": 0,
-    "rd": 1,
-    "ra": 1,
-    "res1": 0,
-    "res2": 0,
-    "res3": 0,
-    "rcode": 0
-  },
-  "qdcount": 1,
-  "ancount": 1,
-  "nscount": 0,
-  "arcount": 0,
-  "question": [
-    {
-      "name": "gmail.com",
-      "type": 6,
-      "typeName": "SOA",
-      "class": 1,
-      "className": "IN",
-      "byteLength": 15,
-      "labels": [
-        "gmail",
-        "com"
-      ],
-      "cpcount": 0
-    }
-  ],
-  "answer": [
-    {
-      "name": "gmail.com",
-      "type": 6,
-      "typeName": "SOA",
-      "class": 1,
-      "className": "IN",
-      "byteLength": 57,
-      "labels": [
-        "gmail",
-        "com"
-      ],
-      "cpcount": 1,
-      "rdstart": 39,
-      "rdlength": 45,
-      "ttl": 59,
-      "sn": 149683348,
-      "ref": 900,
-      "ret": 900,
-      "ex": 1800,
-      "nx": 60
-    }
-  ],
-  "authority": [],
-  "edns_options": [],
-  "additional": [],
-  "byteLength": 84
-}
\ No newline at end of file
diff --git a/test/soa_test/test.gmail.com.soa.query.bin b/test/soa_test/test.gmail.com.soa.query.bin
deleted file mode 100644
index 5dac280..0000000
Binary files a/test/soa_test/test.gmail.com.soa.query.bin and /dev/null differ
diff --git a/test/soa_test/test.gmail.com.soa.query.json b/test/soa_test/test.gmail.com.soa.query.json
deleted file mode 100644
index c52d2f2..0000000
--- a/test/soa_test/test.gmail.com.soa.query.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "header": {
-    "id": 38325,
-    "qr": 0,
-    "opcode": 0,
-    "aa": 0,
-    "tc": 0,
-    "rd": 1,
-    "ra": 0,
-    "rcode": 0
-  },
-  "question": [
-    {
-      "name": "gmail.com",
-      "typeName": "SOA",
-      "className": "IN"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/test/soa_test/test.google.com.soa.0.bin b/test/soa_test/test.google.com.soa.0.bin
deleted file mode 100644
index e7e8d96..0000000
Binary files a/test/soa_test/test.google.com.soa.0.bin and /dev/null differ
diff --git a/test/soa_test/test.google.com.soa.query.bin b/test/soa_test/test.google.com.soa.query.bin
deleted file mode 100644
index 3002d00..0000000
Binary files a/test/soa_test/test.google.com.soa.query.bin and /dev/null differ
diff --git a/test/soa_test/test.khanacademy.com.soa.0.bin b/test/soa_test/test.khanacademy.com.soa.0.bin
deleted file mode 100644
index 1557285..0000000
Binary files a/test/soa_test/test.khanacademy.com.soa.0.bin and /dev/null differ
diff --git a/test/soa_test/test.khanacademy.com.soa.0.json b/test/soa_test/test.khanacademy.com.soa.0.json
deleted file mode 100644
index 42b9feb..0000000
--- a/test/soa_test/test.khanacademy.com.soa.0.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "header": {
-    "id": 7381,
-    "qr": 1,
-    "opcode": 0,
-    "aa": 0,
-    "tc": 0,
-    "rd": 1,
-    "ra": 1,
-    "res1": 0,
-    "res2": 0,
-    "res3": 0,
-    "rcode": 0
-  },
-  "qdcount": 1,
-  "ancount": 1,
-  "nscount": 0,
-  "arcount": 0,
-  "question": [
-    {
-      "name": "khanacademy.com",
-      "type": 6,
-      "typeName": "SOA",
-      "class": 1,
-      "className": "IN",
-      "byteLength": 21,
-      "labels": [
-        "khanacademy",
-        "com"
-      ],
-      "cpcount": 0
-    }
-  ],
-  "answer": [
-    {
-      "name": "khanacademy.com",
-      "type": 6,
-      "typeName": "SOA",
-      "class": 1,
-      "className": "IN",
-      "byteLength": 84,
-      "labels": [
-        "khanacademy",
-        "com"
-      ],
-      "cpcount": 1,
-      "rdstart": 45,
-      "rdlength": 72,
-      "ttl": 899,
-      "sn": 1,
-      "ref": 7200,
-      "ret": 900,
-      "ex": 1209600,
-      "nx": 86400
-    }
-  ],
-  "authority": [],
-  "edns_options": [],
-  "additional": [],
-  "byteLength": 117
-}
\ No newline at end of file
diff --git a/test/soa_test/test.khanacademy.com.soa.query.bin b/test/soa_test/test.khanacademy.com.soa.query.bin
deleted file mode 100644
index bc96515..0000000
Binary files a/test/soa_test/test.khanacademy.com.soa.query.bin and /dev/null differ
diff --git a/test/soa_test/test.khanacademy.com.soa.query.json b/test/soa_test/test.khanacademy.com.soa.query.json
deleted file mode 100644
index 926a1e6..0000000
--- a/test/soa_test/test.khanacademy.com.soa.query.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "header": {
-    "id": 7381,
-    "qr": 0,
-    "opcode": 0,
-    "aa": 0,
-    "tc": 0,
-    "rd": 1,
-    "ra": 0,
-    "rcode": 0
-  },
-  "question": [
-    {
-      "name": "khanacademy.com",
-      "typeName": "SOA",
-      "className": "IN"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/test/soa_test/test.pinterest.com.soa.0.bin b/test/soa_test/test.pinterest.com.soa.0.bin
deleted file mode 100644
index 3e720bd..0000000
Binary files a/test/soa_test/test.pinterest.com.soa.0.bin and /dev/null differ
diff --git a/test/soa_test/test.pinterest.com.soa.0.json b/test/soa_test/test.pinterest.com.soa.0.json
deleted file mode 100644
index 1c15262..0000000
--- a/test/soa_test/test.pinterest.com.soa.0.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "header": {
-    "id": 11674,
-    "qr": 1,
-    "opcode": 0,
-    "aa": 0,
-    "tc": 0,
-    "rd": 1,
-    "ra": 1,
-    "res1": 0,
-    "res2": 0,
-    "res3": 0,
-    "rcode": 0
-  },
-  "qdcount": 1,
-  "ancount": 1,
-  "nscount": 0,
-  "arcount": 0,
-  "question": [
-    {
-      "name": "pinterest.com",
-      "type": 6,
-      "typeName": "SOA",
-      "class": 1,
-      "className": "IN",
-      "byteLength": 19,
-      "labels": [
-        "pinterest",
-        "com"
-      ],
-      "cpcount": 0
-    }
-  ],
-  "answer": [
-    {
-      "name": "pinterest.com",
-      "type": 6,
-      "typeName": "SOA",
-      "class": 1,
-      "className": "IN",
-      "byteLength": 44,
-      "labels": [
-        "pinterest",
-        "com"
-      ],
-      "cpcount": 1,
-      "rdstart": 43,
-      "rdlength": 32,
-      "ttl": 299,
-      "sn": 493,
-      "ref": 3600,
-      "ret": 600,
-      "ex": 604800,
-      "nx": 1800
-    }
-  ],
-  "authority": [],
-  "edns_options": [],
-  "additional": [],
-  "byteLength": 75
-}
\ No newline at end of file
diff --git a/test/soa_test/test.pinterest.com.soa.query.bin b/test/soa_test/test.pinterest.com.soa.query.bin
deleted file mode 100644
index 107bea3..0000000
Binary files a/test/soa_test/test.pinterest.com.soa.query.bin and /dev/null differ
diff --git a/test/soa_test/test.pinterest.com.soa.query.json b/test/soa_test/test.pinterest.com.soa.query.json
deleted file mode 100644
index bad0db7..0000000
--- a/test/soa_test/test.pinterest.com.soa.query.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "header": {
-    "id": 11674,
-    "qr": 0,
-    "opcode": 0,
-    "aa": 0,
-    "tc": 0,
-    "rd": 1,
-    "ra": 0,
-    "rcode": 0
-  },
-  "question": [
-    {
-      "name": "pinterest.com",
-      "typeName": "SOA",
-      "className": "IN"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/test/soa_test/test.tinder.com.soa.0.bin b/test/soa_test/test.tinder.com.soa.0.bin
deleted file mode 100644
index 80f4f73..0000000
Binary files a/test/soa_test/test.tinder.com.soa.0.bin and /dev/null differ
diff --git a/test/soa_test/test.tinder.com.soa.0.json b/test/soa_test/test.tinder.com.soa.0.json
deleted file mode 100644
index 3ff3101..0000000
--- a/test/soa_test/test.tinder.com.soa.0.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "header": {
-    "id": 21341,
-    "qr": 1,
-    "opcode": 0,
-    "aa": 0,
-    "tc": 0,
-    "rd": 1,
-    "ra": 1,
-    "res1": 0,
-    "res2": 0,
-    "res3": 0,
-    "rcode": 0
-  },
-  "qdcount": 1,
-  "ancount": 1,
-  "nscount": 0,
-  "arcount": 0,
-  "question": [
-    {
-      "name": "tinder.com",
-      "type": 6,
-      "typeName": "SOA",
-      "class": 1,
-      "className": "IN",
-      "byteLength": 16,
-      "labels": [
-        "tinder",
-        "com"
-      ],
-      "cpcount": 0
-    }
-  ],
-  "answer": [
-    {
-      "name": "tinder.com",
-      "type": 6,
-      "typeName": "SOA",
-      "class": 1,
-      "className": "IN",
-      "byteLength": 82,
-      "labels": [
-        "tinder",
-        "com"
-      ],
-      "cpcount": 1,
-      "rdstart": 40,
-      "rdlength": 70,
-      "ttl": 879,
-      "sn": 1,
-      "ref": 7200,
-      "ret": 900,
-      "ex": 1209600,
-      "nx": 86400
-    }
-  ],
-  "authority": [],
-  "edns_options": [],
-  "additional": [],
-  "byteLength": 110
-}
\ No newline at end of file
diff --git a/test/soa_test/test.tinder.com.soa.query.bin b/test/soa_test/test.tinder.com.soa.query.bin
deleted file mode 100644
index fd01e4c..0000000
Binary files a/test/soa_test/test.tinder.com.soa.query.bin and /dev/null differ
diff --git a/test/soa_test/test.tinder.com.soa.query.json b/test/soa_test/test.tinder.com.soa.query.json
deleted file mode 100644
index 3e08596..0000000
--- a/test/soa_test/test.tinder.com.soa.query.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "header": {
-    "id": 21341,
-    "qr": 0,
-    "opcode": 0,
-    "aa": 0,
-    "tc": 0,
-    "rd": 1,
-    "ra": 0,
-    "rcode": 0
-  },
-  "question": [
-    {
-      "name": "tinder.com",
-      "typeName": "SOA",
-      "className": "IN"
-    }
-  ]
-}
\ No newline at end of file