3 files changed, 84 insertions, 92 deletions
diff --git a/hexencodetest.json b/hexencodetest.json
index a6d18834c..6fe7891c3 100644
--- a/hexencodetest.json
+++ b/hexencodetest.json
@@ -1,34 +1,34 @@
-[
-  [
-    [ 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"
-  ]
-]
+{
+  "nz,odd": {
+    "seq": [ 1, 2, 3, 4, 5 ], 
+    "return": "112345"
+  },
+  "z,even": {
+    "seq": [ 0, 1, 2, 3, 4, 5 ], 
+    "return": "00012345"
+  },
+  "long": {
+    "seq": [ 6, 4, 6, 15, 6, 7, 6, 5, 16 ], 
+    "return": "20646f6765"
+  },
+  "short": {
+    "seq": [ 7, 6, 5, 16 ], 
+    "return": "3765"
+  },
+  "nz,one": {
+    "seq": [ 16 ], 
+    "return": "20"
+  },
+  "z,two": {
+    "seq": [ 0, 16 ], 
+    "return": "30"
+  },
+  "nz,even": {
+    "seq": [ 15, 1, 12, 11, 8, 16 ],
+    "return": "3f1cb8"
+  },
+  "z,odd": {
+    "seq": [ 0, 15, 1, 12, 11, 8, 16 ],
+    "return": "200f1cb8"
+  }
+}
diff --git a/rlptest.json b/rlptest.json
index b443d65a4..ea74c2c9e 100644
--- a/rlptest.json
+++ b/rlptest.json
@@ -1,54 +1,46 @@
-[
-    [
-        "cat", 
-        "43636174"
-    ], 
-    [
-        "dog", 
-        "43646f67"
-    ], 
-    [
-        [ "cat", "dog" ], 
-        "824363617443646f67"
-    ], 
-    [
-        [ "dog", "god", "cat" ],
-        "8343646f6743676f6443636174"
-    ],
-    [
-        1, 
-        "01"
-    ], 
-    [
-        10, 
-        "0a"
-    ], 
-    [
-        100, 
-        "1864"
-    ], 
-    [
-        1000, 
-        "1903e8"
-    ], 
-    [
-        115792089237316195423570985008687907853269984665640564039457584007913129639935, 
-        "37ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-    ], 
-    [
-        115792089237316195423570985008687907853269984665640564039457584007913129639936, 
-        "3821010000000000000000000000000000000000000000000000000000000000000000"
-    ], 
-    [
-        [ 1, 2, [] ], 
-        "83010280"
-    ], 
-    [
-        [ [ [], [] ], [] ], 
-        "8282808080"
-    ], 
-    [
-        [ "zw", [ 4 ], "wz" ], 
-        "83427a77810442777a"
-    ]
-]
+{
+    "emptystring": {
+        "in": "", 
+        "out": "00"
+    },
+    "shortstring": {
+        "in": "dog", 
+        "out": "43646f67"
+    },
+    "longstring": {
+        "in": "Lorem ipsum dolor sit amet, consectetur adipisicing elit", 
+	"out": "TODO"
+    },
+    "zero": {
+        "in": 0, 
+        "out": "80"
+    },
+    "smallint": {
+        "in": 1, 
+        "out": "01"
+    },
+    "mediumint": {
+        "in": 1000, 
+        "out": "8203e8"
+    },
+    "bigint": {
+        "in": 115792089237316195423570985008687907853269984665640564039457584007913129639936, 
+        "out": "3821010000000000000000000000000000000000000000000000000000000000000000"
+    },
+    "emptylist": {
+        "in": [], 
+        "out": "c0"
+    },
+    "stringlist": {
+        "in": [ "dog", "god", "cat" ],
+        "out": "8343646f6743676f6443636174"
+    },
+    "multilist": {
+        "in": [ "zw", [ 4 ], 1 ], 
+        "out": "TODO"
+    },
+    "listsoflists": {
+        "in": [ [ [], [] ], [] ], 
+        "out": "c2c2c0c0c0"
+    }
+}
diff --git a/trietest.json b/trietest.json
index 4a5c5ded5..e741a2012 100644
--- a/trietest.json
+++ b/trietest.json
@@ -1,5 +1,5 @@
-[
-  {
+{
+  "doprefix": {
     "inputs": {
       "doe": "reindeer",
       "dog": "puppy",
@@ -7,7 +7,7 @@
     },
     "expectation": "d85f9267d7ed5767fb1b48defa8eb20a1c007a87a07588135a74b40b55de2e67"
   },
-  {
+  "multiprefix": {
     "inputs":{
       "do": "verb", 
       "horse": "stallion", 
@@ -16,4 +16,4 @@
     }, 
     "expectation": "cf7d318935b52db6e23d8c1f5e6b7e62f3606d4ed13783f4fdbd6e67a2085d04"
   }
-]
+}