diff --git a/blockgenesistest.txt b/blockgenesistest.txt
new file mode 100644
index 000000000..8ad5590f1
--- /dev/null
+++ b/blockgenesistest.txt
@@ -0,0 +1,20 @@
+[
+    {
+        "inputs": {
+        },
+        "result": "f892f88ea00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479400000000000000000000000000000000000000008080834000008087038d7ea4c68000830f4240808080a004994f67dc55b09e814ab7ffc8df3686b4afb2bb53e60eae97ef043fe03fb829c0c0"
+    },
+    {
+        "inputs": {
+            "cd2a3d9f938e13cd947ec05abc7fe734df8dd826": 100000000000000000000
+        },
+        "result": "f8b2f8aea00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a05e5b074eca68ed6f5cf3ef14712b7c97f431a41deff21e3f211cf687f618026780834000008087038d7ea4c68000830f4240808080a004994f67dc55b09e814ab7ffc8df3686b4afb2bb53e60eae97ef043fe03fb829c0c0"
+    },
+    {
+        "inputs": {
+            "cd2a3d9f938e13cd947ec05abc7fe734df8dd826": 99000000000000000000,
+            "13978aee95f38490e9769c39b2773ed763d9cd5f": 1000000000000000000
+        },
+        "result": "f8b2f8aea00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a0b1062e564d1bdb302a2feae46e837fef59c4f8a408967009dcc48327d80d8fff80834000008087038d7ea4c68000830f4240808080a004994f67dc55b09e814ab7ffc8df3686b4afb2bb53e60eae97ef043fe03fb829c0c0"
+    }
+]
diff --git a/hexencodetest.txt b/hexencodetest.txt
deleted file mode 100644
index a6d18834c..000000000
--- a/hexencodetest.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-[
-  [
-    [ 1, 2, 3, 4, 5 ], 
-    "112345"
-  ], 
-  [
-    [ 0, 1, 2, 3, 4, 5 ], 
-    "00012345"
-  ], 
-  [
-    [ 6, 4, 6, 15, 6, 7, 6, 5, 16 ], 
-    "20646f6765"
-  ], 
-  [
-    [ 7, 6, 5, 16 ], 
-    "3765"
-  ], 
-  [
-    [ 16 ], 
-    "20"
-  ], 
-  [
-    [ 0, 16 ], 
-    "30"
-  ],
-  [
-    [ 15, 1, 12, 11, 8, 16 ],
-    "3f1cb8"
-  ],
-  [
-    [ 0, 15, 1, 12, 11, 8, 16 ],
-    "200f1cb8"
-  ]
-]
diff --git a/keyaddrtest.txt b/keyaddrtest.txt
new file mode 100644
index 000000000..f48905037
--- /dev/null
+++ b/keyaddrtest.txt
@@ -0,0 +1,22 @@
+[
+    {
+        "seed": "cow",
+        "key": "c85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4",
+        "addr": "cd2a3d9f938e13cd947ec05abc7fe734df8dd826",
+        "sig_of_emptystring": {
+            v: 27,
+            r: 55022946425863772466282515086640833500580355555249003729267710149987842051473,
+            s: 3021698389129950584349170550428805649435913935175976180112863059249983907949
+        }
+    },
+    {
+        "seed": "horse",
+        "key": "c87f65ff3f271bf5dc8643484f66b200109caffe4bf98c4cb393dc35740b28c0",
+        "addr": "13978aee95f38490e9769c39b2773ed763d9cd5f",
+        "sig_of_emptystring": {
+            v: 28,
+            r: 20570452350081260599473412372903969148670549754219103025003129053348571714359,
+            s: 76892551129780267788164835941580941601518827936179476514262023835864819088004
+        }
+    }
+]
diff --git a/rlptest.txt b/rlptest.txt
index b443d65a4..4ab9f8029 100644
--- a/rlptest.txt
+++ b/rlptest.txt
@@ -1,54 +1,26 @@
 [
     [
         "cat", 
-        "43636174"
+        "83636174"
     ], 
     [
         "dog", 
-        "43646f67"
+        "83646f67"
     ], 
     [
         [ "cat", "dog" ], 
-        "824363617443646f67"
+        "c88363617483646f67"
     ], 
     [
         [ "dog", "god", "cat" ],
-        "8343646f6743676f6443636174"
+        "cc83646f6783676f6483636174"
     ],
-    [
-        1, 
-        "01"
-    ], 
-    [
-        10, 
-        "0a"
-    ], 
-    [
-        100, 
-        "1864"
-    ], 
-    [
-        1000, 
-        "1903e8"
-    ], 
-    [
-        115792089237316195423570985008687907853269984665640564039457584007913129639935, 
-        "37ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-    ], 
-    [
-        115792089237316195423570985008687907853269984665640564039457584007913129639936, 
-        "3821010000000000000000000000000000000000000000000000000000000000000000"
-    ], 
-    [
-        [ 1, 2, [] ], 
-        "83010280"
-    ], 
     [
         [ [ [], [] ], [] ], 
-        "8282808080"
+        "c4c2c0c0c0"
     ], 
     [
-        [ "zw", [ 4 ], "wz" ], 
-        "83427a77810442777a"
+        [ "zw", [ "4" ], "wz" ], 
+        "c8827a77c13482777a"
     ]
 ]
diff --git a/trietest.txt b/trietest.txt
index 4a5c5ded5..059f149fe 100644
--- a/trietest.txt
+++ b/trietest.txt
@@ -1,19 +1,55 @@
 [
   {
-    "inputs": {
-      "doe": "reindeer",
-      "dog": "puppy",
-      "dogglesworth": "cat"
-    },
-    "expectation": "d85f9267d7ed5767fb1b48defa8eb20a1c007a87a07588135a74b40b55de2e67"
+    "inputs": [
+      ["doe", "reindeer"],
+      ["dog", "puppy"],
+      ["dogglesworth", "cat"]
+    ],
+    "expectation": "8aad789dff2f538bca5d8ea56e8abe10f4c7ba3a5dea95fea4cd6e7c3a1168d3"
   },
   {
-    "inputs":{
-      "do": "verb", 
-      "horse": "stallion", 
-      "doge": "coin", 
-      "dog": "puppy"
-    }, 
-    "expectation": "cf7d318935b52db6e23d8c1f5e6b7e62f3606d4ed13783f4fdbd6e67a2085d04"
-  }
+    "inputs":[
+      ["do", "verb"], 
+      ["horse", "stallion"], 
+      ["doge", "coin"], 
+      ["dog", "puppy"]
+    ], 
+    "expectation": "5991bb8c6514148a29db676a14ac506cd2cd5775ace63c30a4fe457715e9ac84"
+  },
+  {
+    "inputs":[
+      ["do", "verb"], 
+      ["ether", "wookiedoo"], 
+      ["horse", "stallion"], 
+      ["shaman", "horse"], 
+      ["doge", "coin"], 
+      ["ether", ""],
+      ["dog", "puppy"],
+      ["shaman", ""]
+    ], 
+    "expectation": "5991bb8c6514148a29db676a14ac506cd2cd5775ace63c30a4fe457715e9ac84"
+  },
+  {
+    "inputs":[
+      ["foo", "bar"], 
+      ["food", "bat"], 
+      ["food", "bass"]
+    ], 
+    "expectation": "17beaa1648bafa633cda809c90c04af50fc8aed3cb40d16efbddee6fdf63c4c3"
+  },   
+  {
+    "inputs":[
+      ["be", "e"], 
+      ["dog", "puppy"], 
+      ["bed", "d"]
+    ], 
+    "expectation": "3f67c7a47520f79faa29255d2d3c084a7a6df0453116ed7232ff10277a8be68b"
+  },   
+  {
+    "inputs":[
+      ["test", "test"], 
+      ["te", "testy"], 
+    ], 
+    "expectation": "8452568af70d8d140f58d941338542f645fcca50094b20f3c3d8c3df49337928"
+  }   
 ]
diff --git a/txtest.txt b/txtest.txt
new file mode 100644
index 000000000..1261d0766
--- /dev/null
+++ b/txtest.txt
@@ -0,0 +1,24 @@
+[
+    {
+        "key": "c85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4",
+        "nonce": 0,
+        "gasprice": 1000000000000,
+        "startgas": 10000,
+        "to": "13978aee95f38490e9769c39b2773ed763d9cd5f",
+        "value": 10000000000000000,
+        "data": "",
+        "unsigned": "eb8085e8d4a510008227109413978aee95f38490e9769c39b2773ed763d9cd5f872386f26fc1000080808080",
+        "signed": "f86b8085e8d4a510008227109413978aee95f38490e9769c39b2773ed763d9cd5f872386f26fc10000801ba0eab47c1a49bf2fe5d40e01d313900e19ca485867d462fe06e139e3a536c6d4f4a014a569d327dcda4b29f74f93c0e9729d2f49ad726e703f9cd90dbb0fbf6649f1"
+    },
+    {
+        "key": "c87f65ff3f271bf5dc8643484f66b200109caffe4bf98c4cb393dc35740b28c0",
+        "nonce": 0,
+        "gasprice": 1000000000000,
+        "startgas": 10000,
+        "to": "",
+        "value": 0,
+        "data": "6025515b525b600a37f260003556601b596020356000355760015b525b54602052f260255860005b525b54602052f2",
+        "unsigned": "f83f8085e8d4a510008227108080af6025515b525b600a37f260003556601b596020356000355760015b525b54602052f260255860005b525b54602052f2808080",
+        "signed": "f87f8085e8d4a510008227108080af6025515b525b600a37f260003556601b596020356000355760015b525b54602052f260255860005b525b54602052f21ba05afed0244d0da90b67cf8979b0f246432a5112c0d31e8d5eedd2bc17b171c694a0bb1035c834677c2e1185b8dc90ca6d1fa585ab3d7ef23707e1a497a98e752d1b"
+    }
+]