undo gasMemCostChange, add some state tests

6 files changed, 525 insertions, 118 deletions

diff --git a/StateTests/stInitCodeTest.json b/StateTests/stInitCodeTest.json
index c44d71039..572652b4a 100644
--- a/StateTests/stInitCodeTest.json
+++ b/StateTests/stInitCodeTest.json
@@ -364,209 +364,209 @@
         ],
         "out" : "0x",
         "post" : {
-            "04110d816c380812a427968ece99b1c963dfbce6" : {
-                "balance" : "0",
-                "code" : "0x",
-                "nonce" : "1",
-                "storage" : {
-                    "0x02" : "0x04110d816c380812a427968ece99b1c963dfbce6"
-                }
-            },
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1",
                 "code" : "0x3060025560206000600039602060006000f0",
-                "nonce" : "1",
+                "nonce" : "41",
                 "storage" : {
                     "0x02" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87"
                 }
             },
-            "0a517d755cebbf66312b30fff713666a9cb917e0" : {
+            "0fb6a5331de39fae0a56c4a32e2c94de0a447c1e" : {
                 "balance" : "0",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
-                    "0x02" : "0x0a517d755cebbf66312b30fff713666a9cb917e0"
+                    "0x02" : "0x0fb6a5331de39fae0a56c4a32e2c94de0a447c1e"
                 }
             },
-            "24dd378f51adc67a50e339e8031fe9bd4aafab36" : {
+            "1a4c83e1a9834cdc7e4a905ff7f0cf44aed73180" : {
                 "balance" : "0",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
-                    "0x02" : "0x24dd378f51adc67a50e339e8031fe9bd4aafab36"
+                    "0x02" : "0x1a4c83e1a9834cdc7e4a905ff7f0cf44aed73180"
                 }
             },
-            "293f982d000532a7861ab122bdc4bbfd26bf9030" : {
+            "1b3523297a4a8c15bb532540a1c506e4265f4702" : {
                 "balance" : "0",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
-                    "0x02" : "0x293f982d000532a7861ab122bdc4bbfd26bf9030"
+                    "0x02" : "0x1b3523297a4a8c15bb532540a1c506e4265f4702"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "10000",
+            "1df5f7130c5eac4683fe529817183e1154371443" : {
+                "balance" : "0",
                 "code" : "0x",
-                "nonce" : "0",
+                "nonce" : "1",
                 "storage" : {
+                    "0x02" : "0x1df5f7130c5eac4683fe529817183e1154371443"
                 }
             },
-            "2cf5732f017b0cf1b1f13a1478e10239716bf6b5" : {
+            "25fa1750f3792535a94af7f69466171e16c190c0" : {
                 "balance" : "0",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
-                    "0x02" : "0x2cf5732f017b0cf1b1f13a1478e10239716bf6b5"
+                    "0x02" : "0x25fa1750f3792535a94af7f69466171e16c190c0"
                 }
             },
-            "31c640b92c21a1f1465c91070b4b3b4d6854195f" : {
-                "balance" : "0",
+            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "10000",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
-            "37f998764813b136ddf5a754f34063fd03065e36" : {
+            "3a7b4c16689a57ba964ae4cc090b71fa09fa5ef9" : {
                 "balance" : "0",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
-                    "0x02" : "0x37f998764813b136ddf5a754f34063fd03065e36"
+                    "0x02" : "0x3a7b4c16689a57ba964ae4cc090b71fa09fa5ef9"
                 }
             },
-            "37fa399a749c121f8a15ce77e3d9f9bec8020d7a" : {
+            "421e16f55eda29c6f3d0982130351912eff4b521" : {
                 "balance" : "0",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
-                    "0x02" : "0x37fa399a749c121f8a15ce77e3d9f9bec8020d7a"
+                    "0x02" : "0x421e16f55eda29c6f3d0982130351912eff4b521"
                 }
             },
-            "4f36659fa632310b6ec438dea4085b522a2dd077" : {
+            "44f04ea9c48239fa56adb6dff7bd2dea6ef22c25" : {
                 "balance" : "0",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
-                    "0x02" : "0x4f36659fa632310b6ec438dea4085b522a2dd077"
+                    "0x02" : "0x44f04ea9c48239fa56adb6dff7bd2dea6ef22c25"
                 }
             },
-            "62c01474f089b07dae603491675dc5b5748f7049" : {
+            "485b3bd0291bc2f6d088d38f022c4c1124b82c1f" : {
                 "balance" : "0",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
-                    "0x02" : "0x62c01474f089b07dae603491675dc5b5748f7049"
+                    "0x02" : "0x485b3bd0291bc2f6d088d38f022c4c1124b82c1f"
                 }
             },
-            "729af7294be595a0efd7d891c9e51f89c07950c7" : {
+            "57832d7237fa84b65838e10445ebf67acf6a1a81" : {
                 "balance" : "0",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
-                    "0x02" : "0x729af7294be595a0efd7d891c9e51f89c07950c7"
+                    "0x02" : "0x57832d7237fa84b65838e10445ebf67acf6a1a81"
                 }
             },
-            "83e3e5a16d3b696a0314b30b2534804dd5e11197" : {
+            "8812f63d03165f5e1bea71ec7982fbfb6050c475" : {
                 "balance" : "0",
                 "code" : "0x",
-                "nonce" : "1",
+                "nonce" : "0",
                 "storage" : {
-                    "0x02" : "0x83e3e5a16d3b696a0314b30b2534804dd5e11197"
                 }
             },
-            "8703df2417e0d7c59d063caa9583cb10a4d20532" : {
+            "8e3411c91d5dd4081b4846fa2f93808f5ad19686" : {
                 "balance" : "0",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
-                    "0x02" : "0x8703df2417e0d7c59d063caa9583cb10a4d20532"
+                    "0x02" : "0x8e3411c91d5dd4081b4846fa2f93808f5ad19686"
                 }
             },
-            "8dffcd74e5b5923512916c6a64b502689cfa65e1" : {
+            "9928f17599b0221db726ca65bc26eb2522d95040" : {
                 "balance" : "0",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
-                    "0x02" : "0x8dffcd74e5b5923512916c6a64b502689cfa65e1"
+                    "0x02" : "0x9928f17599b0221db726ca65bc26eb2522d95040"
                 }
             },
-            "95a4d7cccb5204733874fa87285a176fe1e9e240" : {
+            "9ca74ad1a326b79d9ec9c080deb56062e975a7ee" : {
                 "balance" : "0",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
-                    "0x02" : "0x95a4d7cccb5204733874fa87285a176fe1e9e240"
+                    "0x02" : "0x9ca74ad1a326b79d9ec9c080deb56062e975a7ee"
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "89999",
+                "code" : "0x",
+                "nonce" : "1",
+                "storage" : {
                 }
             },
-            "99b2fcba8120bedd048fe79f5262a6690ed38c39" : {
+            "ab7235f635cc2c0f507583a9b7eb123401db1e82" : {
                 "balance" : "0",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
-                    "0x02" : "0x99b2fcba8120bedd048fe79f5262a6690ed38c39"
+                    "0x02" : "0xab7235f635cc2c0f507583a9b7eb123401db1e82"
                 }
             },
-            "a4202b8b8afd5354e3e40a219bdc17f6001bf2cf" : {
+            "bbba3a14689a28fd82f09d4e01bc87d9654e95c3" : {
                 "balance" : "0",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
-                    "0x02" : "0xa4202b8b8afd5354e3e40a219bdc17f6001bf2cf"
+                    "0x02" : "0xbbba3a14689a28fd82f09d4e01bc87d9654e95c3"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "89999",
+            "c417ed2eeb560e08f9de20b22788a132f96946bd" : {
+                "balance" : "0",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
+                    "0x02" : "0xc417ed2eeb560e08f9de20b22788a132f96946bd"
                 }
             },
-            "a9647f4a0a14042d91dc33c0328030a7157c93ae" : {
+            "ce561b4f058c7b8772e4d795145cc9e5cb5f6393" : {
                 "balance" : "0",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
-                    "0x02" : "0xa9647f4a0a14042d91dc33c0328030a7157c93ae"
+                    "0x02" : "0xce561b4f058c7b8772e4d795145cc9e5cb5f6393"
                 }
             },
-            "aa6cffe5185732689c18f37a7f86170cb7304c2a" : {
+            "dfceaa082d190ab34e3c37943de35ae8fc01f300" : {
                 "balance" : "0",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
-                    "0x02" : "0xaa6cffe5185732689c18f37a7f86170cb7304c2a"
+                    "0x02" : "0xdfceaa082d190ab34e3c37943de35ae8fc01f300"
                 }
             },
-            "aae4a2e3c51c04606dcb3723456e58f3ed214f45" : {
+            "dff76bc9befc4766ad00aeeb65aafecdb00cbb58" : {
                 "balance" : "0",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
-                    "0x02" : "0xaae4a2e3c51c04606dcb3723456e58f3ed214f45"
+                    "0x02" : "0xdff76bc9befc4766ad00aeeb65aafecdb00cbb58"
                 }
             },
-            "c37a43e940dfb5baf581a0b82b351d48305fc885" : {
+            "e51f478dba4907cdfc7dc0c2c0dbcab47d702a48" : {
                 "balance" : "0",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
-                    "0x02" : "0xc37a43e940dfb5baf581a0b82b351d48305fc885"
+                    "0x02" : "0xe51f478dba4907cdfc7dc0c2c0dbcab47d702a48"
                 }
             },
-            "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+            "f0064be0919341a45680ec0d592eaee47df671ac" : {
                 "balance" : "0",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
-                    "0x02" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
+                    "0x02" : "0xf0064be0919341a45680ec0d592eaee47df671ac"
                 }
             },
-            "f735071cbee190d76b704ce68384fc21e389fbe7" : {
+            "faed8261f652b30601dadebc339084a1a734ba5a" : {
                 "balance" : "0",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
-                    "0x02" : "0xf735071cbee190d76b704ce68384fc21e389fbe7"
+                    "0x02" : "0xfaed8261f652b30601dadebc339084a1a734ba5a"
                 }
             }
         },
@@ -574,7 +574,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0",
                 "code" : "0x3060025560206000600039602060006000f0",
-                "nonce" : "0",
+                "nonce" : "40",
                 "storage" : {
                 }
             },
@@ -758,6 +758,128 @@
             "value" : "1"
         }
     },
+    "ReturnTest" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "45678256",
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "0",
+            "currentTimestamp" : 1,
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "logs" : [
+        ],
+        "out" : "0x0015",
+        "post" : {
+            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "539",
+                "code" : "0x",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "99461",
+                "code" : "0x6001601f6001601e600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b6107d0f1506002601ef3",
+                "nonce" : "1",
+                "storage" : {
+                }
+            },
+            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "100000",
+                "code" : "0x60156000526001601ff3",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "100000",
+                "code" : "0x6001601f6001601e600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b6107d0f1506002601ef3",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "100000",
+                "code" : "0x60156000526001601ff3",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : "",
+            "gasLimit" : "5000",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : "1"
+        }
+    },
+    "ReturnTest2" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "45678256",
+            "currentGasLimit" : "100000000",
+            "currentNumber" : "0",
+            "currentTimestamp" : 1,
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "logs" : [
+        ],
+        "out" : "0x0000000000000000000000000000000000000000000000000000000000000015000000000000000000000000000000000000000000000000000000000000003f",
+        "post" : {
+            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "546",
+                "code" : "0x",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "99454",
+                "code" : "0x60156000526020602060206000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b611b58f15060406000f3",
+                "nonce" : "1",
+                "storage" : {
+                }
+            },
+            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "100000",
+                "code" : "0x60003560030260005260206000f3",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "100000",
+                "code" : "0x60156000526020602060206000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b611b58f15060406000f3",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "100000",
+                "code" : "0x60003560030260005260206000f3",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : "",
+            "gasLimit" : "15000",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : "1"
+        }
+    },
     "StackUnderFlowContractCreation" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/StateTests/stPreCompiledContracts.json b/StateTests/stPreCompiledContracts.json
index 8cca6f7a4..0f1db1275 100644
--- a/StateTests/stPreCompiledContracts.json
+++ b/StateTests/stPreCompiledContracts.json
@@ -1074,14 +1074,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "986358",
+                "balance" : "32684",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "999999999998913642",
+                "balance" : "999999999999867316",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -1631,14 +1631,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "986358",
+                "balance" : "32684",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "999999999998913642",
+                "balance" : "999999999999867316",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
diff --git a/StateTests/stSolidityTest.json b/StateTests/stSolidityTest.json
index c4e19b9b8..e2d0f1200 100644
--- a/StateTests/stSolidityTest.json
+++ b/StateTests/stSolidityTest.json
@@ -1,4 +1,253 @@
 {
+    "AmbigiousMethod" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "45678256",
+            "currentGasLimit" : "100000000",
+            "currentNumber" : "0",
+            "currentTimestamp" : 1,
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "logs" : [
+        ],
+        "out" : "0x",
+        "post" : {
+            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "848",
+                "code" : "0x",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "99152",
+                "code" : "0x60003560e060020a90048063c040622614601557005b601b6021565b60006000f35b61014f60008190555056",
+                "nonce" : "1",
+                "storage" : {
+                    "0x" : "0x014f"
+                }
+            }
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "100000",
+                "code" : "0x60003560e060020a90048063c040622614601557005b601b6021565b60006000f35b61014f60008190555056",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "//" : "run()",
+            "data" : "0xc0406226",
+            "gasLimit" : "10000",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : "1"
+        }
+    },
+    "CallInfiniteLoop" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "45678256",
+            "currentGasLimit" : "100000000",
+            "currentNumber" : "0",
+            "currentTimestamp" : 1,
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "logs" : [
+        ],
+        "out" : "0x",
+        "post" : {
+            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "10000",
+                "code" : "0x",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "90000",
+                "code" : "0x60e060020a600035048063296df0df1460285780634893d88a146034578063981a316514604057005b602e604c565b60006000f35b603a6061565b60006000f35b60466059565b60006000f35b5b600115605757604d565b565b605f6061565b565b60676059565b56",
+                "nonce" : "1",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "100000",
+                "code" : "0x60e060020a600035048063296df0df1460285780634893d88a146034578063981a316514604057005b602e604c565b60006000f35b603a6061565b60006000f35b60466059565b60006000f35b5b600115605757604d565b565b605f6061565b565b60676059565b56",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "//" : "testInfiniteLoop()",
+            "data" : "0x296df0df",
+            "gasLimit" : "10000",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : "1"
+        }
+    },
+    "CallLowLevelCreatesSolidity" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "45678256",
+            "currentGasLimit" : "100000000",
+            "currentNumber" : "0",
+            "currentTimestamp" : 1,
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "logs" : [
+        ],
+        "out" : "0x00000000000000000000000000000000000000000000000000000000000000e1",
+        "post" : {
+            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "1729",
+                "code" : "0x",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "98271",
+                "code" : "0x60e060020a60003504806330debb4214610020578063c04062261461003157005b61002b6004356100a4565b60006000f35b610039610043565b8060005260206000f35b60006000600160008190555060656100af600039606560006000f0905080600160a060020a03166319ab453c600060008260e060020a02600052600433600160a060020a03168152602001600060008660155a03f150505060005491505090565b80600081905550505600605980600c6000396000f30060e060020a60003504806319ab453c14601457005b601d6004356023565b60006000f35b80600160a060020a03166330debb42600060008260e060020a02600052600460e18152602001600060008660155a03f15050505056",
+                "nonce" : "2",
+                "storage" : {
+                    "0x" : "0xe1"
+                }
+            },
+            "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
+                "balance" : "0",
+                "code" : "0x60e060020a60003504806319ab453c14601457005b601d6004356023565b60006000f35b80600160a060020a03166330debb42600060008260e060020a02600052600460e18152602001600060008660155a03f15050505056",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "100000",
+                "code" : "0x60e060020a60003504806330debb4214610020578063c04062261461003157005b61002b6004356100a4565b60006000f35b610039610043565b8060005260206000f35b60006000600160008190555060656100af600039606560006000f0905080600160a060020a03166319ab453c600060008260e060020a02600052600433600160a060020a03168152602001600060008660155a03f150505060005491505090565b80600081905550505600605980600c6000396000f30060e060020a60003504806319ab453c14601457005b601d6004356023565b60006000f35b80600160a060020a03166330debb42600060008260e060020a02600052600460e18152602001600060008660155a03f15050505056",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "//" : "run()",
+            "data" : "0xc0406226",
+            "gasLimit" : "15000",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : "1"
+        }
+    },
+    "CallRecursiveMethods" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "45678256",
+            "currentGasLimit" : "100000000",
+            "currentNumber" : "0",
+            "currentTimestamp" : 1,
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "logs" : [
+        ],
+        "out" : "0x",
+        "post" : {
+            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "7000",
+                "code" : "0x",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "93000",
+                "code" : "0x60e060020a600035048063296df0df1460285780634893d88a146034578063981a316514604057005b602e604c565b60006000f35b603a6061565b60006000f35b60466059565b60006000f35b5b600115605757604d565b565b605f6061565b565b60676059565b56",
+                "nonce" : "1",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "100000",
+                "code" : "0x60e060020a600035048063296df0df1460285780634893d88a146034578063981a316514604057005b602e604c565b60006000f35b603a6061565b60006000f35b60466059565b60006000f35b5b600115605757604d565b565b605f6061565b565b60676059565b56",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "//" : "testRecursiveMethods()",
+            "data" : "0x981a3165",
+            "gasLimit" : "7000",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : "1"
+        }
+    },
+    "RecursiveCreateContracts" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "45678256",
+            "currentGasLimit" : "100000000",
+            "currentNumber" : "0",
+            "currentTimestamp" : 1,
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "logs" : [
+        ],
+        "out" : "0x",
+        "post" : {
+            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "10000",
+                "code" : "0x",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "990000",
+                "code" : "0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610043565b60006000f35b61003d60043561008f565b60006000f35b600060c66100cc60003960c6600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f1505050505050565b6000336000819055508160018190555060686101926000396068600054600160a060020a0316815260200182815260200160006000f09050505056006012604060c6600439600451602451601e565b60018060c56000396000f35b6000600182039150600082116031576057565b6068605d600039606883600160a060020a0316815260200182815260200160006000f090505b5050505600601260406068600439600451602451601e565b60018060676000396000f35b60018103905060008111602f576062565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660155a03f15050505b505056000000601260406068600439600451602451601e565b60018060676000396000f35b60018103905060008111602f576062565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660155a03f15050505b5050560000",
+                "nonce" : "1",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000",
+                "code" : "0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610043565b60006000f35b61003d60043561008f565b60006000f35b600060c66100cc60003960c6600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f1505050505050565b6000336000819055508160018190555060686101926000396068600054600160a060020a0316815260200182815260200160006000f09050505056006012604060c6600439600451602451601e565b60018060c56000396000f35b6000600182039150600082116031576057565b6068605d600039606883600160a060020a0316815260200182815260200160006000f090505b5050505600601260406068600439600451602451601e565b60018060676000396000f35b60018103905060008111602f576062565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660155a03f15050505b505056000000601260406068600439600451602451601e565b60018060676000396000f35b60018103905060008111602f576062565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660155a03f15050505b5050560000",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "//" : "run(uint256)",
+            "data" : "0xa444f5e900000000000000000000000000000000000000000000000000000000000204",
+            "gasLimit" : "10000",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : "1"
+        }
+    },
     "SolidityTest" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -12,15 +261,29 @@
         ],
         "out" : "0x0000000000000000000000000000000000000000000000000000000000000000",
         "post" : {
+            "0000000000000000000000000000000000000002" : {
+                "balance" : "0",
+                "code" : "0x",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "0000000000000000000000000000000000000003" : {
+                "balance" : "0",
+                "code" : "0x",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "4904",
+                "balance" : "5299",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "9999999999994996",
+                "balance" : "9999999999994601",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -28,14 +291,14 @@
             },
             "d4ac7c59aef4966a15f4405c12e012d5fd52a26c" : {
                 "balance" : "0",
-                "code" : "0x60e060020a600035048062f55d9d14601d578063b9c3d0a514602c57005b60266004356045565b60006000f35b6032603c565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056",
+                "code" : "0x60003560e060020a90048062f55d9d14601e578063b9c3d0a514602d57005b60276004356046565b60006000f35b6033603d565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "100100",
-                "code" : "0x60e060020a6000350480630c4c9a8014610078578063296df0df1461008a5780632a9afb831461009c578063380e4396146100ae5780634893d88a146100c05780637ee17e12146100ce578063981a3165146100dc578063a60eedda146100ee578063e97384dc14610100578063ed973fe91461011257005b610080610431565b8060005260206000f35b6100926103f7565b8060005260206000f35b6100a46105d1565b8060005260206000f35b6100b6610220565b8060005260206000f35b6100c8610426565b60006000f35b6100d66102df565b60006000f35b6100e4610411565b8060005260206000f35b6100f6610124565b8060005260206000f35b6101086102f5565b8060005260206000f35b61011a6101be565b8060005260206000f35b60006000605f6106be600039605f60006000f0905080600160a060020a031662f55d9d8060e060020a0260005241600160a060020a0316600452600060006024600060008660155a03f150505080600160a060020a031663b9c3d0a58060e060020a02600052602060006004600060008660155a03f150505060005160e1146101ac576101b5565b600191506101ba565b600091505b5090565b60006000605f6106be600039605f60006000f0905080600160a060020a031663b9c3d0a58060e060020a02600052602060006004600060008660155a03f150505060005160e11461020e57610217565b6001915061021c565b600091505b5090565b60006000600060009150600092508160001461023b576102bf565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe78213156102b5575b600a82121561027a578180600101925050610264565b81600a14610287576102b0565b600a90505b60008160ff1611156102af5781806001900392505080806001900391505061028c565b5b6102be565b600092506102da565b5b816000146102cc576102d5565b600192506102da565b600092505b505090565b6000605f6106be600039605f60006000f0905090565b60006001905041600160a060020a0316732adc25665018aa1fe0e6bc666dac8fc2697ff9ba14156103255761032e565b600090506103f4565b446302b8feb0141561033f57610348565b600090506103f4565b43607814156103565761035f565b600090506103f4565b33600160a060020a031673a94f5374fce5edbc8e2a8697c15331677e6ebf0b141561038957610392565b600090506103f4565b34606414156103a0576103a9565b600090506103f4565b3a600114156103b7576103c0565b600090506103f4565b32600160a060020a031673a94f5374fce5edbc8e2a8697c15331677e6ebf0b14156103ea576103f3565b600090506103f4565b5b90565b6000600090505b60011561040a576103fe565b6001905090565b60006000905061041f610426565b6001905090565b61042e610411565b50565b60006000905061043f6102df565b50610448610220565b1561045257610478565b7ff000000000000000000000000000000000000000000000000000000000000000810190505b6104806101be565b1561048a576104b0565b7f0f00000000000000000000000000000000000000000000000000000000000000810190505b6104b8610124565b156104c2576104e7565b7ef0000000000000000000000000000000000000000000000000000000000000810190505b6104ef6102f5565b156104f95761051e565b7e0f000000000000000000000000000000000000000000000000000000000000810190505b60ff60008190555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b60018190555060ff6002819055507f676c6f62616c2064617461203332206c656e67746820737472696e670000000060038190555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b600460006000526020526040600020819055506105a06105d1565b156105aa576105ce565b7df00000000000000000000000000000000000000000000000000000000000810190505b90565b60006001905060005460ff14156105e7576105f0565b600090506106ba565b60025460005414156106015761060a565b600090506106ba565b600154600160a060020a031673a94f5374fce5edbc8e2a8697c15331677e6ebf0b14156106365761063f565b600090506106ba565b6003547f676c6f62616c2064617461203332206c656e67746820737472696e6700000000141561066e57610677565b600090506106ba565b60046000600052602052604060002054600160a060020a031673a94f5374fce5edbc8e2a8697c15331677e6ebf0b14156106b0576106b9565b600090506106ba565b5b905600605380600c6000396000f30060e060020a600035048062f55d9d14601d578063b9c3d0a514602c57005b60266004356045565b60006000f35b6032603c565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056",
+                "code" : "0x60003560e060020a900480630c4c9a8014610084578063296df0df146100965780632a9afb83146100a8578063380e4396146100ba5780634893d88a146100cc5780637ee17e12146100da578063981a3165146100e8578063a60eedda146100fa578063e0a9fd281461010c578063e97384dc1461011e578063ed973fe91461013057005b61008c6102c0565b8060005260206000f35b61009e61067b565b8060005260206000f35b6100b06101ba565b8060005260206000f35b6100c261049b565b8060005260206000f35b6100d461087d565b60006000f35b6100e26101a4565b60006000f35b6100f06102ab565b8060005260206000f35b610102610695565b8060005260206000f35b610114610732565b8060005260206000f35b61012661055a565b8060005260206000f35b610138610142565b8060005260206000f35b600060006060610889600039606060006000f0905080600160a060020a031663b9c3d0a5602060008260e060020a026000526004600060008660155a03f150505060005160e1146101925761019b565b600191506101a0565b600091505b5090565b60006060610889600039606060006000f0905090565b60006001905060005460ff14156101d0576101d9565b600090506102a8565b60025460005414156101ea576101f3565b600090506102a8565b600154600160a060020a031673a94f5374fce5edbc8e2a8697c15331677e6ebf0b141561021f57610228565b600090506102a8565b6003547f676c6f62616c2064617461203332206c656e67746820737472696e6700000000141561025757610260565b600090506102a8565b600460006000815260200190815260200160002054600160a060020a031673a94f5374fce5edbc8e2a8697c15331677e6ebf0b141561029e576102a7565b600090506102a8565b5b90565b6000600090506102b961087d565b6001905090565b6000600090506102ce6101a4565b506102d761049b565b156102e157610307565b7ff000000000000000000000000000000000000000000000000000000000000000810190505b61030f610142565b156103195761033f565b7f0f00000000000000000000000000000000000000000000000000000000000000810190505b610347610695565b1561035157610376565b7ef0000000000000000000000000000000000000000000000000000000000000810190505b61037e61055a565b15610388576103ad565b7e0f000000000000000000000000000000000000000000000000000000000000810190505b60ff60008190555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b60018190555060ff6002819055507f676c6f62616c2064617461203332206c656e67746820737472696e670000000060038190555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b6004600060008152602001908152602001600020819055506104346101ba565b1561043e57610462565b7df00000000000000000000000000000000000000000000000000000000000810190505b61046a610732565b1561047457610498565b7d0f0000000000000000000000000000000000000000000000000000000000810190505b90565b6000600060006000915060009250816000146104b65761053a565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7821315610530575b600a8212156104f55781806001019250506104df565b81600a146105025761052b565b600a90505b60008160ff16111561052a57818060019003925050808060019003915050610507565b5b610539565b60009250610555565b5b8160001461054757610550565b60019250610555565b600092505b505090565b60006001905041600160a060020a0316732adc25665018aa1fe0e6bc666dac8fc2697ff9ba141561058a57610593565b60009050610678565b446302b8feb014156105a4576105ad565b60009050610678565b45683635c9adc5dea0000014156105c3576105cc565b60009050610678565b43607814156105da576105e3565b60009050610678565b33600160a060020a031673a94f5374fce5edbc8e2a8697c15331677e6ebf0b141561060d57610616565b60009050610678565b34606414156106245761062d565b60009050610678565b3a6001141561063b57610644565b60009050610678565b32600160a060020a031673a94f5374fce5edbc8e2a8697c15331677e6ebf0b141561066e57610677565b60009050610678565b5b90565b6000600090505b60011561068e57610682565b6001905090565b60006000600191506060610889600039606060006000f0905080600160a060020a031662f55d9d600060008260e060020a02600052600441600160a060020a03168152602001600060008660155a03f150505080600160a060020a031663b9c3d0a5602060008260e060020a026000526004600060008660155a03f150505060005160e114156107245761072d565b6000915061072e565b5b5090565b60006001905060007f74657374737472696e67000000000000000000000000000000000000000000008152600a016000207f43c4b4524adb81e4e9a5c4648a98e9d320e3908ac5b6c889144b642cd08ae16d141561078f57610798565b6000905061087a565b60026020600060007f74657374737472696e67000000000000000000000000000000000000000000008152600a01600060008560155a03f150506000517f3c8727e019a42b444667a587b6001251becadabbb36bfed8087a92c18882d11114156108015761080a565b6000905061087a565b60036020600060007f74657374737472696e67000000000000000000000000000000000000000000008152600a01600060008560155a03f15050600051600160a060020a031673cd566972b5e50104011a92b59fa8e0b1234851ae141561087057610879565b6000905061087a565b5b90565b6108856102ab565b505600605480600c6000396000f30060003560e060020a90048062f55d9d14601e578063b9c3d0a514602d57005b60276004356046565b60006000f35b6033603d565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056",
                 "nonce" : "3",
                 "storage" : {
                     "0x" : "0xff",
@@ -47,7 +310,7 @@
             },
             "f223f7d30bd5248dabd423efe1568bce860dedc7" : {
                 "balance" : "0",
-                "code" : "0x60e060020a600035048062f55d9d14601d578063b9c3d0a514602c57005b60266004356045565b60006000f35b6032603c565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056",
+                "code" : "0x60003560e060020a90048062f55d9d14601e578063b9c3d0a514602d57005b60276004356046565b60006000f35b6033603d565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -63,7 +326,7 @@
             },
             "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "100000",
-                "code" : "0x60e060020a6000350480630c4c9a8014610078578063296df0df1461008a5780632a9afb831461009c578063380e4396146100ae5780634893d88a146100c05780637ee17e12146100ce578063981a3165146100dc578063a60eedda146100ee578063e97384dc14610100578063ed973fe91461011257005b610080610431565b8060005260206000f35b6100926103f7565b8060005260206000f35b6100a46105d1565b8060005260206000f35b6100b6610220565b8060005260206000f35b6100c8610426565b60006000f35b6100d66102df565b60006000f35b6100e4610411565b8060005260206000f35b6100f6610124565b8060005260206000f35b6101086102f5565b8060005260206000f35b61011a6101be565b8060005260206000f35b60006000605f6106be600039605f60006000f0905080600160a060020a031662f55d9d8060e060020a0260005241600160a060020a0316600452600060006024600060008660155a03f150505080600160a060020a031663b9c3d0a58060e060020a02600052602060006004600060008660155a03f150505060005160e1146101ac576101b5565b600191506101ba565b600091505b5090565b60006000605f6106be600039605f60006000f0905080600160a060020a031663b9c3d0a58060e060020a02600052602060006004600060008660155a03f150505060005160e11461020e57610217565b6001915061021c565b600091505b5090565b60006000600060009150600092508160001461023b576102bf565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe78213156102b5575b600a82121561027a578180600101925050610264565b81600a14610287576102b0565b600a90505b60008160ff1611156102af5781806001900392505080806001900391505061028c565b5b6102be565b600092506102da565b5b816000146102cc576102d5565b600192506102da565b600092505b505090565b6000605f6106be600039605f60006000f0905090565b60006001905041600160a060020a0316732adc25665018aa1fe0e6bc666dac8fc2697ff9ba14156103255761032e565b600090506103f4565b446302b8feb0141561033f57610348565b600090506103f4565b43607814156103565761035f565b600090506103f4565b33600160a060020a031673a94f5374fce5edbc8e2a8697c15331677e6ebf0b141561038957610392565b600090506103f4565b34606414156103a0576103a9565b600090506103f4565b3a600114156103b7576103c0565b600090506103f4565b32600160a060020a031673a94f5374fce5edbc8e2a8697c15331677e6ebf0b14156103ea576103f3565b600090506103f4565b5b90565b6000600090505b60011561040a576103fe565b6001905090565b60006000905061041f610426565b6001905090565b61042e610411565b50565b60006000905061043f6102df565b50610448610220565b1561045257610478565b7ff000000000000000000000000000000000000000000000000000000000000000810190505b6104806101be565b1561048a576104b0565b7f0f00000000000000000000000000000000000000000000000000000000000000810190505b6104b8610124565b156104c2576104e7565b7ef0000000000000000000000000000000000000000000000000000000000000810190505b6104ef6102f5565b156104f95761051e565b7e0f000000000000000000000000000000000000000000000000000000000000810190505b60ff60008190555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b60018190555060ff6002819055507f676c6f62616c2064617461203332206c656e67746820737472696e670000000060038190555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b600460006000526020526040600020819055506105a06105d1565b156105aa576105ce565b7df00000000000000000000000000000000000000000000000000000000000810190505b90565b60006001905060005460ff14156105e7576105f0565b600090506106ba565b60025460005414156106015761060a565b600090506106ba565b600154600160a060020a031673a94f5374fce5edbc8e2a8697c15331677e6ebf0b14156106365761063f565b600090506106ba565b6003547f676c6f62616c2064617461203332206c656e67746820737472696e6700000000141561066e57610677565b600090506106ba565b60046000600052602052604060002054600160a060020a031673a94f5374fce5edbc8e2a8697c15331677e6ebf0b14156106b0576106b9565b600090506106ba565b5b905600605380600c6000396000f30060e060020a600035048062f55d9d14601d578063b9c3d0a514602c57005b60266004356045565b60006000f35b6032603c565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056",
+                "code" : "0x60003560e060020a900480630c4c9a8014610084578063296df0df146100965780632a9afb83146100a8578063380e4396146100ba5780634893d88a146100cc5780637ee17e12146100da578063981a3165146100e8578063a60eedda146100fa578063e0a9fd281461010c578063e97384dc1461011e578063ed973fe91461013057005b61008c6102c0565b8060005260206000f35b61009e61067b565b8060005260206000f35b6100b06101ba565b8060005260206000f35b6100c261049b565b8060005260206000f35b6100d461087d565b60006000f35b6100e26101a4565b60006000f35b6100f06102ab565b8060005260206000f35b610102610695565b8060005260206000f35b610114610732565b8060005260206000f35b61012661055a565b8060005260206000f35b610138610142565b8060005260206000f35b600060006060610889600039606060006000f0905080600160a060020a031663b9c3d0a5602060008260e060020a026000526004600060008660155a03f150505060005160e1146101925761019b565b600191506101a0565b600091505b5090565b60006060610889600039606060006000f0905090565b60006001905060005460ff14156101d0576101d9565b600090506102a8565b60025460005414156101ea576101f3565b600090506102a8565b600154600160a060020a031673a94f5374fce5edbc8e2a8697c15331677e6ebf0b141561021f57610228565b600090506102a8565b6003547f676c6f62616c2064617461203332206c656e67746820737472696e6700000000141561025757610260565b600090506102a8565b600460006000815260200190815260200160002054600160a060020a031673a94f5374fce5edbc8e2a8697c15331677e6ebf0b141561029e576102a7565b600090506102a8565b5b90565b6000600090506102b961087d565b6001905090565b6000600090506102ce6101a4565b506102d761049b565b156102e157610307565b7ff000000000000000000000000000000000000000000000000000000000000000810190505b61030f610142565b156103195761033f565b7f0f00000000000000000000000000000000000000000000000000000000000000810190505b610347610695565b1561035157610376565b7ef0000000000000000000000000000000000000000000000000000000000000810190505b61037e61055a565b15610388576103ad565b7e0f000000000000000000000000000000000000000000000000000000000000810190505b60ff60008190555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b60018190555060ff6002819055507f676c6f62616c2064617461203332206c656e67746820737472696e670000000060038190555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b6004600060008152602001908152602001600020819055506104346101ba565b1561043e57610462565b7df00000000000000000000000000000000000000000000000000000000000810190505b61046a610732565b1561047457610498565b7d0f0000000000000000000000000000000000000000000000000000000000810190505b90565b6000600060006000915060009250816000146104b65761053a565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7821315610530575b600a8212156104f55781806001019250506104df565b81600a146105025761052b565b600a90505b60008160ff16111561052a57818060019003925050808060019003915050610507565b5b610539565b60009250610555565b5b8160001461054757610550565b60019250610555565b600092505b505090565b60006001905041600160a060020a0316732adc25665018aa1fe0e6bc666dac8fc2697ff9ba141561058a57610593565b60009050610678565b446302b8feb014156105a4576105ad565b60009050610678565b45683635c9adc5dea0000014156105c3576105cc565b60009050610678565b43607814156105da576105e3565b60009050610678565b33600160a060020a031673a94f5374fce5edbc8e2a8697c15331677e6ebf0b141561060d57610616565b60009050610678565b34606414156106245761062d565b60009050610678565b3a6001141561063b57610644565b60009050610678565b32600160a060020a031673a94f5374fce5edbc8e2a8697c15331677e6ebf0b141561066e57610677565b60009050610678565b5b90565b6000600090505b60011561068e57610682565b6001905090565b60006000600191506060610889600039606060006000f0905080600160a060020a031662f55d9d600060008260e060020a02600052600441600160a060020a03168152602001600060008660155a03f150505080600160a060020a031663b9c3d0a5602060008260e060020a026000526004600060008660155a03f150505060005160e114156107245761072d565b6000915061072e565b5b5090565b60006001905060007f74657374737472696e67000000000000000000000000000000000000000000008152600a016000207f43c4b4524adb81e4e9a5c4648a98e9d320e3908ac5b6c889144b642cd08ae16d141561078f57610798565b6000905061087a565b60026020600060007f74657374737472696e67000000000000000000000000000000000000000000008152600a01600060008560155a03f150506000517f3c8727e019a42b444667a587b6001251becadabbb36bfed8087a92c18882d11114156108015761080a565b6000905061087a565b60036020600060007f74657374737472696e67000000000000000000000000000000000000000000008152600a01600060008560155a03f15050600051600160a060020a031673cd566972b5e50104011a92b59fa8e0b1234851ae141561087057610879565b6000905061087a565b5b90565b6108856102ab565b505600605480600c6000396000f30060003560e060020a90048062f55d9d14601e578063b9c3d0a514602d57005b60276004356046565b60006000f35b6033603d565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/TransactionTests/ttTransactionTest.json b/TransactionTests/ttTransactionTest.json
index cab77019d..cee54d238 100644
--- a/TransactionTests/ttTransactionTest.json
+++ b/TransactionTests/ttTransactionTest.json
@@ -32,6 +32,9 @@
     "AddressMoreThan20" : {
         "rlp" : "0xf86080018207d095b94f5374fce5edbc8e2a8697c15331677e6ebf0b1c0a801ca098ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4aa08887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
     },
+    "AddressMoreThan20PrefixedBy0" : {
+        "rlp" : "0xf867367b8203e89c0000000000000000095e7baea6a6c7c4c2dfeb977efac326af552d870b121ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a0efffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
+    },
     "EmptyTransaction" : {
         "rlp" : "0xf85d80808094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a0efffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804",
         "sender" : "3e2ddf4fea89f584a735a1234cf20d8627421564",
@@ -47,36 +50,6 @@
             "value" : ""
         }
     },
-    "RLPElementsWithZeros" : {
-        "rlp" : "0xf8662c538203e894095e7baea6a6c7c4c2dfeb977efac326af552d870987000000112223331ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a0efffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804",
-        "sender" : "f8cf3e78f097103c068225ce61e34f29078191a5",
-        "transaction" : {
-            "data" : "0x0000011222333",
-            "gasLimit" : "1000",
-            "gasPrice" : "00123",
-            "nonce" : "0054",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0xefffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "v" : "27",
-            "value" : "00000011"
-        }
-    },
-    "RLPWrongHexElements" : {
-        "rlp" : "0xf864367b8203e894095e7baea6a6c7c4c2dfeb977efac326af552d870b8500000000121ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a0efffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804",
-        "sender" : "65959aab09090881850fd56f8a1cacb3abc4e811",
-        "transaction" : {
-            "data" : "0x0000000012",
-            "gasLimit" : "1000",
-            "gasPrice" : "123",
-            "nonce" : "54",
-            "r" : "0x0048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x00efffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "v" : "27",
-            "value" : "11"
-        }
-    },
     "RightVRSTest" : {
         "rlp" : "0xf86103018207d094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a8255441ca098ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4aa08887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3",
         "sender" : "5ba306ae3650c72c3586da6f1dbac3c9fa7e529e",
@@ -147,21 +120,39 @@
     "TransactionWithTooManyRLPElements" : {
         "rlp" : "0xf865800182035294095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a0efffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804851de98d0edd"
     },
-    "WrongAddress" : {
-        "rlp" : "0xf85d80808094095e7baea6a6c7c4c2dfeb977efac326af552d0080801ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a0efffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804",
-        "sender" : "eec5140a6015e75ac27053d81fc431c877958708",
+    "ValuesAsDec" : {
+        "rlp" : "0xf86a830ffdc50183adc05394b94f5374fce5edbc8e2a8697c15331677e6ebf0b870ffdc5fffdc12c801ca098ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4aa08887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3",
+        "sender" : "3eb583df408b324b4ba3a8d63e6b2dba1c4f28f6",
         "transaction" : {
             "data" : "",
-            "gasLimit" : "",
-            "gasPrice" : "",
-            "nonce" : "",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0xefffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d8v",
-            "v" : "27",
-            "value" : ""
+            "gasLimit" : "11386963",
+            "gasPrice" : "1",
+            "nonce" : "1048005",
+            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
+            "s" : "0x8887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "v" : "28",
+            "value" : "4501151495864620"
         }
     },
+    "ValuesAsHex" : {
+        "rlp" : "0xf867830ffdc50183adc05394b94f5374fce5edbc8e2a8697c15331677e6ebf0b84fffdc12c801ca098ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4aa08887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3",
+        "sender" : "24ef2c911b7b98e481e4c97c201194ee7889501b",
+        "transaction" : {
+            "data" : "",
+            "gasLimit" : "0xadc053",
+            "gasPrice" : "1",
+            "nonce" : "0xffdc5",
+            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
+            "s" : "0x8887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "v" : "28",
+            "value" : "0xfffdc12c"
+        }
+    },
+    "WrongVRSTestIncorrectSize" : {
+        "rlp" : "0xf86380018207d094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca298ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a02c3a28887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a302c3"
+    },
     "WrongVRSTestVge31" : {
         "rlp" : "0xf85f80018207d094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801fa098ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4aa08887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
     },
diff --git a/VMTests/RandomTests/201502161815PYTHON.json b/VMTests/RandomTests/201502161815PYTHON.json
new file mode 100644
index 000000000..72d1240b1
--- /dev/null
+++ b/VMTests/RandomTests/201502161815PYTHON.json
@@ -0,0 +1,31 @@
+{
+    "randomVMtest" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
+            "currentGasLimit" : "1000000",
+            "currentNumber" : "300",
+            "currentTimestamp" : "2",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "code" : "0xf1414243444541449d7c55a1",
+            "data" : "0x",
+            "gas" : "10000",
+            "gasPrice" : "100000000000000",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0xf1414243444541449d7c55a1",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
diff --git a/VMTests/vmSha3Test.json b/VMTests/vmSha3Test.json
index 7a054cf89..dacaadb01 100644
--- a/VMTests/vmSha3Test.json
+++ b/VMTests/vmSha3Test.json
@@ -300,7 +300,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "115792089237316195423570985008687907853269984665640564039457584007913129639935"
         },
-        "gas" : "4026006204",
+        "gas" : "4294442684",
         "logs" : [
         ],
         "out" : "0x",
@@ -419,7 +419,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "115792089237316195423570985008687907853269984665640564039457584007913129639935"
         },
-        "gas" : "4294966940",
+        "gas" : "4294966941",
         "logs" : [
         ],
         "out" : "0x",
@@ -509,7 +509,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "115792089237316195423570985008687907853269984665640564039457584007913129639935"
         },
-        "gas" : "4294966939",
+        "gas" : "4294966940",
         "logs" : [
         ],
         "out" : "0x",
@@ -554,7 +554,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "115792089237316195423570985008687907853269984665640564039457584007913129639935"
         },
-        "gas" : "4294966907",
+        "gas" : "4294966910",
         "logs" : [
         ],
         "out" : "0x",
@@ -599,7 +599,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "115792089237316195423570985008687907853269984665640564039457584007913129639935"
         },
-        "gas" : "4294966905",
+        "gas" : "4294966909",
         "logs" : [
         ],
         "out" : "0x",
@@ -644,7 +644,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "115792089237316195423570985008687907853269984665640564039457584007913129639935"
         },
-        "gas" : "4294966905",
+        "gas" : "4294966909",
         "logs" : [
         ],
         "out" : "0x",
@@ -689,7 +689,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "115792089237316195423570985008687907853269984665640564039457584007913129639935"
         },
-        "gas" : "4294966904",
+        "gas" : "4294966908",
         "logs" : [
         ],
         "out" : "0x",