Merge branch 'mac_fixes' into new_jsonrpc

Conflicts:
	libethcore/CommonJS.h
	libweb3jsonrpc/WebThreeStubServerBase.cpp
	libweb3jsonrpc/WebThreeStubServerBase.h
	libweb3jsonrpc/abstractwebthreestubserver.h
	libweb3jsonrpc/spec.json

45 files changed, 3872 insertions, 2788 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ddfdb40..292f62a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,7 +26,7 @@ target_link_libraries(testeth ethereum)
 target_link_libraries(testeth ethcore)
 target_link_libraries(testeth secp256k1)
 target_link_libraries(testeth solidity)
-if (NOT HEADLESS)
+if (NOT HEADLESS AND NOT JUSTTESTS)
 	target_link_libraries(testeth webthree)
 	target_link_libraries(testeth natspec)
 endif()
diff --git a/MemTrie.cpp b/MemTrie.cpp
index c3a44e1e..ab5a13b6 100644
--- a/MemTrie.cpp
+++ b/MemTrie.cpp
@@ -23,7 +23,7 @@
 
 #include <libdevcrypto/TrieCommon.h>
 #include <libdevcrypto/SHA3.h>
-#include <libethcore/CommonEth.h>
+#include <libethcore/Common.h>
 using namespace std;
 using namespace dev;
 using namespace dev::eth;
diff --git a/SolidityEndToEndTest.cpp b/SolidityEndToEndTest.cpp
index 0b3836ad..dae0ca03 100644
--- a/SolidityEndToEndTest.cpp
+++ b/SolidityEndToEndTest.cpp
@@ -2949,6 +2949,65 @@ BOOST_AUTO_TEST_CASE(array_copy_storage_storage_struct)
 	BOOST_CHECK(m_state.storage(m_contractAddress).empty());
 }
 
+BOOST_AUTO_TEST_CASE(external_array_args)
+{
+	char const* sourceCode = R"(
+		contract c {
+			function test(uint[8] a, uint[] b, uint[5] c, uint a_index, uint b_index, uint c_index)
+					external returns (uint av, uint bv, uint cv) {
+				av = a[a_index];
+				bv = b[b_index];
+				cv = c[c_index];
+			}
+		}
+	)";
+	compileAndRun(sourceCode);
+	bytes params = encodeArgs(
+		1, 2, 3, 4, 5, 6, 7, 8, // a
+		3, // b.length
+		21, 22, 23, 24, 25, // c
+		0, 1, 2, // (a,b,c)_index
+		11, 12, 13 // b
+		);
+	BOOST_CHECK(callContractFunction("test(uint256[8],uint256[],uint256[5],uint256,uint256,uint256)", params) == encodeArgs(1, 12, 23));
+}
+
+BOOST_AUTO_TEST_CASE(bytes_index_access)
+{
+	char const* sourceCode = R"(
+		contract c {
+			bytes data;
+			function direct(bytes arg, uint index) external returns (uint) {
+				return uint(arg[index]);
+			}
+			function storageCopyRead(bytes arg, uint index) external returns (uint) {
+				data = arg;
+				return uint(data[index]);
+			}
+			function storageWrite() external returns (uint) {
+				data.length = 35;
+				data[31] = 0x77;
+				data[32] = 0x14;
+
+				data[31] = 1;
+				data[31] |= 8;
+				data[30] = 1;
+				data[32] = 3;
+				return uint(data[30]) * 0x100 | uint(data[31]) * 0x10 | uint(data[32]);
+			}
+		}
+	)";
+	compileAndRun(sourceCode);
+	string array{
+		0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+		10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+		20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+		30, 31, 32, 33};
+	BOOST_CHECK(callContractFunction("direct(bytes,uint256)", u256(array.length()), 32, array) == encodeArgs(32));
+	BOOST_CHECK(callContractFunction("storageCopyRead(bytes,uint256)", u256(array.length()), 32, array) == encodeArgs(32));
+	BOOST_CHECK(callContractFunction("storageWrite()") == encodeArgs(0x193));
+}
+
 BOOST_AUTO_TEST_CASE(pass_dynamic_arguments_to_the_base)
 {
 	char const* sourceCode = R"(
diff --git a/SolidityScanner.cpp b/SolidityScanner.cpp
index 2e4e5db0..8d3e5392 100644
--- a/SolidityScanner.cpp
+++ b/SolidityScanner.cpp
@@ -264,6 +264,23 @@ BOOST_AUTO_TEST_CASE(ether_subdenominations)
 	BOOST_CHECK_EQUAL(scanner.next(), Token::SubEther);
 }
 
+BOOST_AUTO_TEST_CASE(time_subdenominations)
+{
+	Scanner scanner(CharStream("seconds minutes hours days weeks years"));
+	BOOST_CHECK_EQUAL(scanner.getCurrentToken(), Token::SubSecond);
+	BOOST_CHECK_EQUAL(scanner.next(), Token::SubMinute);
+	BOOST_CHECK_EQUAL(scanner.next(), Token::SubHour);
+	BOOST_CHECK_EQUAL(scanner.next(), Token::SubDay);
+	BOOST_CHECK_EQUAL(scanner.next(), Token::SubWeek);
+	BOOST_CHECK_EQUAL(scanner.next(), Token::SubYear);
+}
+
+BOOST_AUTO_TEST_CASE(time_after)
+{
+	Scanner scanner(CharStream("after 1"));
+	BOOST_CHECK_EQUAL(scanner.getCurrentToken(), Token::After);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 }
diff --git a/TestHelper.cpp b/TestHelper.cpp
index 82add295..befd571e 100644
--- a/TestHelper.cpp
+++ b/TestHelper.cpp
@@ -69,7 +69,7 @@ namespace test
 struct ValueTooLarge: virtual Exception {};
 bigint const c_max256plus1 = bigint(1) << 256;
 
-ImportTest::ImportTest(json_spirit::mObject& _o, bool isFiller): m_TestObject(_o)
+ImportTest::ImportTest(json_spirit::mObject& _o, bool isFiller) : m_statePre(Address(_o["env"].get_obj()["currentCoinbase"].get_str()), OverlayDB(), eth::BaseState::Empty),  m_statePost(Address(_o["env"].get_obj()["currentCoinbase"].get_str()), OverlayDB(), eth::BaseState::Empty), m_TestObject(_o)
 {
 	importEnv(_o["env"].get_obj());
 	importState(_o["pre"].get_obj(), m_statePre);
@@ -183,13 +183,8 @@ void ImportTest::exportTest(bytes const& _output, State const& _statePost)
 	// export post state
 	json_spirit::mObject postState;
 
-	std::map<Address, Account> genesis = genesisState();
-
 	for (auto const& a: _statePost.addresses())
 	{
-		if (genesis.count(a.first))
-			continue;
-
 		json_spirit::mObject o;
 		o["balance"] = toString(_statePost.balance(a.first));
 		o["nonce"] = toString(_statePost.transactionsFrom(a.first));
@@ -205,14 +200,13 @@ void ImportTest::exportTest(bytes const& _output, State const& _statePost)
 	}
 	m_TestObject["post"] = json_spirit::mValue(postState);
 
+	m_TestObject["postStateRoot"] = toHex(_statePost.rootHash().asBytes());
+
 	// export pre state
 	json_spirit::mObject preState;
 
 	for (auto const& a: m_statePre.addresses())
 	{
-		if (genesis.count(a.first))
-			continue;
-
 		json_spirit::mObject o;
 		o["balance"] = toString(m_statePre.balance(a.first));
 		o["nonce"] = toString(m_statePre.transactionsFrom(a.first));
diff --git a/TestHelper.h b/TestHelper.h
index 6f9143c5..849f822b 100644
--- a/TestHelper.h
+++ b/TestHelper.h
@@ -47,9 +47,8 @@ namespace test
 class ImportTest
 {
 public:
-	ImportTest(json_spirit::mObject& _o) : m_TestObject(_o) {}
+	ImportTest(json_spirit::mObject& _o) : m_statePre(Address(), OverlayDB(), eth::BaseState::Empty),  m_statePost(Address(), OverlayDB(), eth::BaseState::Empty), m_TestObject(_o) {}
 	ImportTest(json_spirit::mObject& _o, bool isFiller);
-
 	// imports
 	void importEnv(json_spirit::mObject& _o);
 	void importState(json_spirit::mObject& _o, eth::State& _state);
diff --git a/TrieHash.cpp b/TrieHash.cpp
index ee4f2e87..ccf12c16 100644
--- a/TrieHash.cpp
+++ b/TrieHash.cpp
@@ -23,7 +23,7 @@
 
 #include <libdevcrypto/TrieCommon.h>
 #include <libdevcrypto/SHA3.h>
-#include <libethcore/CommonEth.h>
+#include <libethcore/Common.h>
 using namespace std;
 using namespace dev;
 using namespace dev::eth;
diff --git a/bcBlockChainTestFiller.json b/bcBlockChainTestFiller.json
new file mode 100644
index 00000000..b149f593
--- /dev/null
+++ b/bcBlockChainTestFiller.json
@@ -0,0 +1,62 @@
+{
+    "minDifficulty" : {
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "100000000",
+            "gasUsed" : "0",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x54c98c81",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "10000000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            }
+        },
+        "blocks" : [
+            {
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "80000050",
+                        "gasPrice" : "1",
+                        "nonce" : "0",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "10"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            },
+            {
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "8000000",
+                        "gasPrice" : "0",
+                        "nonce" : "1",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "10"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ]
+    }
+}
diff --git a/bcInvalidHeaderTestFiller.json b/bcInvalidHeaderTestFiller.json
new file mode 100644
index 00000000..39a91a58
--- /dev/null
+++ b/bcInvalidHeaderTestFiller.json
@@ -0,0 +1,774 @@
+{
+    "log1_wrongBlockNumber" : {
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "125000",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "10000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            },
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "100",
+                "nonce" : "0",
+                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
+                "storage": {}
+            }
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                            "number" : "2"
+                        },
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "50000",
+                        "gasPrice" : "10",
+                        "nonce" : "0",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "5000000000"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ]
+    },
+
+    "log1_wrongBloom" : {
+
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "125000",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "10000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            },
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "100",
+                "nonce" : "0",
+                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
+                "storage": {}
+            }
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+                        },
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "50000",
+                        "gasPrice" : "10",
+                        "nonce" : "0",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "5000000000"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ]
+    },
+
+    "wrongCoinbase" : {
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "125000",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "10000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            },
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "100",
+                "nonce" : "0",
+                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
+                "storage": {}
+            }
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1"
+                        },
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "50000",
+                        "gasPrice" : "10",
+                        "nonce" : "0",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "5000000000"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ]
+    },
+
+    "wrongDifficulty" : {
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "125000",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "10000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            },
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "100",
+                "nonce" : "0",
+                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
+                "storage": {}
+            }
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                            "difficulty" : "10000"
+                        },
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "50000",
+                        "gasPrice" : "10",
+                        "nonce" : "0",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "5000000000"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ]
+    },
+
+    "DifferentExtraData" : {
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "125000",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "10000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            },
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "100",
+                "nonce" : "0",
+                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
+                "storage": {}
+            }
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                            "extraData" : "0x42"
+                        },
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "50000",
+                        "gasPrice" : "10",
+                        "nonce" : "0",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "5000000000"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ]
+    },
+
+    "wrongGasLimit" : {
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "125000",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "10000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            },
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "100",
+                "nonce" : "0",
+                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
+                "storage": {}
+            }
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                            "gasLimit" : "100000"
+                        },
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "50000",
+                        "gasPrice" : "10",
+                        "nonce" : "0",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "5000000000"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+
+        ]
+    },
+
+    "wrongGasUsed" : {
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "125000",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "10000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            },
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "100",
+                "nonce" : "0",
+                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
+                "storage": {}
+            }
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                            "gasUsed" : "0"
+                        },
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "50000",
+                        "gasPrice" : "10",
+                        "nonce" : "0",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "5000000000"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ]
+    },
+
+    "wrongNumber" : {
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "125000",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "10000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            },
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "100",
+                "nonce" : "0",
+                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
+                "storage": {}
+            }
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                            "number" : "0"
+                        },
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "50000",
+                        "gasPrice" : "10",
+                        "nonce" : "0",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "5000000000"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ]
+    },
+
+    "wrongParentHash" : {
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "125000",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "10000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            },
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "100",
+                "nonce" : "0",
+                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
+                "storage": {}
+            }
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000"
+                        },
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "50000",
+                        "gasPrice" : "10",
+                        "nonce" : "0",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "5000000000"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ]
+    },
+
+    "wrongReceiptTrie" : {        
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "125000",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "10000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            },
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "100",
+                "nonce" : "0",
+                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
+                "storage": {}
+            }
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
+                        },
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "50000",
+                        "gasPrice" : "10",
+                        "nonce" : "0",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "5000000000"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ]
+    },
+
+    "wrongStateRoot" : {
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "125000",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "10000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            },
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "100",
+                "nonce" : "0",
+                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
+                "storage": {}
+            }
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a"
+                        },
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "50000",
+                        "gasPrice" : "10",
+                        "nonce" : "0",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "5000000000"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ]
+    },
+
+    "wrongTimestamp" : {
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "125000",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "10000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            },
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "100",
+                "nonce" : "0",
+                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
+                "storage": {}
+            }
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                            "timestamp" : "0x54c98c80"
+                        },
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "50000",
+                        "gasPrice" : "10",
+                        "nonce" : "0",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "5000000000"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ]
+    },
+
+    "wrongTransactionsTrie" : {        
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "125000",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "10000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            },
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "100",
+                "nonce" : "0",
+                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
+                "storage": {}
+            }
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                            "transactionsTrie" : "0x55e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
+                        },
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "50000",
+                        "gasPrice" : "10",
+                        "nonce" : "0",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "5000000000"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ]
+    },
+
+    "wrongUncleHash" : {
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "125000",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "10000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            },
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "100",
+                "nonce" : "0",
+                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
+                "storage": {}
+            }
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                            "uncleHash" : "0x0dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                        },
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "50000",
+                        "gasPrice" : "10",
+                        "nonce" : "0",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "5000000000"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ]
+    }
+}
diff --git a/bcUncleTestFiller.json b/bcUncleTestFiller.json
new file mode 100644
index 00000000..639051f2
--- /dev/null
+++ b/bcUncleTestFiller.json
@@ -0,0 +1,539 @@
+{
+    "uncleHeaderAtBlock2" : {
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "100000000",
+            "gasUsed" : "0",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x54c98c81",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "10000000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            }
+        },
+        "blocks" : [
+            {
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "80000050",
+                        "gasPrice" : "1",
+                        "nonce" : "0",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "10"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            },
+            {
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "80000050",
+                        "gasPrice" : "1",
+                        "nonce" : "1",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "10"
+                    }
+                ],
+                "uncleHeaders" : [
+                    {
+                        "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "coinbase" : "0000000000000000000000000000000000000000",
+                        "difficulty" : "131072",
+                        "extraData" : "0x",
+                        "gasLimit" : "99902343",
+                        "gasUsed" : "0",
+                        "hash" : "9de9879b6a81d1b6c4993c63c90a3c9d1e775f14572694778e828bc64972ae04",
+                        "mixHash" : "b557f905d29ed0fca99d65d0adcce698dee97cf72a13c7cd8d7a7826b8eee770",
+                        "nonce" : "18a524c1790fa83b",
+                        "number" : "1",
+                        "parentHash" : "6134fc6b5d99ee03c4aab1592640f6f9dcbc850668d75d631aee34989b938fae",
+                        "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                        "seedHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+                        "stateRoot" : "ff640b30d613c35dad43e3693329e1b1ee6350f989cf46a288025a1cbfdab9cd",
+                        "timestamp" : "0x54c98c82",
+                        "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                        "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    }
+                ]
+            }
+        ]
+    },
+
+    "oneUncle" : {
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "100000000",
+            "gasUsed" : "0",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x54c98c81",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "10000000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            }
+        },
+        "blocks" : [
+            {
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "80000050",
+                        "gasPrice" : "1",
+                        "nonce" : "0",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "10"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            },
+            {
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "80000050",
+                        "gasPrice" : "1",
+                        "nonce" : "1",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "10"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            },
+            {
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "80000050",
+                        "gasPrice" : "1",
+                        "nonce" : "2",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "10"
+                    }
+                ],
+                "uncleHeaders" : [
+                    {
+                        "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "coinbase" : "0000000000000000000000000000000000000000",
+                        "difficulty" : "131072",
+                        "extraData" : "0x",
+                        "gasLimit" : "99902343",
+                        "gasUsed" : "0",
+                        "hash" : "9de9879b6a81d1b6c4993c63c90a3c9d1e775f14572694778e828bc64972ae04",
+                        "mixHash" : "b557f905d29ed0fca99d65d0adcce698dee97cf72a13c7cd8d7a7826b8eee770",
+                        "nonce" : "18a524c1790fa83b",
+                        "number" : "2",
+                        "parentHash" : "6134fc6b5d99ee03c4aab1592640f6f9dcbc850668d75d631aee34989b938fae",
+                        "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                        "seedHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+                        "stateRoot" : "ff640b30d613c35dad43e3693329e1b1ee6350f989cf46a288025a1cbfdab9cd",
+                        "timestamp" : "0x54c98c82",
+                        "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                        "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    }
+                ]
+            }
+        ]
+    },
+
+    "twoEqualUncle" : {
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "100000000",
+            "gasUsed" : "0",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x54c98c81",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "10000000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            }
+        },
+        "blocks" : [
+            {
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "80000050",
+                        "gasPrice" : "1",
+                        "nonce" : "0",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "10"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            },
+            {
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "80000050",
+                        "gasPrice" : "1",
+                        "nonce" : "1",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "10"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            },
+            {
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "80000050",
+                        "gasPrice" : "1",
+                        "nonce" : "2",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "10"
+                    }
+                ],
+                "uncleHeaders" : [
+                    {
+                        "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "coinbase" : "0000000000000000000000000000000000000000",
+                        "difficulty" : "131072",
+                        "extraData" : "0x",
+                        "gasLimit" : "99902343",
+                        "gasUsed" : "0",
+                        "hash" : "9de9879b6a81d1b6c4993c63c90a3c9d1e775f14572694778e828bc64972ae04",
+                        "mixHash" : "b557f905d29ed0fca99d65d0adcce698dee97cf72a13c7cd8d7a7826b8eee770",
+                        "nonce" : "18a524c1790fa83b",
+                        "number" : "2",
+                        "parentHash" : "6134fc6b5d99ee03c4aab1592640f6f9dcbc850668d75d631aee34989b938fae",
+                        "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                        "seedHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+                        "stateRoot" : "ff640b30d613c35dad43e3693329e1b1ee6350f989cf46a288025a1cbfdab9cd",
+                        "timestamp" : "0x54c98c82",
+                        "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                        "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    },
+                    {
+                        "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "coinbase" : "0000000000000000000000000000000000000000",
+                        "difficulty" : "131072",
+                        "extraData" : "0x",
+                        "gasLimit" : "99902343",
+                        "gasUsed" : "0",
+                        "hash" : "9de9879b6a81d1b6c4993c63c90a3c9d1e775f14572694778e828bc64972ae04",
+                        "mixHash" : "b557f905d29ed0fca99d65d0adcce698dee97cf72a13c7cd8d7a7826b8eee770",
+                        "nonce" : "18a524c1790fa83b",
+                        "number" : "2",
+                        "parentHash" : "6134fc6b5d99ee03c4aab1592640f6f9dcbc850668d75d631aee34989b938fae",
+                        "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                        "seedHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+                        "stateRoot" : "ff640b30d613c35dad43e3693329e1b1ee6350f989cf46a288025a1cbfdab9cd",
+                        "timestamp" : "0x54c98c82",
+                        "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                        "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    }
+                ]
+            }
+        ]
+    },
+
+    "twoUncle" : {
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "100000000",
+            "gasUsed" : "0",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x54c98c81",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "10000000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            }
+        },
+        "blocks" : [
+            {
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "80000050",
+                        "gasPrice" : "1",
+                        "nonce" : "0",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "10"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            },
+            {
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "80000050",
+                        "gasPrice" : "1",
+                        "nonce" : "1",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "10"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            },
+            {
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "80000050",
+                        "gasPrice" : "1",
+                        "nonce" : "2",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "10"
+                    }
+                ],
+                "uncleHeaders" : [
+                    {
+                        "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "coinbase" : "0000000000000000000000000000000000000000",
+                        "difficulty" : "131072",
+                        "extraData" : "0x",
+                        "gasLimit" : "99902343",
+                        "gasUsed" : "0",
+                        "hash" : "9de9879b6a81d1b6c4993c63c90a3c9d1e775f14572694778e828bc64972ae04",
+                        "mixHash" : "b557f905d29ed0fca99d65d0adcce698dee97cf72a13c7cd8d7a7826b8eee770",
+                        "nonce" : "18a524c1790fa83b",
+                        "number" : "2",
+                        "parentHash" : "6134fc6b5d99ee03c4aab1592640f6f9dcbc850668d75d631aee34989b938fae",
+                        "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                        "seedHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+                        "stateRoot" : "ff640b30d613c35dad43e3693329e1b1ee6350f989cf46a288025a1cbfdab9cd",
+                        "timestamp" : "0x54c98c82",
+                        "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                        "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    },
+                    {
+                        "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "coinbase" : "0000000000000000000000000000000000000000",
+                        "difficulty" : "131072",
+                        "extraData" : "0x",
+                        "gasLimit" : "99902343",
+                        "gasUsed" : "0",
+                        "hash" : "9de9879b6a81d1b6c4993c63c90a3c9d1e775f14572694778e828bc64972ae04",
+                        "mixHash" : "b55af905d29ed0fca99d65d0adcce698dee97cf72a13c7cd8d7a7826b8eee770",
+                        "nonce" : "18a524c1790fa83b",
+                        "number" : "2",
+                        "parentHash" : "6134fc6b5d99ee03c4aab1592640f6f9dcbc850668d75d631aee34989b938fae",
+                        "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                        "seedHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+                        "stateRoot" : "ff640b30d613c35dad43e3693329e1b1ee6350f989cf46a288025a1cbfdab9cd",
+                        "timestamp" : "0x54c98c82",
+                        "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                        "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    }
+                ]
+            }
+        ]
+    },
+
+    "threeUncle" : {
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "100000000",
+            "gasUsed" : "0",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x54c98c81",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "10000000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            }
+        },
+        "blocks" : [
+            {
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "80000050",
+                        "gasPrice" : "1",
+                        "nonce" : "0",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "10"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            },
+            {
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "80000050",
+                        "gasPrice" : "1",
+                        "nonce" : "1",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "10"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            },
+            {
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "80000050",
+                        "gasPrice" : "1",
+                        "nonce" : "2",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "10"
+                    }
+                ],
+                "uncleHeaders" : [
+                    {
+                        "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "coinbase" : "0000000000000000000000000000000000000000",
+                        "difficulty" : "131072",
+                        "extraData" : "0x",
+                        "gasLimit" : "99902343",
+                        "gasUsed" : "0",
+                        "hash" : "9de9879b6a81d1b6c4993c63c90a3c9d1e775f14572694778e828bc64972ae04",
+                        "mixHash" : "b557f905d29ed0fca99d65d0adcce698dee97cf72a13c7cd8d7a7826b8eee770",
+                        "nonce" : "18a524c1790fa83b",
+                        "number" : "2",
+                        "parentHash" : "6134fc6b5d99ee03c4aab1592640f6f9dcbc850668d75d631aee34989b938fae",
+                        "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                        "seedHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+                        "stateRoot" : "ff640b30d613c35dad43e3693329e1b1ee6350f989cf46a288025a1cbfdab9cd",
+                        "timestamp" : "0x54c98c82",
+                        "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                        "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    },
+                    {
+                        "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "coinbase" : "0000000000000000000000000000000000000000",
+                        "difficulty" : "131072",
+                        "extraData" : "0x",
+                        "gasLimit" : "99902343",
+                        "gasUsed" : "0",
+                        "hash" : "9de9879b6a81d1b6c4993c63c90a3c9d1e775f14572694778e828bc64972ae04",
+                        "mixHash" : "b55af905d29ed0fca99d65d0adcce698dee97cf72a13c7cd8d7a7826b8eee770",
+                        "nonce" : "18a524c1790fa83b",
+                        "number" : "2",
+                        "parentHash" : "6134fc6b5d99ee03c4aab1592640f6f9dcbc850668d75d631aee34989b938fae",
+                        "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                        "seedHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+                        "stateRoot" : "ff640b30d613c35dad43e3693329e1b1ee6350f989cf46a288025a1cbfdab9cd",
+                        "timestamp" : "0x54c98c82",
+                        "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                        "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    },
+                    {
+                        "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "coinbase" : "0000000000000000000000000000000000000000",
+                        "difficulty" : "131072",
+                        "extraData" : "0x",
+                        "gasLimit" : "99902343",
+                        "gasUsed" : "0",
+                        "hash" : "9de9879b6a81d1b6c4993c63c90a3c9d1e775f14572694778e828bc64972ae04",
+                        "mixHash" : "a55af905d29ed0fca99d65d0adcce698dee97cf72a13c7cd8d7a7826b8eee770",
+                        "nonce" : "18a524c1790fa83b",
+                        "number" : "2",
+                        "parentHash" : "6134fc6b5d99ee03c4aab1592640f6f9dcbc850668d75d631aee34989b938fae",
+                        "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                        "seedHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+                        "stateRoot" : "ff640b30d613c35dad43e3693329e1b1ee6350f989cf46a288025a1cbfdab9cd",
+                        "timestamp" : "0x54c98c82",
+                        "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                        "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    }
+                ]
+            }
+        ]
+    }
+
+
+}
diff --git a/bcValidBlockTestFiller.json b/bcValidBlockTestFiller.json
new file mode 100644
index 00000000..14d4cfb2
--- /dev/null
+++ b/bcValidBlockTestFiller.json
@@ -0,0 +1,397 @@
+{
+
+    "diff1024" : {
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "125000",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "10000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            }
+        },
+        "blocks" : [
+            {
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "85000",
+                        "gasPrice" : "1",
+                        "nonce" : "0",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "10"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ]
+
+    },
+
+    "gasPrice0" : {
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "125000",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "10000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            }
+        },
+        "blocks" : [
+            {
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "85000",
+                        "gasPrice" : "0",
+                        "nonce" : "0",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "10"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ]
+    },
+
+    "gasLimitTooHigh" : {
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "125000",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "10000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            }
+        },
+        "blocks" : [
+            {
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "1000001",
+                        "gasPrice" : "0",
+                        "nonce" : "0",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ]
+    },
+
+    "SimpleTx" : {
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "125000",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "10000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            }
+        },
+        "blocks" : [
+            {
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "50000",
+                        "gasPrice" : "10",
+                        "nonce" : "0",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "10"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ]
+    },
+
+    "txOrder" : {
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "125000",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "10000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            }
+        },
+        "blocks" : [
+            {
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "50000",
+                        "gasPrice" : "10",
+                        "nonce" : "0",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "7000000000"
+                    },
+                    {
+                        "data" : "",
+                        "gasLimit" : "50000",
+                        "gasPrice" : "10",
+                        "nonce" : "0",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "8000000000"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ]
+    },
+
+    "txEqualValue" : {
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "125000",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "10000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            }
+        },
+        "blocks" : [
+            {
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "50000",
+                        "gasPrice" : "10",
+                        "nonce" : "0",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "5000000000"
+                    },
+                    {
+                        "data" : "",
+                        "gasLimit" : "50000",
+                        "gasPrice" : "9",
+                        "nonce" : "0",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "5000000000"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ]
+    },
+
+    "log1_correct" : {
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "125000",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "10000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            },
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "100",
+                "nonce" : "0",
+                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
+                "storage": {}
+            }
+        },
+        "blocks" : [
+            {
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "50000",
+                        "gasPrice" : "10",
+                        "nonce" : "0",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "value" : "5000000000"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ]
+    },
+
+    "dataTx" : {
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "125000",
+            "gasUsed" : "100",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0xefb4db878627027c81b3bb1c7dd3a18dae3914a49cdd24a3e40ab3bbfbb240c5",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "10000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            }
+        },
+        "blocks" : [
+            {
+                "transactions" : [
+                    {
+                        "data" : "0x60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b56",
+                        "gasLimit" : "50000",
+                        "gasPrice" : "50",
+                        "nonce" : "0",
+                        "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+                        "to" : "",
+                        "value" : ""
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ]
+    }
+}
+
+
diff --git a/blInvalidHeaderTestFiller.json b/blInvalidHeaderTestFiller.json
deleted file mode 100644
index 482eafc5..00000000
--- a/blInvalidHeaderTestFiller.json
+++ /dev/null
@@ -1,687 +0,0 @@
-{
-    "log1_wrongBlockNumber" : {
-        "blockHeader" : {
-                    "number" : "2"
-                },
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
-            "difficulty" : "10000",
-            "extraData" : "42",
-            "gasLimit" : "100000",
-            "gasUsed" : "0",
-            "nonce" : "0x498e88f5c14b0b60d6e14ce9c6cc958cbe16a1df8dd90210e50d2d77562a348d",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x54c98c81",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000000000",
-                "nonce" : "0",
-                "code" : "",
-                "storage": {}
-            },
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "100",
-                "nonce" : "0",
-                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
-                "storage": {}
-            }
-        },
-        "transactions" : [
-            {
-                "data" : "",
-                "gasLimit" : "5000",
-                "gasPrice" : "10",
-                "nonce" : "0",
-                "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-                "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                "value" : "5000000000"
-            }
-        ],
-        "uncleHeaders" : [
-        ]
-    },
-
-    "log1_wrongBloom" : {
-        "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-                },
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
-            "difficulty" : "10000",
-            "extraData" : "42",
-            "gasLimit" : "100000",
-            "gasUsed" : "0",
-            "nonce" : "0x498e88f5c14b0b60d6e14ce9c6cc958cbe16a1df8dd90210e50d2d77562a348d",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x54c98c81",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000000000",
-                "nonce" : "0",
-                "code" : "",
-                "storage": {}
-            },
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "100",
-                "nonce" : "0",
-                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
-                "storage": {}
-            }
-        },
-        "transactions" : [
-            {
-                "data" : "",
-                "gasLimit" : "5000",
-                "gasPrice" : "10",
-                "nonce" : "0",
-                "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-                "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                "value" : "5000000000"
-            }
-        ],
-        "uncleHeaders" : [
-        ]
-    },
-
-    "wrongCoinbase" : {
-        "blockHeader" : {
-                    "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1"
-                },
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
-            "difficulty" : "10000",
-            "extraData" : "42",
-            "gasLimit" : "100000",
-            "gasUsed" : "0",
-            "nonce" : "0x498e88f5c14b0b60d6e14ce9c6cc958cbe16a1df8dd90210e50d2d77562a348d",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x54c98c81",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000000000",
-                "nonce" : "0",
-                "code" : "",
-                "storage": {}
-            },
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "100",
-                "nonce" : "0",
-                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
-                "storage": {}
-            }
-        },
-        "transactions" : [
-            {
-                "data" : "",
-                "gasLimit" : "5000",
-                "gasPrice" : "10",
-                "nonce" : "0",
-                "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-                "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                "value" : "5000000000"
-            }
-        ],
-        "uncleHeaders" : [
-        ]
-    },
-
-    "wrongDifficulty" : {
-        "blockHeader" : {
-                    "difficulty" : "10000"
-                },
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
-            "difficulty" : "10000",
-            "extraData" : "42",
-            "gasLimit" : "100000",
-            "gasUsed" : "0",
-            "nonce" : "0x498e88f5c14b0b60d6e14ce9c6cc958cbe16a1df8dd90210e50d2d77562a348d",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x54c98c81",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000000000",
-                "nonce" : "0",
-                "code" : "",
-                "storage": {}
-            },
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "100",
-                "nonce" : "0",
-                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
-                "storage": {}
-            }
-        },
-        "transactions" : [
-            {
-                "data" : "",
-                "gasLimit" : "5000",
-                "gasPrice" : "10",
-                "nonce" : "0",
-                "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-                "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                "value" : "5000000000"
-            }
-        ],
-        "uncleHeaders" : [
-        ]
-    },
-
-    "DifferentExtraData" : {
-        "blockHeader" : {
-                    "extraData" : "42"
-                },
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
-            "difficulty" : "10000",
-            "extraData" : "42",
-            "gasLimit" : "100000",
-            "gasUsed" : "0",
-            "nonce" : "0x498e88f5c14b0b60d6e14ce9c6cc958cbe16a1df8dd90210e50d2d77562a348d",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x54c98c81",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000000000",
-                "nonce" : "0",
-                "code" : "",
-                "storage": {}
-            },
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "100",
-                "nonce" : "0",
-                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
-                "storage": {}
-            }
-        },
-        "transactions" : [
-            {
-                "data" : "",
-                "gasLimit" : "5000",
-                "gasPrice" : "10",
-                "nonce" : "0",
-                "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-                "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                "value" : "5000000000"
-            }
-        ],
-        "uncleHeaders" : [
-        ]
-    },
-
-    "wrongGasLimit" : {
-        "blockHeader" : {
-                    "gasLimit" : "100000"
-                },
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
-            "difficulty" : "10000",
-            "extraData" : "42",
-            "gasLimit" : "100000",
-            "gasUsed" : "0",
-            "nonce" : "0x498e88f5c14b0b60d6e14ce9c6cc958cbe16a1df8dd90210e50d2d77562a348d",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x54c98c81",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000000000",
-                "nonce" : "0",
-                "code" : "",
-                "storage": {}
-            },
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "100",
-                "nonce" : "0",
-                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
-                "storage": {}
-            }
-        },
-        "transactions" : [
-            {
-                "data" : "",
-                "gasLimit" : "5000",
-                "gasPrice" : "10",
-                "nonce" : "0",
-                "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-                "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                "value" : "5000000000"
-            }
-        ],
-        "uncleHeaders" : [
-        ]
-    },
-
-    "wrongGasUsed" : {
-        "blockHeader" : {
-                    "gasUsed" : "0"
-                },
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
-            "difficulty" : "10000",
-            "extraData" : "42",
-            "gasLimit" : "100000",
-            "gasUsed" : "0",
-            "nonce" : "0x498e88f5c14b0b60d6e14ce9c6cc958cbe16a1df8dd90210e50d2d77562a348d",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x54c98c81",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000000000",
-                "nonce" : "0",
-                "code" : "",
-                "storage": {}
-            },
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "100",
-                "nonce" : "0",
-                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
-                "storage": {}
-            }
-        },
-        "transactions" : [
-            {
-                "data" : "",
-                "gasLimit" : "5000",
-                "gasPrice" : "10",
-                "nonce" : "0",
-                "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-                "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                "value" : "5000000000"
-            }
-        ],
-        "uncleHeaders" : [
-        ]
-    },
-
-    "wrongNumber" : {
-        "blockHeader" : {
-                    "number" : "0"
-                },
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
-            "difficulty" : "10000",
-            "extraData" : "42",
-            "gasLimit" : "100000",
-            "gasUsed" : "0",
-            "nonce" : "0x498e88f5c14b0b60d6e14ce9c6cc958cbe16a1df8dd90210e50d2d77562a348d",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x54c98c81",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000000000",
-                "nonce" : "0",
-                "code" : "",
-                "storage": {}
-            },
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "100",
-                "nonce" : "0",
-                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
-                "storage": {}
-            }
-        },
-        "transactions" : [
-            {
-                "data" : "",
-                "gasLimit" : "5000",
-                "gasPrice" : "10",
-                "nonce" : "0",
-                "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-                "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                "value" : "5000000000"
-            }
-        ],
-        "uncleHeaders" : [
-        ]
-    },
-
-    "wrongParentHash" : {
-        "blockHeader" : {
-                    "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000"
-                },
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
-            "difficulty" : "10000",
-            "extraData" : "42",
-            "gasLimit" : "100000",
-            "gasUsed" : "0",
-            "nonce" : "0x498e88f5c14b0b60d6e14ce9c6cc958cbe16a1df8dd90210e50d2d77562a348d",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x54c98c81",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000000000",
-                "nonce" : "0",
-                "code" : "",
-                "storage": {}
-            },
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "100",
-                "nonce" : "0",
-                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
-                "storage": {}
-            }
-        },
-        "transactions" : [
-            {
-                "data" : "",
-                "gasLimit" : "5000",
-                "gasPrice" : "10",
-                "nonce" : "0",
-                "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-                "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                "value" : "5000000000"
-            }
-        ],
-        "uncleHeaders" : [
-        ]
-    },
-
-    "wrongReceiptTrie" : {
-        "blockHeader" : {
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
-                },
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
-            "difficulty" : "10000",
-            "extraData" : "42",
-            "gasLimit" : "100000",
-            "gasUsed" : "0",
-            "nonce" : "0x498e88f5c14b0b60d6e14ce9c6cc958cbe16a1df8dd90210e50d2d77562a348d",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x54c98c81",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000000000",
-                "nonce" : "0",
-                "code" : "",
-                "storage": {}
-            },
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "100",
-                "nonce" : "0",
-                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
-                "storage": {}
-            }
-        },
-        "transactions" : [
-            {
-                "data" : "",
-                "gasLimit" : "5000",
-                "gasPrice" : "10",
-                "nonce" : "0",
-                "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-                "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                "value" : "5000000000"
-            }
-        ],
-        "uncleHeaders" : [
-        ]
-    },
-
-    "wrongStateRoot" : {
-        "blockHeader" : {
-                    "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a"
-                },
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
-            "difficulty" : "10000",
-            "extraData" : "42",
-            "gasLimit" : "100000",
-            "gasUsed" : "0",
-            "nonce" : "0x498e88f5c14b0b60d6e14ce9c6cc958cbe16a1df8dd90210e50d2d77562a348d",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x54c98c81",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000000000",
-                "nonce" : "0",
-                "code" : "",
-                "storage": {}
-            },
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "100",
-                "nonce" : "0",
-                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
-                "storage": {}
-            }
-        },
-        "transactions" : [
-            {
-                "data" : "",
-                "gasLimit" : "5000",
-                "gasPrice" : "10",
-                "nonce" : "0",
-                "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-                "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                "value" : "5000000000"
-            }
-        ],
-        "uncleHeaders" : [
-        ]
-    },
-
-    "wrongTimestamp" : {
-        "blockHeader" : {
-                    "timestamp" : "0x54c98c80"
-                },
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
-            "difficulty" : "10000",
-            "extraData" : "42",
-            "gasLimit" : "100000",
-            "gasUsed" : "0",
-            "nonce" : "0x498e88f5c14b0b60d6e14ce9c6cc958cbe16a1df8dd90210e50d2d77562a348d",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x54c98c81",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000000000",
-                "nonce" : "0",
-                "code" : "",
-                "storage": {}
-            },
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "100",
-                "nonce" : "0",
-                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
-                "storage": {}
-            }
-        },
-        "transactions" : [
-            {
-                "data" : "",
-                "gasLimit" : "5000",
-                "gasPrice" : "10",
-                "nonce" : "0",
-                "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-                "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                "value" : "5000000000"
-            }
-        ],
-        "uncleHeaders" : [
-        ]
-    },
-
-    "wrongTransactionsTrie" : {
-        "blockHeader" : {
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
-                },
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
-            "difficulty" : "10000",
-            "extraData" : "42",
-            "gasLimit" : "100000",
-            "gasUsed" : "0",
-            "nonce" : "0x498e88f5c14b0b60d6e14ce9c6cc958cbe16a1df8dd90210e50d2d77562a348d",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x54c98c81",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000000000",
-                "nonce" : "0",
-                "code" : "",
-                "storage": {}
-            },
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "100",
-                "nonce" : "0",
-                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
-                "storage": {}
-            }
-        },
-        "transactions" : [
-            {
-                "data" : "",
-                "gasLimit" : "5000",
-                "gasPrice" : "10",
-                "nonce" : "0",
-                "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-                "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                "value" : "5000000000"
-            }
-        ],
-        "uncleHeaders" : [
-        ]
-    },
-
-    "wrongUncleHash" : {
-        "blockHeader" : {
-                    "uncleHash" : "0x0dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
-            "difficulty" : "10000",
-            "extraData" : "42",
-            "gasLimit" : "100000",
-            "gasUsed" : "0",
-            "nonce" : "0x498e88f5c14b0b60d6e14ce9c6cc958cbe16a1df8dd90210e50d2d77562a348d",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x54c98c81",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000000000",
-                "nonce" : "0",
-                "code" : "",
-                "storage": {}
-            },
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "100",
-                "nonce" : "0",
-                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
-                "storage": {}
-            }
-        },
-        "transactions" : [
-            {
-                "data" : "",
-                "gasLimit" : "5000",
-                "gasPrice" : "10",
-                "nonce" : "0",
-                "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-                "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                "value" : "5000000000"
-            }
-        ],
-        "uncleHeaders" : [
-        ]
-    }
-}
diff --git a/blValidBlockTestFiller.json b/blValidBlockTestFiller.json
deleted file mode 100644
index 8099c0dd..00000000
--- a/blValidBlockTestFiller.json
+++ /dev/null
@@ -1,381 +0,0 @@
-{
-    "diffTooLowToChange" : {
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
-            "difficulty" : "1023",
-            "extraData" : "42",
-            "gasLimit" : "100000",
-            "gasUsed" : "0",
-            "nonce" : "0x498e88f5c14b0b60d6e14ce9c6cc958cbe16a1df8dd90210e50d2d77562a348d",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x54c98c81",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000000000",
-                "nonce" : "0",
-                "code" : "",
-                "storage": {}
-            }
-        },
-        "transactions" : [
-            {
-                "data" : "",
-                "gasLimit" : "850",
-                "gasPrice" : "1",
-                "nonce" : "0",
-                "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-                "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                "value" : "10"
-            }
-        ],
-        "uncleHeaders" : [
-        ]
-    },
-
-    "diff1024" : {
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
-            "difficulty" : "1024",
-            "extraData" : "42",
-            "gasLimit" : "100000",
-            "gasUsed" : "0",
-            "nonce" : "0x498e88f5c14b0b60d6e14ce9c6cc958cbe16a1df8dd90210e50d2d77562a348d",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x54c98c81",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000000000",
-                "nonce" : "0",
-                "code" : "",
-                "storage": {}
-            }
-        },
-        "transactions" : [
-            {
-                "data" : "",
-                "gasLimit" : "850",
-                "gasPrice" : "1",
-                "nonce" : "0",
-                "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-                "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                "value" : "10"
-            }
-        ],
-        "uncleHeaders" : [
-        ]
-    },
-
-    "gasPrice0" : {
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
-            "difficulty" : "10000",
-            "extraData" : "42",
-            "gasLimit" : "100000",
-            "gasUsed" : "0",
-            "nonce" : "0x498e88f5c14b0b60d6e14ce9c6cc958cbe16a1df8dd90210e50d2d77562a348d",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x54c98c81",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000000000",
-                "nonce" : "0",
-                "code" : "",
-                "storage": {}
-            }
-        },
-        "transactions" : [
-            {
-                "data" : "",
-                "gasLimit" : "850",
-                "gasPrice" : "0",
-                "nonce" : "0",
-                "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-                "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                "value" : "10"
-            }
-        ],
-        "uncleHeaders" : [
-        ]
-    },
-
-    "gasLimitTooHigh" : {
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
-            "difficulty" : "10000",
-            "extraData" : "42",
-            "gasLimit" : "1000000",
-            "gasUsed" : "0",
-            "nonce" : "0x498e88f5c14b0b60d6e14ce9c6cc958cbe16a1df8dd90210e50d2d77562a348d",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x54c98c81",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000000000",
-                "nonce" : "0",
-                "code" : "",
-                "storage": {}
-            }
-        },
-        "transactions" : [
-            {
-                "data" : "",
-                "gasLimit" : "850",
-                "gasPrice" : "0",
-                "nonce" : "0",
-                "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-                "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                "value" : "10"
-            }
-        ],
-        "uncleHeaders" : [
-        ]
-    },
-
-    "SimpleTx" : {
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
-            "difficulty" : "10000",
-            "extraData" : "42",
-            "gasLimit" : "100000",
-            "gasUsed" : "0",
-            "nonce" : "0x498e88f5c14b0b60d6e14ce9c6cc958cbe16a1df8dd90210e50d2d77562a348d",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x54c98c81",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000000000",
-                "nonce" : "0",
-                "code" : "",
-                "storage": {}
-            }
-        },
-        "transactions" : [
-            {
-                "data" : "",
-                "gasLimit" : "500",
-                "gasPrice" : "10",
-                "nonce" : "0",
-                "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-                "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                "value" : "10"
-            }
-        ],
-        "uncleHeaders" : [
-        ]
-    },
-
-    "txOrder" : {
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
-            "difficulty" : "10000",
-            "extraData" : "42",
-            "gasLimit" : "100000",
-            "gasUsed" : "0",
-            "nonce" : "0x498e88f5c14b0b60d6e14ce9c6cc958cbe16a1df8dd90210e50d2d77562a348d",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x54c98c81",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000000000",
-                "nonce" : "0",
-                "code" : "",
-                "storage": {}
-            }
-        },
-        "transactions" : [
-            {
-                "data" : "",
-                "gasLimit" : "500",
-                "gasPrice" : "10",
-                "nonce" : "0",
-                "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-                "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                "value" : "7000000000"
-            },
-            {
-                "data" : "",
-                "gasLimit" : "500",
-                "gasPrice" : "10",
-                "nonce" : "0",
-                "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-                "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                "value" : "8000000000"
-            }
-        ],
-        "uncleHeaders" : [
-        ]
-    },
-
-    "txEqualValue" : {
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
-            "difficulty" : "10000",
-            "extraData" : "42",
-            "gasLimit" : "100000",
-            "gasUsed" : "0",
-            "nonce" : "0x498e88f5c14b0b60d6e14ce9c6cc958cbe16a1df8dd90210e50d2d77562a348d",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x54c98c81",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000000000",
-                "nonce" : "0",
-                "code" : "",
-                "storage": {}
-            }
-        },
-        "transactions" : [
-            {
-                "data" : "",
-                "gasLimit" : "500",
-                "gasPrice" : "10",
-                "nonce" : "0",
-                "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-                "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                "value" : "5000000000"
-            },
-            {
-                "data" : "",
-                "gasLimit" : "500",
-                "gasPrice" : "9",
-                "nonce" : "0",
-                "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-                "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                "value" : "5000000000"
-            }
-        ],
-        "uncleHeaders" : [
-        ]
-    },
-
-    "log1_correct" : {
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
-            "difficulty" : "10000",
-            "extraData" : "42",
-            "gasLimit" : "100000",
-            "gasUsed" : "0",
-            "nonce" : "0x498e88f5c14b0b60d6e14ce9c6cc958cbe16a1df8dd90210e50d2d77562a348d",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x54c98c81",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000000000",
-                "nonce" : "0",
-                "code" : "",
-                "storage": {}
-            },
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "100",
-                "nonce" : "0",
-                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
-                "storage": {}
-            }
-        },
-        "transactions" : [
-            {
-                "data" : "",
-                "gasLimit" : "5000",
-                "gasPrice" : "10",
-                "nonce" : "0",
-                "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-                "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                "value" : "5000000000"
-            }
-        ],
-        "uncleHeaders" : [
-        ],
-
-        "firstBlockTest" : {
-            "block" : {
-                "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
-                "difficulty" : "023101",
-                "extraData" : "42",
-                "gasLimit" : "0x0dddb6",
-                "gasUsed" : "100",
-                "nonce" : "0x498e88f5c14b0b60d6e14ce9c6cc958cbe16a1df8dd90210e50d2d77562a348d",
-                "number" : "62",
-                "parentHash" : "0xefb4db878627027c81b3bb1c7dd3a18dae3914a49cdd24a3e40ab3bbfbb240c5",
-                "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-                "timestamp" : "0x54c98c81",
-                "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-            },
-            "pre" : {
-            },
-            "transactions" : [
-                {
-                    "data" : "0x60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b56",
-                    "gasLimit" : "0x0f3e6f",
-                    "gasPrice" : "0x09184e72a000",
-                    "nonce" : "0",
-                    "r" : "0xd4287e915ebac7a8af390560fa53c8f0b7f13802ba0393d7afa5823c2560ca89",
-                    "s" : "0xae75db31a34f7e386ad459646de98ec3a1c88cc91b11620b4ffd86871f579942",
-                    "to" : "",
-                    "v" : "0x1b",
-                    "value" : ""
-                }
-            ],
-        }
-
-    }
-}
-
diff --git a/block.cpp b/block.cpp
deleted file mode 100644
index 7c50eef4..00000000
--- a/block.cpp
+++ /dev/null
@@ -1,521 +0,0 @@
-/*
-	This file is part of cpp-ethereum.
-
-	cpp-ethereum is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	cpp-ethereum is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/** @file block.cpp
- * @author Christoph Jentzsch <cj@ethdev.com>
- * @date 2015
- * block test functions.
- */
-
-#include <libdevcrypto/FileSystem.h>
-#include <libethereum/CanonBlockChain.h>
-#include "TestHelper.h"
-
-using namespace std;
-using namespace json_spirit;
-using namespace dev;
-using namespace dev::eth;
-
-namespace dev {  namespace test {
-
-bytes createBlockRLPFromFields(mObject& _tObj)
-{
-	RLPStream rlpStream;
-	rlpStream.appendList(_tObj.size());
-
-	if (_tObj.count("parentHash"))
-		rlpStream << importByteArray(_tObj["parentHash"].get_str());
-
-	if (_tObj.count("uncleHash"))
-		rlpStream << importByteArray(_tObj["uncleHash"].get_str());
-
-	if (_tObj.count("coinbase"))
-		rlpStream << importByteArray(_tObj["coinbase"].get_str());
-
-	if (_tObj.count("stateRoot"))
-		rlpStream << importByteArray(_tObj["stateRoot"].get_str());
-
-	if (_tObj.count("transactionsTrie"))
-		rlpStream << importByteArray(_tObj["transactionsTrie"].get_str());
-
-	if (_tObj.count("receiptTrie"))
-		rlpStream << importByteArray(_tObj["receiptTrie"].get_str());
-
-	if (_tObj.count("bloom"))
-		rlpStream << importByteArray(_tObj["bloom"].get_str());
-
-	if (_tObj.count("difficulty"))
-		rlpStream << bigint(_tObj["difficulty"].get_str());
-
-	if (_tObj.count("number"))
-		rlpStream << bigint(_tObj["number"].get_str());
-
-	if (_tObj.count("gasLimit"))
-		rlpStream << bigint(_tObj["gasLimit"].get_str());
-
-	if (_tObj.count("gasUsed"))
-		rlpStream << bigint(_tObj["gasUsed"].get_str());
-
-	if (_tObj.count("timestamp"))
-		rlpStream << bigint(_tObj["timestamp"].get_str());
-
-	if (_tObj.count("extraData"))
-		rlpStream << importByteArray(_tObj["extraData"].get_str());
-
-	if (_tObj.count("nonce"))
-		rlpStream << importByteArray(_tObj["nonce"].get_str());
-
-	return rlpStream.out();
-}
-
-void overwriteBlockHeader(mObject& _o, BlockInfo _current_BlockHeader)
-{
-    if (_o.count("blockHeader"))
-    {
-        if (_o["blockHeader"].get_obj().size() != 14)
-        {
-
-            BlockInfo tmp = _current_BlockHeader;
-
-            if (_o["blockHeader"].get_obj().count("parentHash"))
-                tmp.parentHash = h256(_o["blockHeader"].get_obj()["parentHash"].get_str());
-
-            if (_o["blockHeader"].get_obj().count("uncleHash"))
-                tmp.sha3Uncles = h256(_o["blockHeader"].get_obj()["uncleHash"].get_str());
-
-            if (_o["blockHeader"].get_obj().count("coinbase"))
-                tmp.coinbaseAddress = Address(_o["blockHeader"].get_obj()["coinbase"].get_str());
-
-            if (_o["blockHeader"].get_obj().count("stateRoot"))
-                tmp.stateRoot = h256(_o["blockHeader"].get_obj()["stateRoot"].get_str());
-
-            if (_o["blockHeader"].get_obj().count("transactionsTrie"))
-                tmp.transactionsRoot = h256(_o["blockHeader"].get_obj()["transactionsTrie"].get_str());
-
-            if (_o["blockHeader"].get_obj().count("receiptTrie"))
-                tmp.receiptsRoot = h256(_o["blockHeader"].get_obj()["receiptTrie"].get_str());
-
-            if (_o["blockHeader"].get_obj().count("bloom"))
-                tmp.logBloom = LogBloom(_o["blockHeader"].get_obj()["bloom"].get_str());
-
-            if (_o["blockHeader"].get_obj().count("difficulty"))
-                tmp.difficulty = toInt(_o["blockHeader"].get_obj()["difficulty"]);
-
-            if (_o["blockHeader"].get_obj().count("number"))
-                tmp.number = toInt(_o["blockHeader"].get_obj()["number"]);
-
-            if (_o["blockHeader"].get_obj().count("gasLimit"))
-                tmp.gasLimit = toInt(_o["blockHeader"].get_obj()["gasLimit"]);
-
-            if (_o["blockHeader"].get_obj().count("gasUsed"))
-                tmp.gasUsed = toInt(_o["blockHeader"].get_obj()["gasUsed"]);
-
-            if (_o["blockHeader"].get_obj().count("timestamp"))
-                tmp.timestamp = toInt(_o["blockHeader"].get_obj()["timestamp"]);
-
-            if (_o["blockHeader"].get_obj().count("extraData"))
-                tmp.extraData = importByteArray(_o["blockHeader"].get_obj()["extraData"].get_str());
-
-            // find new valid nonce
-
-            if (tmp != _current_BlockHeader)
-            {
-                _current_BlockHeader = tmp;
-                cout << "new header!\n";
-                ProofOfWork pow;
-                MineInfo ret;
-                while (!ProofOfWork::verify(_current_BlockHeader.headerHash(WithoutNonce), _current_BlockHeader.nonce, _current_BlockHeader.difficulty))
-                    tie(ret, _current_BlockHeader.nonce) = pow.mine(_current_BlockHeader.headerHash(WithoutNonce), _current_BlockHeader.difficulty, 10000, true, true);
-            }
-        }
-        else
-        {
-            // take the blockheader as is
-            const bytes c_blockRLP = createBlockRLPFromFields(_o["blockHeader"].get_obj());
-            const RLP c_bRLP(c_blockRLP);
-            _current_BlockHeader.populateFromHeader(c_bRLP, false);
-        }
-    }
-}
-
-void doBlockTests(json_spirit::mValue& _v, bool _fillin)
-{
-	for (auto& i: _v.get_obj())
-	{
-		cerr << i.first << endl;
-		mObject& o = i.second.get_obj();
-
-		BOOST_REQUIRE(o.count("genesisBlockHeader"));
-		BlockInfo blockFromFields;
-		try
-		{
-			// construct genesis block
-			const bytes c_blockRLP = createBlockRLPFromFields(o["genesisBlockHeader"].get_obj());
-			const RLP c_bRLP(c_blockRLP);
-			blockFromFields.populateFromHeader(c_bRLP, false);
-		}
-		catch (Exception const& _e)
-		{
-			cnote << "block population did throw an exception: " << diagnostic_information(_e);
-			BOOST_ERROR("Failed block population with Exception: " << _e.what());
-			continue;
-		}
-		catch (std::exception const& _e)
-		{
-			BOOST_ERROR("Failed block population with Exception: " << _e.what());
-			continue;
-		}
-		catch(...)
-		{
-			cnote << "block population did throw an unknown exception\n";
-			continue;
-		}
-
-		BOOST_REQUIRE(o.count("pre"));
-
-		ImportTest importer(o["pre"].get_obj());
-		State state(Address(), OverlayDB(), BaseState::Empty);
-		importer.importState(o["pre"].get_obj(), state);
-		state.commit();
-
-		if (_fillin)
-			blockFromFields.stateRoot = state.rootHash();
-		else
-			BOOST_CHECK_MESSAGE(blockFromFields.stateRoot == state.rootHash(), "root hash does not match");
-
-		if (_fillin)
-		{
-			// find new valid nonce
-			ProofOfWork pow;
-			MineInfo ret;
-			while (!ProofOfWork::verify(blockFromFields.headerHash(WithoutNonce), blockFromFields.nonce, blockFromFields.difficulty))
-				tie(ret, blockFromFields.nonce) = pow.mine(blockFromFields.headerHash(WithoutNonce), blockFromFields.difficulty, 1000, true, true);
-
-			//update genesis block in json file
-			o["genesisBlockHeader"].get_obj()["stateRoot"] = toString(blockFromFields.stateRoot);
-			o["genesisBlockHeader"].get_obj()["nonce"] = toString(blockFromFields.nonce);
-		}
-
-		// create new "genesis" block
-		RLPStream rlpStream;
-		blockFromFields.streamRLP(rlpStream, WithNonce);
-
-		RLPStream block(3);
-		block.appendRaw(rlpStream.out());
-		block.appendRaw(RLPEmptyList);
-		block.appendRaw(RLPEmptyList);
-
-		blockFromFields.verifyInternals(&block.out());
-
-		// construct blockchain
-		BlockChain bc(block.out(), string(), true);
-
-		if (_fillin)
-		{
-			BOOST_REQUIRE(o.count("transactions"));
-
-			TransactionQueue txs;
-
-			for (auto const& txObj: o["transactions"].get_array())
-			{
-				mObject tx = txObj.get_obj();
-				importer.importTransaction(tx);
-				if (!txs.attemptImport(importer.m_transaction.rlp()))
-					cnote << "failed importing transaction\n";
-			}
-
-			try
-			{
-				state.sync(bc);
-				state.sync(bc,txs);
-				state.commitToMine(bc);
-				MineInfo info;
-				for (info.completed = false; !info.completed; info = state.mine()) {}
-				state.completeMine();
-			}
-			catch (Exception const& _e)
-			{
-				cnote << "state sync or mining did throw an exception: " << diagnostic_information(_e);
-				return;
-			}
-			catch (std::exception const& _e)
-			{
-				cnote << "state sync or mining did throw an exception: " << _e.what();
-				return;
-			}
-
-			// write valid txs
-			mArray txArray;
-			Transactions txList;
-			for (auto const& txi: txs.transactions())
-			{
-				Transaction tx(txi.second, CheckSignature::Sender);
-				txList.push_back(tx);
-				mObject txObject;
-				txObject["nonce"] = toString(tx.nonce());
-				txObject["data"] = toHex(tx.data());
-				txObject["gasLimit"] = toString(tx.gas());
-				txObject["gasPrice"] = toString(tx.gasPrice());
-				txObject["r"] = "0x" + toString(tx.signature().r);
-				txObject["s"] = "0x" + toString(tx.signature().s);
-				txObject["v"] = to_string(tx.signature().v + 27);
-				txObject["to"] = toString(tx.receiveAddress());
-				txObject["value"] = toString(tx.value());
-
-				txArray.push_back(txObject);
-			}
-
-			o["transactions"] = txArray;
-			o["rlp"] = "0x" + toHex(state.blockData());
-
-			BlockInfo current_BlockHeader = state.info();
-
-			// overwrite blockheader with (possible wrong) data from "blockheader" in filler;
-			overwriteBlockHeader(o, current_BlockHeader);
-
-			// write block header
-			mObject oBlockHeader;
-			oBlockHeader["parentHash"] = toString(current_BlockHeader.parentHash);
-			oBlockHeader["uncleHash"] = toString(current_BlockHeader.sha3Uncles);
-			oBlockHeader["coinbase"] = toString(current_BlockHeader.coinbaseAddress);
-			oBlockHeader["stateRoot"] = toString(current_BlockHeader.stateRoot);
-			oBlockHeader["transactionsTrie"] = toString(current_BlockHeader.transactionsRoot);
-			oBlockHeader["receiptTrie"] = toString(current_BlockHeader.receiptsRoot);
-			oBlockHeader["bloom"] = toString(current_BlockHeader.logBloom);
-			oBlockHeader["difficulty"] = toString(current_BlockHeader.difficulty);
-			oBlockHeader["number"] = toString(current_BlockHeader.number);
-			oBlockHeader["gasLimit"] = toString(current_BlockHeader.gasLimit);
-			oBlockHeader["gasUsed"] = toString(current_BlockHeader.gasUsed);
-			oBlockHeader["timestamp"] = toString(current_BlockHeader.timestamp);
-			oBlockHeader["extraData"] = toHex(current_BlockHeader.extraData);
-			oBlockHeader["nonce"] = toString(current_BlockHeader.nonce);
-
-			o["blockHeader"] = oBlockHeader;
-
-			// write uncle list
-			mArray aUncleList; // as of now, our parent is always the genesis block, so we can not have uncles.
-			o["uncleHeaders"] = aUncleList;
-
-			//txs:
-
-			RLPStream txStream;
-			txStream.appendList(txList.size());
-			for (unsigned i = 0; i < txList.size(); ++i)
-			{
-				RLPStream txrlp;
-				txList[i].streamRLP(txrlp);
-				txStream.appendRaw(txrlp.out());
-			}
-
-			RLPStream rlpStream2;
-			current_BlockHeader.streamRLP(rlpStream2, WithNonce);
-
-			RLPStream block2(3);
-			block2.appendRaw(rlpStream2.out());
-			block2.appendRaw(txStream.out());
-			block2.appendRaw(RLPEmptyList);
-
-			o["rlp"] = "0x" + toHex(block2.out());
-
-			if (sha3(RLP(state.blockData())[0].data()) != sha3(RLP(block2.out())[0].data()))
-				cnote << "block header mismatch\n";
-
-			if (sha3(RLP(state.blockData())[1].data()) != sha3(RLP(block2.out())[1].data()))
-				cnote << "txs mismatch\n";
-
-			if (sha3(RLP(state.blockData())[2].data()) != sha3(RLP(block2.out())[2].data()))
-				cnote << "uncle list mismatch\n";
-
-			try
-			{
-				ImportTest importerTmp(o["pre"].get_obj());
-				State stateTmp(Address(), OverlayDB(), BaseState::Empty);
-				importerTmp.importState(o["pre"].get_obj(), stateTmp);
-				stateTmp.commit();
-				BlockChain bcTmp(block.out(), getDataDir() + "/tmpBlockChain.bc", true);
-				stateTmp.sync(bcTmp);
-				bc.import(block2.out(), stateTmp.db());
-				stateTmp.sync(bcTmp);
-			}
-			// if exception is thrown, RLP is invalid and no blockHeader, Transaction list, or Uncle list should be given
-			catch (...)
-			{
-				cnote << "block is invalid!\n";
-				o.erase(o.find("blockHeader"));
-				o.erase(o.find("uncleHeaders"));
-				o.erase(o.find("transactions"));
-			}
-		}
-
-		else
-		{
-			bytes blockRLP;
-			try
-			{
-				state.sync(bc);
-				blockRLP = importByteArray(o["rlp"].get_str());
-				bc.import(blockRLP, state.db());
-				state.sync(bc);
-			}
-			// if exception is thrown, RLP is invalid and no blockHeader, Transaction list, or Uncle list should be given
-			catch (Exception const& _e)
-			{
-				cnote << "state sync or block import did throw an exception: " << diagnostic_information(_e);
-				BOOST_CHECK(o.count("blockHeader") == 0);
-				BOOST_CHECK(o.count("transactions") == 0);
-				BOOST_CHECK(o.count("uncleHeaders") == 0);
-				continue;
-			}
-			catch (std::exception const& _e)
-			{
-				cnote << "state sync or block import did throw an exception: " << _e.what();
-				BOOST_CHECK(o.count("blockHeader") == 0);
-				BOOST_CHECK(o.count("transactions") == 0);
-				BOOST_CHECK(o.count("uncleHeaders") == 0);
-				continue;
-			}
-			catch(...)
-			{
-				cnote << "state sync or block import did throw an exception\n";
-				BOOST_CHECK(o.count("blockHeader") == 0);
-				BOOST_CHECK(o.count("transactions") == 0);
-				BOOST_CHECK(o.count("uncleHeaders") == 0);
-				continue;
-			}
-
-			BOOST_REQUIRE(o.count("blockHeader"));
-
-			mObject tObj = o["blockHeader"].get_obj();
-			BlockInfo blockHeaderFromFields;
-			const bytes c_rlpBytesBlockHeader = createBlockRLPFromFields(tObj);
-			const RLP c_blockHeaderRLP(c_rlpBytesBlockHeader);
-			blockHeaderFromFields.populateFromHeader(c_blockHeaderRLP, false);
-
-			BlockInfo blockFromRlp = bc.info();
-
-			//Check the fields restored from RLP to original fields
-			BOOST_CHECK_MESSAGE(blockHeaderFromFields.headerHash(WithNonce) == blockFromRlp.headerHash(WithNonce), "hash in given RLP not matching the block hash!");
-			BOOST_CHECK_MESSAGE(blockHeaderFromFields.parentHash == blockFromRlp.parentHash, "parentHash in given RLP not matching the block parentHash!");
-			BOOST_CHECK_MESSAGE(blockHeaderFromFields.sha3Uncles == blockFromRlp.sha3Uncles, "sha3Uncles in given RLP not matching the block sha3Uncles!");
-			BOOST_CHECK_MESSAGE(blockHeaderFromFields.coinbaseAddress == blockFromRlp.coinbaseAddress,"coinbaseAddress in given RLP not matching the block coinbaseAddress!");
-			BOOST_CHECK_MESSAGE(blockHeaderFromFields.stateRoot == blockFromRlp.stateRoot, "stateRoot in given RLP not matching the block stateRoot!");
-			BOOST_CHECK_MESSAGE(blockHeaderFromFields.transactionsRoot == blockFromRlp.transactionsRoot, "transactionsRoot in given RLP not matching the block transactionsRoot!");
-			BOOST_CHECK_MESSAGE(blockHeaderFromFields.receiptsRoot == blockFromRlp.receiptsRoot, "receiptsRoot in given RLP not matching the block receiptsRoot!");
-			BOOST_CHECK_MESSAGE(blockHeaderFromFields.logBloom == blockFromRlp.logBloom, "logBloom in given RLP not matching the block logBloom!");
-			BOOST_CHECK_MESSAGE(blockHeaderFromFields.difficulty == blockFromRlp.difficulty, "difficulty in given RLP not matching the block difficulty!");
-			BOOST_CHECK_MESSAGE(blockHeaderFromFields.number == blockFromRlp.number, "number in given RLP not matching the block number!");
-			BOOST_CHECK_MESSAGE(blockHeaderFromFields.gasLimit == blockFromRlp.gasLimit,"gasLimit in given RLP not matching the block gasLimit!");
-			BOOST_CHECK_MESSAGE(blockHeaderFromFields.gasUsed == blockFromRlp.gasUsed, "gasUsed in given RLP not matching the block gasUsed!");
-			BOOST_CHECK_MESSAGE(blockHeaderFromFields.timestamp == blockFromRlp.timestamp, "timestamp in given RLP not matching the block timestamp!");
-			BOOST_CHECK_MESSAGE(blockHeaderFromFields.extraData == blockFromRlp.extraData, "extraData in given RLP not matching the block extraData!");
-			BOOST_CHECK_MESSAGE(blockHeaderFromFields.nonce == blockFromRlp.nonce, "nonce in given RLP not matching the block nonce!");
-
-			BOOST_CHECK_MESSAGE(blockHeaderFromFields == blockFromRlp, "However, blockHeaderFromFields != blockFromRlp!");
-
-			//Check transaction list
-			Transactions txsFromField;
-
-			for (auto const& txObj: o["transactions"].get_array())
-			{
-				mObject tx = txObj.get_obj();
-
-				BOOST_REQUIRE(tx.count("nonce"));
-				BOOST_REQUIRE(tx.count("gasPrice"));
-				BOOST_REQUIRE(tx.count("gasLimit"));
-				BOOST_REQUIRE(tx.count("to"));
-				BOOST_REQUIRE(tx.count("value"));
-				BOOST_REQUIRE(tx.count("v"));
-				BOOST_REQUIRE(tx.count("r"));
-				BOOST_REQUIRE(tx.count("s"));
-				BOOST_REQUIRE(tx.count("data"));
-
-				try
-				{
-					Transaction t(createRLPStreamFromTransactionFields(tx).out(), CheckSignature::Sender);
-					txsFromField.push_back(t);
-				}
-				catch (Exception const& _e)
-				{
-					BOOST_ERROR("Failed transaction constructor with Exception: " << diagnostic_information(_e));
-				}
-				catch (exception const& _e)
-				{
-					cnote << _e.what();
-				}
-			}
-
-			Transactions txsFromRlp;
-			RLP root(blockRLP);
-			for (auto const& tr: root[1])
-			{
-				Transaction tx(tr.data(), CheckSignature::Sender);
-				txsFromRlp.push_back(tx);
-			}
-
-			BOOST_CHECK_MESSAGE(txsFromRlp.size() == txsFromField.size(), "transaction list size does not match");
-
-			for (size_t i = 0; i < txsFromField.size(); ++i)
-			{
-				BOOST_CHECK_MESSAGE(txsFromField[i].data() == txsFromRlp[i].data(), "transaction data in rlp and in field do not match");
-				BOOST_CHECK_MESSAGE(txsFromField[i].gas() == txsFromRlp[i].gas(), "transaction gasLimit in rlp and in field do not match");
-				BOOST_CHECK_MESSAGE(txsFromField[i].gasPrice() == txsFromRlp[i].gasPrice(), "transaction gasPrice in rlp and in field do not match");
-				BOOST_CHECK_MESSAGE(txsFromField[i].nonce() == txsFromRlp[i].nonce(), "transaction nonce in rlp and in field do not match");
-				BOOST_CHECK_MESSAGE(txsFromField[i].signature().r == txsFromRlp[i].signature().r, "transaction r in rlp and in field do not match");
-				BOOST_CHECK_MESSAGE(txsFromField[i].signature().s == txsFromRlp[i].signature().s, "transaction s in rlp and in field do not match");
-				BOOST_CHECK_MESSAGE(txsFromField[i].signature().v == txsFromRlp[i].signature().v, "transaction v in rlp and in field do not match");
-				BOOST_CHECK_MESSAGE(txsFromField[i].receiveAddress() == txsFromRlp[i].receiveAddress(), "transaction receiveAddress in rlp and in field do not match");
-				BOOST_CHECK_MESSAGE(txsFromField[i].value() == txsFromRlp[i].value(), "transaction receiveAddress in rlp and in field do not match");
-
-				BOOST_CHECK_MESSAGE(txsFromField[i] == txsFromRlp[i], "transactions in rlp and in transaction field do not match");
-			}
-
-			// check uncle list
-			BOOST_CHECK_MESSAGE((o["uncleList"].type() == json_spirit::null_type ? 0 : o["uncleList"].get_array().size()) == 0, "Uncle list is not empty, but the genesis block can not have uncles");
-		}
-	}
-}
-
-} }// Namespace Close
-
-
-BOOST_AUTO_TEST_SUITE(BlockTests)
-
-BOOST_AUTO_TEST_CASE(blValidBlockTest)
-{
-	dev::test::executeTests("blValidBlockTest", "/BlockTests", dev::test::doBlockTests);
-}
-
-BOOST_AUTO_TEST_CASE(blInvalidTransactionRLP)
-{
-	dev::test::executeTests("blInvalidTransactionRLP", "/BlockTests", dev::test::doBlockTests);
-}
-
-BOOST_AUTO_TEST_CASE(blInvalidHeaderTest)
-{
-	dev::test::executeTests("blInvalidHeaderTest", "/BlockTests", dev::test::doBlockTests);
-}
-
-BOOST_AUTO_TEST_CASE(blForkBlocks)
-{
-	dev::test::executeTests("blForkBlocks", "/BlockTests", dev::test::doBlockTests);
-}
-
-BOOST_AUTO_TEST_CASE(userDefinedFile)
-{
-	dev::test::userDefinedTest("--singletest", dev::test::doBlockTests);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/blockchain.cpp b/blockchain.cpp
new file mode 100644
index 00000000..7f840bc7
--- /dev/null
+++ b/blockchain.cpp
@@ -0,0 +1,647 @@
+/*
+	This file is part of cpp-ethereum.
+
+	cpp-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	cpp-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file block.cpp
+ * @author Christoph Jentzsch <cj@ethdev.com>
+ * @date 2015
+ * block test functions.
+ */
+
+#include <libdevcrypto/FileSystem.h>
+#include <libethereum/CanonBlockChain.h>
+#include "TestHelper.h"
+
+using namespace std;
+using namespace json_spirit;
+using namespace dev;
+using namespace dev::eth;
+
+namespace dev {  namespace test {
+
+bytes createBlockRLPFromFields(mObject& _tObj);
+void overwriteBlockHeader(BlockInfo& _current_BlockHeader, mObject& _blObj);
+BlockInfo constructBlock(mObject& _o);
+void updatePoW(BlockInfo& _bi);
+void writeBlockHeaderToJson(mObject& _o, const BlockInfo& _bi);
+RLPStream createFullBlockFromHeader(const BlockInfo& _bi, const bytes& _txs = RLPEmptyList, const bytes& _uncles = RLPEmptyList);
+
+void doBlockchainTests(json_spirit::mValue& _v, bool _fillin)
+{
+	for (auto& i: _v.get_obj())
+	{
+		cerr << i.first << endl;
+		mObject& o = i.second.get_obj();
+
+		BOOST_REQUIRE(o.count("genesisBlockHeader"));
+		BlockInfo biGenesisBlock = constructBlock(o["genesisBlockHeader"].get_obj());
+
+		BOOST_REQUIRE(o.count("pre"));
+		ImportTest importer(o["pre"].get_obj());
+		State state(Address(), OverlayDB(), BaseState::Empty);
+		importer.importState(o["pre"].get_obj(), state);
+		state.commit();
+
+		if (_fillin)
+			biGenesisBlock.stateRoot = state.rootHash();
+		else
+			BOOST_CHECK_MESSAGE(biGenesisBlock.stateRoot == state.rootHash(), "root hash does not match");
+
+		if (_fillin)
+		{
+			// find new valid nonce
+			updatePoW(biGenesisBlock);
+
+			//update genesis block in json file
+			writeBlockHeaderToJson(o["genesisBlockHeader"].get_obj(), biGenesisBlock);
+		}
+
+		// create new "genesis" block
+		RLPStream rlpGenesisBlock = createFullBlockFromHeader(biGenesisBlock);
+		biGenesisBlock.verifyInternals(&rlpGenesisBlock.out());
+
+		// construct blockchain
+		BlockChain bc(rlpGenesisBlock.out(), string(), true);
+
+		if (_fillin)
+		{
+			BOOST_REQUIRE(o.count("blocks"));
+			mArray blArray;
+			vector<BlockInfo> vBiBlocks;
+			vBiBlocks.push_back(biGenesisBlock);
+			for (auto const& bl: o["blocks"].get_array())
+			{
+				mObject blObj = bl.get_obj();
+
+				// get txs
+				TransactionQueue txs;
+				BOOST_REQUIRE(blObj.count("transactions"));
+				for (auto const& txObj: blObj["transactions"].get_array())
+				{
+					mObject tx = txObj.get_obj();
+					importer.importTransaction(tx);
+					if (!txs.attemptImport(importer.m_transaction.rlp()))
+						cnote << "failed importing transaction\n";
+				}
+
+				// write uncle list
+				BlockQueue uncleBlockQueue;
+				mArray aUncleList;
+				vector<BlockInfo> vBiUncles;
+
+				for (auto const& uHObj: blObj["uncleHeaders"].get_array())
+				{
+					mObject uncleHeaderObj = uHObj.get_obj();
+					BlockInfo uncleBlockFromFields = constructBlock(uncleHeaderObj);
+
+					// make uncle header valid
+					uncleBlockFromFields.timestamp = (u256)time(0);
+					if (vBiBlocks.size() > 2)
+						uncleBlockFromFields.populateFromParent(vBiBlocks[vBiBlocks.size()-2]);
+					else
+						continue;
+
+					updatePoW(uncleBlockFromFields);
+					writeBlockHeaderToJson(uncleHeaderObj, uncleBlockFromFields);
+
+					aUncleList.push_back(uncleHeaderObj);
+					vBiUncles.push_back(uncleBlockFromFields);
+
+					cnote << "import uncle in blockQueue";
+					RLPStream uncle = createFullBlockFromHeader(uncleBlockFromFields);
+					uncleBlockQueue.import(&uncle.out(), bc);
+				}
+
+				blObj["uncleHeaders"] = aUncleList;
+				bc.sync(uncleBlockQueue, state.db(), 4);
+				state.commitToMine(bc);
+
+				try
+				{
+					state.sync(bc);
+					state.sync(bc,txs);
+					state.commitToMine(bc);
+					MineInfo info;
+					for (info.completed = false; !info.completed; info = state.mine()) {}
+					state.completeMine();
+				}
+				catch (Exception const& _e)
+				{
+					cnote << "state sync or mining did throw an exception: " << diagnostic_information(_e);
+					return;
+				}
+				catch (std::exception const& _e)
+				{
+					cnote << "state sync or mining did throw an exception: " << _e.what();
+					return;
+				}
+
+				blObj["rlp"] = "0x" + toHex(state.blockData());
+
+				// write valid txs
+				mArray txArray;
+				Transactions txList;
+				for (auto const& txi: txs.transactions())
+				{
+					Transaction tx(txi.second, CheckSignature::Sender);
+					txList.push_back(tx);
+					mObject txObject;
+					txObject["nonce"] = toString(tx.nonce());
+					txObject["data"] = "0x" + toHex(tx.data());
+					txObject["gasLimit"] = toString(tx.gas());
+					txObject["gasPrice"] = toString(tx.gasPrice());
+					txObject["r"] = "0x" + toString(tx.signature().r);
+					txObject["s"] = "0x" + toString(tx.signature().s);
+					txObject["v"] = to_string(tx.signature().v + 27);
+					txObject["to"] = tx.isCreation() ? "" : toString(tx.receiveAddress());
+					txObject["value"] = toString(tx.value());
+
+					txArray.push_back(txObject);
+				}
+
+				blObj["transactions"] = txArray;
+
+				BlockInfo current_BlockHeader = state.info();
+
+				if (blObj.count("blockHeader"))
+					overwriteBlockHeader(current_BlockHeader, blObj);
+
+				// write block header
+				mObject oBlockHeader;
+				writeBlockHeaderToJson(oBlockHeader, current_BlockHeader);
+				blObj["blockHeader"] = oBlockHeader;
+				vBiBlocks.push_back(current_BlockHeader);
+
+				// compare blocks from state and from rlp
+				RLPStream txStream;
+				txStream.appendList(txList.size());
+				for (unsigned i = 0; i < txList.size(); ++i)
+				{
+					RLPStream txrlp;
+					txList[i].streamRLP(txrlp);
+					txStream.appendRaw(txrlp.out());
+				}
+
+				RLPStream uncleStream;
+				uncleStream.appendList(vBiUncles.size());
+				for (unsigned i = 0; i < vBiUncles.size(); ++i)
+				{
+					RLPStream uncleRlp;
+					vBiUncles[i].streamRLP(uncleRlp, WithNonce);
+					uncleStream.appendRaw(uncleRlp.out());
+				}
+
+				RLPStream block2 = createFullBlockFromHeader(current_BlockHeader, txStream.out(), uncleStream.out());
+
+				blObj["rlp"] = "0x" + toHex(block2.out());
+
+				if (sha3(RLP(state.blockData())[0].data()) != sha3(RLP(block2.out())[0].data()))
+					cnote << "block header mismatch\n";
+
+				if (sha3(RLP(state.blockData())[1].data()) != sha3(RLP(block2.out())[1].data()))
+					cnote << "txs mismatch\n";
+
+				if (sha3(RLP(state.blockData())[2].data()) != sha3(RLP(block2.out())[2].data()))
+					cnote << "uncle list mismatch\n" << RLP(state.blockData())[2].data() << "\n" << RLP(block2.out())[2].data();
+
+				try
+				{
+					state.sync(bc);
+					bc.import(block2.out(), state.db());
+					state.sync(bc);
+					state.commit();
+				}
+				// if exception is thrown, RLP is invalid and no blockHeader, Transaction list, or Uncle list should be given
+				catch (...)
+				{
+					cnote << "block is invalid!\n";
+					blObj.erase(blObj.find("blockHeader"));
+					blObj.erase(blObj.find("uncleHeaders"));
+					blObj.erase(blObj.find("transactions"));
+				}
+				blArray.push_back(blObj);
+			}
+			o["blocks"] = blArray;
+		}
+
+		else
+		{
+			for (auto const& bl: o["blocks"].get_array())
+			{
+				mObject blObj = bl.get_obj();
+				bytes blockRLP;
+				try
+				{
+					state.sync(bc);
+					blockRLP = importByteArray(blObj["rlp"].get_str());
+					bc.import(blockRLP, state.db());
+					state.sync(bc);
+				}
+				// if exception is thrown, RLP is invalid and no blockHeader, Transaction list, or Uncle list should be given
+				catch (Exception const& _e)
+				{
+					cnote << "state sync or block import did throw an exception: " << diagnostic_information(_e);
+					BOOST_CHECK(blObj.count("blockHeader") == 0);
+					BOOST_CHECK(blObj.count("transactions") == 0);
+					BOOST_CHECK(blObj.count("uncleHeaders") == 0);
+					continue;
+				}
+				catch (std::exception const& _e)
+				{
+					cnote << "state sync or block import did throw an exception: " << _e.what();
+					BOOST_CHECK(blObj.count("blockHeader") == 0);
+					BOOST_CHECK(blObj.count("transactions") == 0);
+					BOOST_CHECK(blObj.count("uncleHeaders") == 0);
+					continue;
+				}
+				catch(...)
+				{
+					cnote << "state sync or block import did throw an exception\n";
+					BOOST_CHECK(blObj.count("blockHeader") == 0);
+					BOOST_CHECK(blObj.count("transactions") == 0);
+					BOOST_CHECK(blObj.count("uncleHeaders") == 0);
+					continue;
+				}
+
+				BOOST_REQUIRE(blObj.count("blockHeader"));
+
+				mObject tObj = blObj["blockHeader"].get_obj();
+				BlockInfo blockHeaderFromFields;
+				const bytes c_rlpBytesBlockHeader = createBlockRLPFromFields(tObj);
+				const RLP c_blockHeaderRLP(c_rlpBytesBlockHeader);
+				blockHeaderFromFields.populateFromHeader(c_blockHeaderRLP, false);
+
+				BlockInfo blockFromRlp = bc.info();
+
+				//Check the fields restored from RLP to original fields
+				BOOST_CHECK_MESSAGE(blockHeaderFromFields.headerHash(WithNonce) == blockFromRlp.headerHash(WithNonce), "hash in given RLP not matching the block hash!");
+				BOOST_CHECK_MESSAGE(blockHeaderFromFields.parentHash == blockFromRlp.parentHash, "parentHash in given RLP not matching the block parentHash!");
+				BOOST_CHECK_MESSAGE(blockHeaderFromFields.sha3Uncles == blockFromRlp.sha3Uncles, "sha3Uncles in given RLP not matching the block sha3Uncles!");
+				BOOST_CHECK_MESSAGE(blockHeaderFromFields.coinbaseAddress == blockFromRlp.coinbaseAddress,"coinbaseAddress in given RLP not matching the block coinbaseAddress!");
+				BOOST_CHECK_MESSAGE(blockHeaderFromFields.stateRoot == blockFromRlp.stateRoot, "stateRoot in given RLP not matching the block stateRoot!");
+				BOOST_CHECK_MESSAGE(blockHeaderFromFields.transactionsRoot == blockFromRlp.transactionsRoot, "transactionsRoot in given RLP not matching the block transactionsRoot!");
+				BOOST_CHECK_MESSAGE(blockHeaderFromFields.receiptsRoot == blockFromRlp.receiptsRoot, "receiptsRoot in given RLP not matching the block receiptsRoot!");
+				BOOST_CHECK_MESSAGE(blockHeaderFromFields.logBloom == blockFromRlp.logBloom, "logBloom in given RLP not matching the block logBloom!");
+				BOOST_CHECK_MESSAGE(blockHeaderFromFields.difficulty == blockFromRlp.difficulty, "difficulty in given RLP not matching the block difficulty!");
+				BOOST_CHECK_MESSAGE(blockHeaderFromFields.number == blockFromRlp.number, "number in given RLP not matching the block number!");
+				BOOST_CHECK_MESSAGE(blockHeaderFromFields.gasLimit == blockFromRlp.gasLimit,"gasLimit in given RLP not matching the block gasLimit!");
+				BOOST_CHECK_MESSAGE(blockHeaderFromFields.gasUsed == blockFromRlp.gasUsed, "gasUsed in given RLP not matching the block gasUsed!");
+				BOOST_CHECK_MESSAGE(blockHeaderFromFields.timestamp == blockFromRlp.timestamp, "timestamp in given RLP not matching the block timestamp!");
+				BOOST_CHECK_MESSAGE(blockHeaderFromFields.extraData == blockFromRlp.extraData, "extraData in given RLP not matching the block extraData!");
+				BOOST_CHECK_MESSAGE(blockHeaderFromFields.mixHash == blockFromRlp.mixHash, "mixHash in given RLP not matching the block mixHash!");
+				BOOST_CHECK_MESSAGE(blockHeaderFromFields.seedHash == blockFromRlp.seedHash, "transactionsRoot in given RLP not matching the block transactionsRoot!");
+				BOOST_CHECK_MESSAGE(blockHeaderFromFields.nonce == blockFromRlp.nonce, "nonce in given RLP not matching the block nonce!");
+
+				BOOST_CHECK_MESSAGE(blockHeaderFromFields == blockFromRlp, "However, blockHeaderFromFields != blockFromRlp!");
+
+				//Check transaction list
+
+				Transactions txsFromField;
+
+				for (auto const& txObj: blObj["transactions"].get_array())
+				{
+					mObject tx = txObj.get_obj();
+
+					BOOST_REQUIRE(tx.count("nonce"));
+					BOOST_REQUIRE(tx.count("gasPrice"));
+					BOOST_REQUIRE(tx.count("gasLimit"));
+					BOOST_REQUIRE(tx.count("to"));
+					BOOST_REQUIRE(tx.count("value"));
+					BOOST_REQUIRE(tx.count("v"));
+					BOOST_REQUIRE(tx.count("r"));
+					BOOST_REQUIRE(tx.count("s"));
+					BOOST_REQUIRE(tx.count("data"));
+
+					try
+					{
+						Transaction t(createRLPStreamFromTransactionFields(tx).out(), CheckSignature::Sender);
+						txsFromField.push_back(t);
+					}
+					catch (Exception const& _e)
+					{
+						BOOST_ERROR("Failed transaction constructor with Exception: " << diagnostic_information(_e));
+					}
+					catch (exception const& _e)
+					{
+						cnote << _e.what();
+					}
+				}
+
+				Transactions txsFromRlp;
+				RLP root(blockRLP);
+				for (auto const& tr: root[1])
+				{
+					Transaction tx(tr.data(), CheckSignature::Sender);
+					txsFromRlp.push_back(tx);
+				}
+
+				BOOST_CHECK_MESSAGE(txsFromRlp.size() == txsFromField.size(), "transaction list size does not match");
+
+				for (size_t i = 0; i < txsFromField.size(); ++i)
+				{
+					BOOST_CHECK_MESSAGE(txsFromField[i].data() == txsFromRlp[i].data(), "transaction data in rlp and in field do not match");
+					BOOST_CHECK_MESSAGE(txsFromField[i].gas() == txsFromRlp[i].gas(), "transaction gasLimit in rlp and in field do not match");
+					BOOST_CHECK_MESSAGE(txsFromField[i].gasPrice() == txsFromRlp[i].gasPrice(), "transaction gasPrice in rlp and in field do not match");
+					BOOST_CHECK_MESSAGE(txsFromField[i].nonce() == txsFromRlp[i].nonce(), "transaction nonce in rlp and in field do not match");
+					BOOST_CHECK_MESSAGE(txsFromField[i].signature().r == txsFromRlp[i].signature().r, "transaction r in rlp and in field do not match");
+					BOOST_CHECK_MESSAGE(txsFromField[i].signature().s == txsFromRlp[i].signature().s, "transaction s in rlp and in field do not match");
+					BOOST_CHECK_MESSAGE(txsFromField[i].signature().v == txsFromRlp[i].signature().v, "transaction v in rlp and in field do not match");
+					BOOST_CHECK_MESSAGE(txsFromField[i].receiveAddress() == txsFromRlp[i].receiveAddress(), "transaction receiveAddress in rlp and in field do not match");
+					BOOST_CHECK_MESSAGE(txsFromField[i].value() == txsFromRlp[i].value(), "transaction receiveAddress in rlp and in field do not match");
+
+					BOOST_CHECK_MESSAGE(txsFromField[i] == txsFromRlp[i], "transactions from  rlp and transaction from field do not match");
+					BOOST_CHECK_MESSAGE(txsFromField[i].rlp() == txsFromRlp[i].rlp(), "transactions rlp do not match");
+
+				}
+
+				// check uncle list
+
+				// uncles from uncle list field
+				vector<BlockInfo> uBlHsFromField;
+				if (blObj["uncleHeaders"].type() != json_spirit::null_type)
+					for (auto const& uBlHeaderObj: blObj["uncleHeaders"].get_array())
+					{
+						mObject uBlH = uBlHeaderObj.get_obj();
+						cout << "uBlH.size(): " << uBlH.size() << endl;
+						BOOST_REQUIRE(uBlH.size() == 17);
+						bytes uncleRLP = createBlockRLPFromFields(uBlH);
+						const RLP c_uRLP(uncleRLP);
+						BlockInfo uncleBlockHeader;
+						try
+						{
+							uncleBlockHeader.populateFromHeader(c_uRLP, true);
+						}
+						catch(...)
+						{
+							BOOST_ERROR("invalid uncle header");
+						}
+						uBlHsFromField.push_back(uncleBlockHeader);
+					}
+
+				// uncles from block RLP
+				vector<BlockInfo> uBlHsFromRlp;
+				for	(auto const& uRLP: root[2])
+				{
+					BlockInfo uBl;
+					uBl.populateFromHeader(uRLP, true);
+					uBlHsFromRlp.push_back(uBl);
+				}
+
+				BOOST_REQUIRE_EQUAL(uBlHsFromField.size(), uBlHsFromRlp.size());
+
+				for (size_t i = 0; i < uBlHsFromField.size(); ++i)
+					BOOST_CHECK_MESSAGE(uBlHsFromField[i] == uBlHsFromRlp[i], "block header in rlp and in field do not match");
+			}
+		}
+	}
+}
+
+// helping functions
+
+bytes createBlockRLPFromFields(mObject& _tObj)
+{
+	RLPStream rlpStream;
+	rlpStream.appendList(_tObj.count("hash") > 0 ? (_tObj.size() - 1) : _tObj.size());
+
+	if (_tObj.count("parentHash"))
+		rlpStream << importByteArray(_tObj["parentHash"].get_str());
+
+	if (_tObj.count("uncleHash"))
+		rlpStream << importByteArray(_tObj["uncleHash"].get_str());
+
+	if (_tObj.count("coinbase"))
+		rlpStream << importByteArray(_tObj["coinbase"].get_str());
+
+	if (_tObj.count("stateRoot"))
+		rlpStream << importByteArray(_tObj["stateRoot"].get_str());
+
+	if (_tObj.count("transactionsTrie"))
+		rlpStream << importByteArray(_tObj["transactionsTrie"].get_str());
+
+	if (_tObj.count("receiptTrie"))
+		rlpStream << importByteArray(_tObj["receiptTrie"].get_str());
+
+	if (_tObj.count("bloom"))
+		rlpStream << importByteArray(_tObj["bloom"].get_str());
+
+	if (_tObj.count("difficulty"))
+		rlpStream << bigint(_tObj["difficulty"].get_str());
+
+	if (_tObj.count("number"))
+		rlpStream << bigint(_tObj["number"].get_str());
+
+	if (_tObj.count("gasLimit"))
+		rlpStream << bigint(_tObj["gasLimit"].get_str());
+
+	if (_tObj.count("gasUsed"))
+		rlpStream << bigint(_tObj["gasUsed"].get_str());
+
+	if (_tObj.count("timestamp"))
+		rlpStream << bigint(_tObj["timestamp"].get_str());
+
+	if (_tObj.count("extraData"))
+		rlpStream << fromHex(_tObj["extraData"].get_str());
+
+	if (_tObj.count("seedHash"))
+		rlpStream << importByteArray(_tObj["seedHash"].get_str());
+
+	if (_tObj.count("mixHash"))
+		rlpStream << importByteArray(_tObj["mixHash"].get_str());
+
+	if (_tObj.count("nonce"))
+		rlpStream << importByteArray(_tObj["nonce"].get_str());
+
+	return rlpStream.out();
+}
+
+void overwriteBlockHeader(BlockInfo& _current_BlockHeader, mObject& _blObj)
+{
+	if (_blObj["blockHeader"].get_obj().size() != 14)
+	{
+
+		BlockInfo tmp = _current_BlockHeader;
+
+		if (_blObj["blockHeader"].get_obj().count("parentHash"))
+			tmp.parentHash = h256(_blObj["blockHeader"].get_obj()["parentHash"].get_str());
+
+		if (_blObj["blockHeader"].get_obj().count("uncleHash"))
+			tmp.sha3Uncles = h256(_blObj["blockHeader"].get_obj()["uncleHash"].get_str());
+
+		if (_blObj["blockHeader"].get_obj().count("coinbase"))
+			tmp.coinbaseAddress = Address(_blObj["blockHeader"].get_obj()["coinbase"].get_str());
+
+		if (_blObj["blockHeader"].get_obj().count("stateRoot"))
+			tmp.stateRoot = h256(_blObj["blockHeader"].get_obj()["stateRoot"].get_str());
+
+		if (_blObj["blockHeader"].get_obj().count("transactionsTrie"))
+			tmp.transactionsRoot = h256(_blObj["blockHeader"].get_obj()["transactionsTrie"].get_str());
+
+		if (_blObj["blockHeader"].get_obj().count("receiptTrie"))
+			tmp.receiptsRoot = h256(_blObj["blockHeader"].get_obj()["receiptTrie"].get_str());
+
+		if (_blObj["blockHeader"].get_obj().count("bloom"))
+			tmp.logBloom = LogBloom(_blObj["blockHeader"].get_obj()["bloom"].get_str());
+
+		if (_blObj["blockHeader"].get_obj().count("difficulty"))
+			tmp.difficulty = toInt(_blObj["blockHeader"].get_obj()["difficulty"]);
+
+		if (_blObj["blockHeader"].get_obj().count("number"))
+			tmp.number = toInt(_blObj["blockHeader"].get_obj()["number"]);
+
+		if (_blObj["blockHeader"].get_obj().count("gasLimit"))
+			tmp.gasLimit = toInt(_blObj["blockHeader"].get_obj()["gasLimit"]);
+
+		if (_blObj["blockHeader"].get_obj().count("gasUsed"))
+			tmp.gasUsed = toInt(_blObj["blockHeader"].get_obj()["gasUsed"]);
+
+		if (_blObj["blockHeader"].get_obj().count("timestamp"))
+			tmp.timestamp = toInt(_blObj["blockHeader"].get_obj()["timestamp"]);
+
+		if (_blObj["blockHeader"].get_obj().count("extraData"))
+			tmp.extraData = importByteArray(_blObj["blockHeader"].get_obj()["extraData"].get_str());
+
+		if (_blObj["blockHeader"].get_obj().count("mixHash"))
+			tmp.mixHash = h256(_blObj["blockHeader"].get_obj()["mixHash"].get_str());
+
+		if (_blObj["blockHeader"].get_obj().count("seedHash"))
+			tmp.seedHash = h256(_blObj["blockHeader"].get_obj()["seedHash"].get_str());
+
+		// find new valid nonce
+
+		if (tmp != _current_BlockHeader)
+		{
+			_current_BlockHeader = tmp;
+
+			ProofOfWork pow;
+			std::pair<MineInfo, Ethash::Proof> ret;
+			while (!ProofOfWork::verify(_current_BlockHeader))
+			{
+				ret = pow.mine(_current_BlockHeader, 1000, true, true); // tie(ret, blockFromFields.nonce)
+				Ethash::assignResult(ret.second, _current_BlockHeader);
+			}
+		}
+	}
+	else
+	{
+		// take the blockheader as is
+		const bytes c_blockRLP = createBlockRLPFromFields(_blObj["blockHeader"].get_obj());
+		const RLP c_bRLP(c_blockRLP);
+		_current_BlockHeader.populateFromHeader(c_bRLP, false);
+	}
+}
+
+BlockInfo constructBlock(mObject& _o)
+{
+
+	BlockInfo ret;
+	try
+	{
+		// construct genesis block
+		const bytes c_blockRLP = createBlockRLPFromFields(_o);
+		const RLP c_bRLP(c_blockRLP);
+		ret.populateFromHeader(c_bRLP, false);
+	}
+	catch (Exception const& _e)
+	{
+		cnote << "block population did throw an exception: " << diagnostic_information(_e);
+		BOOST_ERROR("Failed block population with Exception: " << _e.what());
+	}
+	catch (std::exception const& _e)
+	{
+		BOOST_ERROR("Failed block population with Exception: " << _e.what());
+	}
+	catch(...)
+	{
+		BOOST_ERROR("block population did throw an unknown exception\n");
+	}
+	return ret;
+}
+
+void updatePoW(BlockInfo& _bi)
+{
+	ProofOfWork pow;
+	std::pair<MineInfo, Ethash::Proof> ret;
+	while (!ProofOfWork::verify(_bi))
+	{
+		ret = pow.mine(_bi, 10000, true, true); // tie(ret, blockFromFields.nonce)
+		Ethash::assignResult(ret.second, _bi);
+	}
+}
+
+void writeBlockHeaderToJson(mObject& _o, const BlockInfo& _bi)
+{
+	_o["parentHash"] = toString(_bi.parentHash);
+	_o["uncleHash"] = toString(_bi.sha3Uncles);
+	_o["coinbase"] = toString(_bi.coinbaseAddress);
+	_o["stateRoot"] = toString(_bi.stateRoot);
+	_o["transactionsTrie"] = toString(_bi.transactionsRoot);
+	_o["receiptTrie"] = toString(_bi.receiptsRoot);
+	_o["bloom"] = toString(_bi.logBloom);
+	_o["difficulty"] = toString(_bi.difficulty);
+	_o["number"] = toString(_bi.number);
+	_o["gasLimit"] = toString(_bi.gasLimit);
+	_o["gasUsed"] = toString(_bi.gasUsed);
+	_o["timestamp"] = toString(_bi.timestamp);
+	_o["extraData"] ="0x" + toHex(_bi.extraData);
+	_o["mixHash"] = toString(_bi.mixHash);
+	_o["seedHash"] = toString(_bi.seedHash);
+	_o["nonce"] = toString(_bi.nonce);
+	_o["hash"] = toString(_bi.hash);
+}
+
+RLPStream createFullBlockFromHeader(const BlockInfo& _bi,const bytes& _txs, const bytes& _uncles )
+{
+	RLPStream rlpStream;
+	_bi.streamRLP(rlpStream, WithNonce);
+
+	RLPStream ret(3);
+	ret.appendRaw(rlpStream.out());
+	ret.appendRaw(_txs);
+	ret.appendRaw(_uncles);
+
+	return ret;
+}
+} }// Namespace Close
+
+
+BOOST_AUTO_TEST_SUITE(BlockChainTests)
+
+BOOST_AUTO_TEST_CASE(bcBlockChainTest)
+{
+	dev::test::executeTests("bcBlockChainTest", "/BlockTests", dev::test::doBlockchainTests);
+}
+
+BOOST_AUTO_TEST_CASE(bcValidBlockTest)
+{
+	dev::test::executeTests("bcValidBlockTest", "/BlockTests", dev::test::doBlockchainTests);
+}
+
+BOOST_AUTO_TEST_CASE(bcInvalidHeaderTest)
+{
+	dev::test::executeTests("bcInvalidHeaderTest", "/BlockTests", dev::test::doBlockchainTests);
+}
+
+BOOST_AUTO_TEST_CASE(bcUncleTest)
+{
+	dev::test::executeTests("bcUncleTest", "/BlockTests", dev::test::doBlockchainTests);
+}
+
+BOOST_AUTO_TEST_CASE(userDefinedFileBc)
+{
+	dev::test::userDefinedTest("--bctest", dev::test::doBlockchainTests);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
diff --git a/commonjs.cpp b/commonjs.cpp
index 041a14f6..72582c54 100644
--- a/commonjs.cpp
+++ b/commonjs.cpp
@@ -42,7 +42,7 @@ BOOST_AUTO_TEST_CASE(jsToAddress)
 	cnote << "Testing jsToPublic...";
 	KeyPair kp = KeyPair::create();
 	string string = toJS(kp.address());
-	Address address = dev::eth::jsToAddress(string);
+	Address address = dev::jsToAddress(string);
 	BOOST_CHECK_EQUAL(kp.address(), address);
 }
 
diff --git a/dagger.cpp b/dagger.cpp
index 9422b6a9..dec753fe 100644
--- a/dagger.cpp
+++ b/dagger.cpp
@@ -17,35 +17,69 @@
 /** @file dagger.cpp
  * @author Gav Wood <i@gavwood.com>
  * @date 2014
- * ProofOfWork test functions.
+ * Dashimoto test functions.
  */
 
-#include <chrono>
-#include <libdevcore/Log.h>
+#include <fstream>
+#include <random>
+#include "JsonSpiritHeaders.h"
+#include <libdevcore/CommonIO.h>
 #include <libethcore/ProofOfWork.h>
+#include <libethcore/Ethasher.h>
+#include <boost/test/unit_test.hpp>
+#include "TestHelper.h"
+
 using namespace std;
-using namespace std::chrono;
 using namespace dev;
 using namespace dev::eth;
 
-int daggerTest()
+namespace js = json_spirit;
+
+using dev::operator <<;
+
+BOOST_AUTO_TEST_SUITE(DashimotoTests)
+
+BOOST_AUTO_TEST_CASE(basic_test)
 {
-	cnote << "Testing ProofOfWork...";
-	// Test dagger
-	{
-		auto s = steady_clock::now();
-		cout << hex << ProofOfWork().eval((h256)(u256)1, (h256)(u256)0);
-		cout << " " << dec << duration_cast<milliseconds>(steady_clock::now() - s).count() << " ms" << endl;
-		cout << hex << ProofOfWork().eval((h256)(u256)1, (h256)(u256)1);
-		cout << " " << dec << duration_cast<milliseconds>(steady_clock::now() - s).count() << " ms" << endl;
-	}
+	string testPath = test::getTestPath();
+
+	testPath += "/PoWTests";
+
+	cnote << "Testing Secure Trie...";
+	js::mValue v;
+	string s = asString(contents(testPath + "/ethash_tests.json"));
+	BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'ethash_tests.json' is empty. Have you cloned the 'tests' repo branch develop?");
+	js::read_string(s, v);
+	for (auto& i: v.get_obj())
 	{
-		auto s = steady_clock::now();
-		cout << hex << ProofOfWork().eval((h256)(u256)1, (h256)(u256)0);
-		cout << " " << dec << duration_cast<milliseconds>(steady_clock::now() - s).count() << " ms" << endl;
-		cout << hex << ProofOfWork().eval((h256)(u256)1, (h256)(u256)1);
-		cout << " " << dec << duration_cast<milliseconds>(steady_clock::now() - s).count() << " ms" << endl;
+		cnote << i.first;
+		js::mObject& o = i.second.get_obj();
+		vector<pair<string, string>> ss;
+		BlockInfo header = BlockInfo::fromHeader(fromHex(o["header"].get_str()));
+		h256 headerHash(o["header_hash"].get_str());
+		Nonce nonce(o["nonce"].get_str());
+		BOOST_REQUIRE_EQUAL(headerHash, header.headerHash(WithoutNonce));
+		BOOST_REQUIRE_EQUAL(nonce, header.nonce);
+
+		unsigned cacheSize(o["cache_size"].get_int());
+		h256 cacheHash(o["cache_hash"].get_str());
+		BOOST_REQUIRE_EQUAL(Ethasher::get()->cache(header).size(), cacheSize);
+		BOOST_REQUIRE_EQUAL(sha3(Ethasher::get()->cache(header)), cacheHash);
+
+#if TEST_FULL
+		unsigned fullSize(o["full_size"].get_int());
+		h256 fullHash(o["full_hash"].get_str());
+		BOOST_REQUIRE_EQUAL(Ethasher::get()->full(header).size(), fullSize);
+		BOOST_REQUIRE_EQUAL(sha3(Ethasher::get()->full(header)), fullHash);
+#endif
+
+		h256 result(o["result"].get_str());
+		Ethasher::Result r = Ethasher::eval(header);
+		BOOST_REQUIRE_EQUAL(r.value, result);
+		BOOST_REQUIRE_EQUAL(r.mixHash, header.mixHash);
 	}
-	return 0;
 }
 
+BOOST_AUTO_TEST_SUITE_END()
+
+
diff --git a/stBlockHashTestFiller.json b/stBlockHashTestFiller.json
index af223497..5ecc5b1c 100644
--- a/stBlockHashTestFiller.json
+++ b/stBlockHashTestFiller.json
@@ -25,7 +25,7 @@
          "transaction" : {
              "nonce" : "0",
              "gasPrice" : "1",
-             "gasLimit" : "8500",
+             "gasLimit" : "28500",
              "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
              "value" : "10",
              "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -59,7 +59,7 @@
          "transaction" : {
              "nonce" : "0",
              "gasPrice" : "1",
-             "gasLimit" : "8500",
+             "gasLimit" : "28500",
              "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
              "value" : "10",
              "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -93,7 +93,7 @@
          "transaction" : {
              "nonce" : "0",
              "gasPrice" : "1",
-             "gasLimit" : "8500",
+             "gasLimit" : "28500",
              "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
              "value" : "10",
              "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
diff --git a/stExampleFiller.json b/stExampleFiller.json
index 7acf695e..9daefbd5 100644
--- a/stExampleFiller.json
+++ b/stExampleFiller.json
@@ -26,7 +26,7 @@
         },
         "transaction" : {
             "data" : "",
-            "gasLimit" : "10000",
+            "gasLimit" : "400000",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
diff --git a/stInitCodeTestFiller.json b/stInitCodeTestFiller.json
index ea5467df..90229012 100644
--- a/stInitCodeTestFiller.json
+++ b/stInitCodeTestFiller.json
@@ -21,7 +21,7 @@
         "transaction" :
         {
             "data" : "0x600a80600c6000396000f200600160008035811a8100",
-            "gasLimit" : "599",
+            "gasLimit" : "32599",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -43,7 +43,7 @@
         "pre" :
         {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "2",
+                "balance" : "22177",
                 "code" : "",
                 "nonce" : "0",
                 "storage" : {
@@ -53,7 +53,7 @@
         "transaction" :
         {
             "data" : "0x600a80600c6000396000f200600160008035811a8100",
-            "gasLimit" : "599",
+            "gasLimit" : "22176",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -74,7 +74,7 @@
         "pre" :
         {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000",
+                "balance" : "70000",
                 "code" : "",
                 "nonce" : "0",
                 "storage" : {
@@ -84,7 +84,7 @@
         "transaction" :
         {
             "data" : "0x600a80600c6000396000f200600160008035811a8100",
-            "gasLimit" : "590",
+            "gasLimit" : "21590",
             "gasPrice" : "3",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -104,7 +104,7 @@
         "pre" :
         {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000",
+                "balance" : "50000",
                 "code" : "",
                 "nonce" : "0",
                 "storage" : {
@@ -114,7 +114,7 @@
         "transaction" :
         {
             "data" : "0x6000f1",
-            "gasLimit" : "1000",
+            "gasLimit" : "40000",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -135,7 +135,7 @@
         "pre" :
         {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000",
+                "balance" : "100000",
                 "code" : "",
                 "nonce" : "0",
                 "storage" : {
@@ -145,7 +145,7 @@
         "transaction" :
         {
             "data" : "0x600a80600c6000396000fff2ffff600160008035811a81",
-            "gasLimit" : "1000",
+            "gasLimit" : "23000",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -166,7 +166,7 @@
         "pre" :
         {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000",
+                "balance" : "100000",
                 "code" : "",
                 "nonce" : "0",
                 "storage" : {
@@ -176,7 +176,7 @@
         "transaction" :
         {
             "data" : "0x600a80600c600039600000f20000600160008035811a81",
-            "gasLimit" : "1000",
+            "gasLimit" : "23000",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -197,7 +197,7 @@
         "pre" :
         {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000",
+                "balance" : "100000",
                 "code" : "",
                 "nonce" : "0",
                 "storage" : {
@@ -207,7 +207,7 @@
         "transaction" :
         {
             "data" : "0x600a80600c6000396000f200ff600160008035811a81",
-            "gasLimit" : "1000",
+            "gasLimit" : "23000",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -245,7 +245,7 @@
         "transaction" :
         {
             "data" : "0x00",
-            "gasLimit" : "10000",
+            "gasLimit" : "40000",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -283,7 +283,7 @@
         "transaction" :
         {
             "data" : "0x00",
-            "gasLimit" : "10000",
+            "gasLimit" : "40000",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -521,7 +521,7 @@
         "transaction" :
         {
             "data" : "",
-            "gasLimit" : "5000",
+            "gasLimit" : "41000",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -560,7 +560,7 @@
         "transaction" :
         {
             "data" : "",
-            "gasLimit" : "15000",
+            "gasLimit" : "25000",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
diff --git a/stLogTestsFiller.json b/stLogTestsFiller.json
index 0f31c4c6..3b13698c 100644
--- a/stLogTestsFiller.json
+++ b/stLogTestsFiller.json
@@ -32,7 +32,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -73,7 +73,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -114,9 +114,9 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "100000",
+            "value" : "2100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "data" : ""
         }
@@ -156,7 +156,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -197,7 +197,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -238,7 +238,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -279,7 +279,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -320,7 +320,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -361,7 +361,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -402,7 +402,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -444,7 +444,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -485,7 +485,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -526,7 +526,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -567,7 +567,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -608,7 +608,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -649,7 +649,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -690,7 +690,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -731,7 +731,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -772,7 +772,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -814,7 +814,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -855,7 +855,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -896,7 +896,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -937,7 +937,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -978,7 +978,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -1019,7 +1019,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -1060,7 +1060,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -1101,7 +1101,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -1142,7 +1142,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -1184,7 +1184,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -1225,7 +1225,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -1266,7 +1266,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -1307,7 +1307,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -1348,7 +1348,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -1389,7 +1389,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -1430,7 +1430,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -1471,7 +1471,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -1512,7 +1512,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -1553,7 +1553,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -1595,7 +1595,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -1636,7 +1636,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -1677,7 +1677,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -1718,7 +1718,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -1759,7 +1759,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -1800,7 +1800,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -1841,7 +1841,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "210000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
diff --git a/stMemoryTestFiller.json b/stMemoryTestFiller.json
index e2b3b95a..f3430744 100644
--- a/stMemoryTestFiller.json
+++ b/stMemoryTestFiller.json
@@ -25,7 +25,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "1000",
+            "gasLimit" : "22000",
             "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : "10",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -1459,7 +1459,5 @@
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "data" : "0xff55883355001144bbccddffeeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
         }
-    },
-
-
+    }
 }
diff --git a/stPreCompiledContractsFiller.json b/stPreCompiledContractsFiller.json
index 7c7fd8e4..d571dfcc 100644
--- a/stPreCompiledContractsFiller.json
+++ b/stPreCompiledContractsFiller.json
@@ -378,16 +378,16 @@
          "env" : {
              "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
              "currentNumber" : "0",
-             "currentGasLimit" : "10000000",
+             "currentGasLimit" : "100000000",
              "currentDifficulty" : "256",
              "currentTimestamp" : 1,
              "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
          },
          "pre" : {
              "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                 "balance" : "20000000",
+                 "balance" : "200000000",
                  "nonce" : "0",
-                 "code" : "{ [[ 2 ]] (CALL 500 2 0x13 0 0 0 32) [[ 0 ]] (MLOAD 0)}",
+                 "code" : "{ [[ 2 ]] (CALL 20000000 2 0x13 0 0 0 32) [[ 0 ]] (MLOAD 0)}",
                  "storage": {}
              },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/stRefundTestFiller.json b/stRefundTestFiller.json
index 4809c098..9e867a50 100644
--- a/stRefundTestFiller.json
+++ b/stRefundTestFiller.json
@@ -18,7 +18,7 @@
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1000",
+                "balance" : "100000",
                 "nonce" : "0",
                 "code" : "",
                 "storage": {}
@@ -27,7 +27,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "850",
+            "gasLimit" : "22850",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "10",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -54,7 +54,7 @@
                  }
              },
              "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                 "balance" : "1000",
+                 "balance" : "100000",
                  "nonce" : "0",
                  "code" : "",
                  "storage": {}
@@ -63,7 +63,7 @@
          "transaction" : {
              "nonce" : "0",
              "gasPrice" : "1",
-             "gasLimit" : "850",
+             "gasLimit" : "22850",
              "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
              "value" : "10",
              "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -90,7 +90,7 @@
                  }
              },
              "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                 "balance" : "500",
+                 "balance" : "50000",
                  "nonce" : "0",
                  "code" : "",
                  "storage": {}
@@ -99,7 +99,7 @@
          "transaction" : {
              "nonce" : "0",
              "gasPrice" : "1",
-             "gasLimit" : "500",
+             "gasLimit" : "21000",
              "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
              "value" : "0",
              "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -126,7 +126,7 @@
                  }
              },
              "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                 "balance" : "502",
+                 "balance" : "50200",
                  "nonce" : "0",
                  "code" : "",
                  "storage": {}
@@ -135,7 +135,7 @@
          "transaction" : {
              "nonce" : "0",
              "gasPrice" : "1",
-             "gasLimit" : "502",
+             "gasLimit" : "21002",
              "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
              "value" : "0",
              "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -166,7 +166,7 @@
                  }
              },
              "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                 "balance" : "10000",
+                 "balance" : "100000",
                  "nonce" : "0",
                  "code" : "",
                  "storage": {}
@@ -175,7 +175,7 @@
          "transaction" : {
              "nonce" : "0",
              "gasPrice" : "1",
-             "gasLimit" : "10000",
+             "gasLimit" : "100000",
              "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
              "value" : "0",
              "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -206,7 +206,7 @@
                  }
              },
              "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                 "balance" : "10000",
+                 "balance" : "100000",
                  "nonce" : "0",
                  "code" : "",
                  "storage": {}
@@ -215,7 +215,7 @@
          "transaction" : {
              "nonce" : "0",
              "gasPrice" : "1",
-             "gasLimit" : "10000",
+             "gasLimit" : "100000",
              "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
              "value" : "0",
              "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -247,7 +247,7 @@
                  }
              },
              "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                 "balance" : "10000",
+                 "balance" : "100000",
                  "nonce" : "0",
                  "code" : "",
                  "storage": {}
@@ -256,7 +256,7 @@
          "transaction" : {
              "nonce" : "0",
              "gasPrice" : "1",
-             "gasLimit" : "10000",
+             "gasLimit" : "100000",
              "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
              "value" : "0",
              "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -288,7 +288,7 @@
                  }
              },
              "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                 "balance" : "10000",
+                 "balance" : "100000",
                  "nonce" : "0",
                  "code" : "",
                  "storage": {}
@@ -297,7 +297,7 @@
          "transaction" : {
              "nonce" : "0",
              "gasPrice" : "1",
-             "gasLimit" : "10000",
+             "gasLimit" : "100000",
              "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
              "value" : "0",
              "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
diff --git a/stSolidityTestFiller.json b/stSolidityTestFiller.json
index 549c5f22..948dc5f7 100644
--- a/stSolidityTestFiller.json
+++ b/stSolidityTestFiller.json
@@ -278,7 +278,7 @@
         {
 	    "//" : "run()",
             "data" : "0xc0406226",
-            "gasLimit" : "15000",
+            "gasLimit" : "35000",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -333,7 +333,7 @@
         {
 	    "//" : "testRecursiveMethods()",
             "data" : "0x981a3165",
-            "gasLimit" : "2000",
+            "gasLimit" : "25000",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -378,7 +378,7 @@
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "500",
+                "balance" : "50000",
                 "nonce" : "0",
                 "code" : "",
                 "storage": {}
@@ -388,7 +388,7 @@
         {
 	    "//" : "testInfiniteLoop()",
             "data" : "0x296df0df",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -463,7 +463,7 @@
         {
 	    "//" : "run(uint256)",
             "data" : "0xa444f5e900000000000000000000000000000000000000000000000000000000000204",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -508,7 +508,7 @@
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "500",
+                "balance" : "50000",
                 "nonce" : "0",
                 "code" : "",
                 "storage": {}
@@ -518,7 +518,7 @@
         {
 	    "//" : "run()",
             "data" : "0xc0406226",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
diff --git a/stSpecialTestFiller.json b/stSpecialTestFiller.json
index d01072b4..223d9f75 100644
--- a/stSpecialTestFiller.json
+++ b/stSpecialTestFiller.json
@@ -22,7 +22,7 @@
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1000",
+                "balance" : "100000",
                 "nonce" : "0",
                 "code" : "",
                 "storage": {}
@@ -31,7 +31,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "850",
+            "gasLimit" : "22850",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "10",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
diff --git a/stSystemOperationsTestFiller.json b/stSystemOperationsTestFiller.json
index 3b08ca67..7460ca94 100644
--- a/stSystemOperationsTestFiller.json
+++ b/stSystemOperationsTestFiller.json
@@ -25,7 +25,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -60,7 +60,7 @@
         },
         "transaction" : {
             "data" : "",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -95,7 +95,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -129,7 +129,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -163,7 +163,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -197,7 +197,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -232,7 +232,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -257,7 +257,7 @@
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1000",
+                "balance" : "100000",
                 "nonce" : "0",
                 "code" : "",
                 "storage": {}
@@ -266,7 +266,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -300,7 +300,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -334,7 +334,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -368,7 +368,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -410,7 +410,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -452,7 +452,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -494,7 +494,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -536,7 +536,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -578,7 +578,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -619,7 +619,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -660,7 +660,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -701,7 +701,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -743,7 +743,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -785,7 +785,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -827,7 +827,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -870,7 +870,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -911,7 +911,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -952,7 +952,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -993,7 +993,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -1035,7 +1035,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -1076,7 +1076,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "10000",
+            "gasLimit" : "30000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
diff --git a/stTransactionTestFiller.json b/stTransactionTestFiller.json
index 6b50774e..1299e6d9 100644
--- a/stTransactionTestFiller.json
+++ b/stTransactionTestFiller.json
@@ -52,7 +52,7 @@
         "transaction" :
         {
             "data" : "",
-            "gasLimit" : "500",
+            "gasLimit" : "21000",
             "gasPrice" : "1",
             "nonce" : "",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -84,7 +84,7 @@
         "transaction" :
         {
             "data" : "",
-            "gasLimit" : "5000",
+            "gasLimit" : "25000",
             "gasPrice" : "1",
             "nonce" : "",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -116,7 +116,7 @@
         "transaction" :
         {
             "data" : "",
-            "gasLimit" : "5000",
+            "gasLimit" : "25000",
             "gasPrice" : "1",
             "nonce" : "",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -138,7 +138,7 @@
         "pre" :
         {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1101",
+                "balance" : "22000",
                 "code" : "",
                 "nonce" : "0",
                 "storage" : {
@@ -148,12 +148,12 @@
         "transaction" :
         {
             "data" : "",
-            "gasLimit" : "600",
+            "gasLimit" : "21600",
             "gasPrice" : "1",
             "nonce" : "",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "502"
+            "value" : "5000"
         }
     },
 
@@ -170,7 +170,7 @@
         "pre" :
         {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1000",
+                "balance" : "22000",
                 "code" : "",
                 "nonce" : "0",
                 "storage" : {
@@ -180,20 +180,20 @@
         "transaction" :
         {
             "data" : "",
-            "gasLimit" : "600",
+            "gasLimit" : "21600",
             "gasPrice" : "1",
             "nonce" : "",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "502"
+            "value" : "5000"
         }
     },
 
     "InternalCallHittingGasLimit" : {
         "env" : {
-            "currentCoinbase" : "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "2adf5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "45678256",
-            "currentGasLimit" : "1100",
+            "currentGasLimit" : "22000",
             "currentNumber" : "0",
             "currentTimestamp" : 1,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
@@ -227,7 +227,7 @@
         "transaction" :
         {
             "data" : "",
-            "gasLimit" : "1100",
+            "gasLimit" : "21100",
             "gasPrice" : "1",
             "nonce" : "",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -240,7 +240,7 @@
         "env" : {
             "currentCoinbase" : "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "45678256",
-            "currentGasLimit" : "1100",
+            "currentGasLimit" : "21100",
             "currentNumber" : "0",
             "currentTimestamp" : 1,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
@@ -258,7 +258,7 @@
         "transaction" :
         {
             "data" : "",
-            "gasLimit" : "1100",
+            "gasLimit" : "21100",
             "gasPrice" : "1",
             "nonce" : "",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -271,7 +271,7 @@
         "env" : {
             "currentCoinbase" : "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "45678256",
-            "currentGasLimit" : "1100",
+            "currentGasLimit" : "21100",
             "currentNumber" : "0",
             "currentTimestamp" : 1,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
@@ -289,7 +289,7 @@
         "transaction" :
         {
             "data" : "",
-            "gasLimit" : "1101",
+            "gasLimit" : "21101",
             "gasPrice" : "1",
             "nonce" : "",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -302,7 +302,7 @@
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "45678256",
-            "currentGasLimit" : "10000",
+            "currentGasLimit" : "10000000",
             "currentNumber" : "0",
             "currentTimestamp" : 1,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
@@ -310,7 +310,7 @@
         "pre" :
         {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "7000",
+                "balance" : "140000",
                 "code" : "",
                 "nonce" : "0",
                 "storage" : {
@@ -339,7 +339,7 @@
         "transaction" :
         {
             "data" : "",
-            "gasLimit" : "600",
+            "gasLimit" : "130000",
             "gasPrice" : "1",
             "nonce" : "",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -352,7 +352,7 @@
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "45678256",
-            "currentGasLimit" : "10000",
+            "currentGasLimit" : "100000",
             "currentNumber" : "0",
             "currentTimestamp" : 1,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
@@ -360,7 +360,7 @@
         "pre" :
         {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "7000",
+                "balance" : "30000",
                 "code" : "",
                 "nonce" : "0",
                 "storage" : {
@@ -389,7 +389,7 @@
         "transaction" :
         {
             "data" : "",
-            "gasLimit" : "600",
+            "gasLimit" : "21100",
             "gasPrice" : "1",
             "nonce" : "",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -402,7 +402,7 @@
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "45678256",
-            "currentGasLimit" : "10000",
+            "currentGasLimit" : "1000000",
             "currentNumber" : "0",
             "currentTimestamp" : 1,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
@@ -410,7 +410,7 @@
         "pre" :
         {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "7000",
+                "balance" : "22000",
                 "code" : "",
                 "nonce" : "0",
                 "storage" : {
@@ -449,7 +449,7 @@
         "transaction" :
         {
             "data" : "",
-            "gasLimit" : "700",
+            "gasLimit" : "21100",
             "gasPrice" : "1",
             "nonce" : "",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -462,7 +462,7 @@
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "45678256",
-            "currentGasLimit" : "10000",
+            "currentGasLimit" : "10000000",
             "currentNumber" : "0",
             "currentTimestamp" : 1,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
@@ -470,7 +470,7 @@
         "pre" :
         {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "7000",
+                "balance" : "500000",
                 "code" : "",
                 "nonce" : "0",
                 "storage" : {
@@ -514,7 +514,7 @@
         "transaction" :
         {
             "data" : "",
-            "gasLimit" : "700",
+            "gasLimit" : "23000",
             "gasPrice" : "1",
             "nonce" : "",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -527,7 +527,7 @@
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "45678256",
-            "currentGasLimit" : "10000",
+            "currentGasLimit" : "1000000",
             "currentNumber" : "0",
             "currentTimestamp" : 1,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
@@ -535,7 +535,7 @@
         "pre" :
         {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "7000",
+                "balance" : "100000",
                 "code" : "",
                 "nonce" : "0",
                 "storage" : {
@@ -544,7 +544,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10",
-                "code" : "{(CALL 0 0 1 0 0 0 0) (SUICIDE 0)}",
+                "code" : "{(CALL 20000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -552,7 +552,7 @@
 
             "0000000000000000000000000000000000000000" : {
                 "balance" : "0",
-                "code" : "{(SUICIDE 1)}",
+                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -563,7 +563,7 @@
         "transaction" :
         {
             "data" : "",
-            "gasLimit" : "700",
+            "gasLimit" : "50000",
             "gasPrice" : "1",
             "nonce" : "",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -576,7 +576,7 @@
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "45678256",
-            "currentGasLimit" : "10000",
+            "currentGasLimit" : "10000000",
             "currentNumber" : "0",
             "currentTimestamp" : 1,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
@@ -584,7 +584,7 @@
         "pre" :
         {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "7000",
+                "balance" : "100000",
                 "code" : "",
                 "nonce" : "0",
                 "storage" : {
@@ -592,8 +592,8 @@
             },
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10",
-                "code" : "{(CALL 20 0 1 0 0 0 0) (SUICIDE 0)}",
+                "balance" : "1000",
+                "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -601,7 +601,7 @@
 
             "0000000000000000000000000000000000000000" : {
                 "balance" : "0",
-                "code" : "{(SUICIDE 1)}",
+                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -612,7 +612,7 @@
         "transaction" :
         {
             "data" : "",
-            "gasLimit" : "700",
+            "gasLimit" : "50000",
             "gasPrice" : "1",
             "nonce" : "",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -633,7 +633,7 @@
         "pre" :
         {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "7000",
+                "balance" : "122000",
                 "code" : "",
                 "nonce" : "0",
                 "storage" : {
@@ -642,7 +642,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10000",
-                "code" : "{(SUICIDE 0) (CALL 0 2000 0 0 0 0 0) }",
+                "code" : "{(SUICIDE 0) (CALL 2000 0x0000000000000000000000000000000000000000 0 0 0 0 0) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -650,7 +650,7 @@
 
             "0000000000000000000000000000000000000000" : {
                 "balance" : "1110",
-                "code" : "{(SUICIDE 1)}",
+                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -660,7 +660,7 @@
         "transaction" :
         {
             "data" : "",
-            "gasLimit" : "3700",
+            "gasLimit" : "33700",
             "gasPrice" : "1",
             "nonce" : "",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -673,7 +673,7 @@
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "45678256",
-            "currentGasLimit" : "10000",
+            "currentGasLimit" : "1000000",
             "currentNumber" : "0",
             "currentTimestamp" : 1,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
@@ -681,7 +681,7 @@
         "pre" :
         {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "7000",
+                "balance" : "122000",
                 "code" : "",
                 "nonce" : "0",
                 "storage" : {
@@ -700,7 +700,7 @@
         "transaction" :
         {
             "data" : "",
-            "gasLimit" : "1700",
+            "gasLimit" : "31700",
             "gasPrice" : "1",
             "nonce" : "",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -713,7 +713,7 @@
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "45678256",
-            "currentGasLimit" : "10000",
+            "currentGasLimit" : "1000000",
             "currentNumber" : "0",
             "currentTimestamp" : 1,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
@@ -721,7 +721,7 @@
         "pre" :
         {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "7000",
+                "balance" : "22000",
                 "code" : "",
                 "nonce" : "0",
                 "storage" : {
@@ -740,7 +740,7 @@
         "transaction" :
         {
             "data" : "",
-            "gasLimit" : "1700",
+            "gasLimit" : "21700",
             "gasPrice" : "1",
             "nonce" : "",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -771,7 +771,7 @@
         "transaction" :
         {
             "data" : "",
-            "gasLimit" : "1000",
+            "gasLimit" : "22000",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -784,7 +784,7 @@
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
-            "currentGasLimit" : "1000000",
+            "currentGasLimit" : "100000000",
             "currentNumber" : "0",
             "currentTimestamp" : 1,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
@@ -802,7 +802,7 @@
         "transaction" :
         {
             "data" : "",
-            "gasLimit" : "1000",
+            "gasLimit" : "22000",
             "gasPrice" : "1",
             "nonce" : "10",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -815,7 +815,7 @@
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
-            "currentGasLimit" : "1000000",
+            "currentGasLimit" : "10000000",
             "currentNumber" : "0",
             "currentTimestamp" : 1,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
@@ -833,7 +833,7 @@
         "transaction" :
         {
             "data" : "0x00000000000000000000112233445566778f32",
-            "gasLimit" : "1000",
+            "gasLimit" : "22000",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -846,7 +846,7 @@
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
-            "currentGasLimit" : "1000000",
+            "currentGasLimit" : "10000000",
             "currentNumber" : "0",
             "currentTimestamp" : 1,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
@@ -854,7 +854,7 @@
         "pre" :
         {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "3000",
+                "balance" : "43000",
                 "code" : "",
                 "nonce" : "0",
                 "storage" : {
@@ -864,7 +864,7 @@
         "transaction" :
         {
             "data" : "",
-            "gasLimit" : "5100",
+            "gasLimit" : "35100",
             "gasPrice" : "0",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -877,7 +877,7 @@
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
-            "currentGasLimit" : "1000000",
+            "currentGasLimit" : "100000000",
             "currentNumber" : "0",
             "currentTimestamp" : 1,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
@@ -885,7 +885,7 @@
         "pre" :
         {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "3000",
+                "balance" : "33000",
                 "code" : "",
                 "nonce" : "0",
                 "storage" : {
@@ -908,7 +908,7 @@
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
-            "currentGasLimit" : "1000000",
+            "currentGasLimit" : "10000000",
             "currentNumber" : "0",
             "currentTimestamp" : 1,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
@@ -916,7 +916,7 @@
         "pre" :
         {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "3000",
+                "balance" : "33000",
                 "code" : "",
                 "nonce" : "0",
                 "storage" : {
@@ -926,8 +926,8 @@
         "transaction" :
         {
             "data" : "0x3240349548983454",
-            "gasLimit" : "500",
-            "gasPrice" : "0",
+            "gasLimit" : "32600",
+            "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -999,7 +999,7 @@
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "900"
+            "value" : ""
         }
     },
 
@@ -1048,7 +1048,7 @@
         "pre" :
         {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "100000",
+                "balance" : "1000000",
                 "code" : "",
                 "nonce" : "0",
                 "storage" : {
@@ -1058,7 +1058,7 @@
         "transaction" :
         {
             "data" : "",
-            "gasLimit" : "1000",
+            "gasLimit" : "22000",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -1079,7 +1079,7 @@
         "pre" :
         {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000",
+                "balance" : "132000",
                 "code" : "",
                 "nonce" : "0",
                 "storage" : {
@@ -1089,7 +1089,7 @@
         "transaction" :
         {
             "data" : "0x602280600c6000396000f30060e060020a600035048063f8a8fd6d14601457005b601a6020565b60006000f35b56",
-            "gasLimit" : "882",
+            "gasLimit" : "25000",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -1110,7 +1110,7 @@
         "pre" :
         {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000",
+                "balance" : "100000",
                 "code" : "",
                 "nonce" : "0",
                 "storage" : {
@@ -1120,7 +1120,7 @@
         "transaction" :
         {
             "data" : "0x602280600c6000396000f30060e060020a600035048063f8a8fd6d14601457005b601a6020565b60006000f35b56",
-            "gasLimit" : "883",
+            "gasLimit" : "70000",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -1141,7 +1141,7 @@
         "pre" :
         {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000",
+                "balance" : "30000",
                 "code" : "",
                 "nonce" : "0",
                 "storage" : {
@@ -1159,7 +1159,7 @@
         "transaction" :
         {
             "data" : "",
-            "gasLimit" : "882",
+            "gasLimit" : "21882",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
diff --git a/state.cpp b/state.cpp
index 17ebe2b7..5202aff2 100644
--- a/state.cpp
+++ b/state.cpp
@@ -65,6 +65,7 @@ void doStateTests(json_spirit::mValue& v, bool _fillin)
 		catch (Exception const& _e)
 		{
 			cnote << "state execution did throw an exception: " << diagnostic_information(_e);
+			theState.commit();
 		}
 		catch (std::exception const& _e)
 		{
@@ -72,7 +73,13 @@ void doStateTests(json_spirit::mValue& v, bool _fillin)
 		}
 
 		if (_fillin)
+		{
+#if ETH_FATDB
 			importer.exportTest(output, theState);
+#else
+			BOOST_THROW_EXCEPTION(Exception() << errinfo_comment("You can not fill tests when FATDB is switched off"));
+#endif
+		}
 		else
 		{
 			BOOST_REQUIRE(o.count("post") > 0);
@@ -85,6 +92,7 @@ void doStateTests(json_spirit::mValue& v, bool _fillin)
 			checkLog(theState.pending().size() ? theState.log(0) : LogEntries(), importer.m_environment.sub.logs);
 
 			// check addresses
+#if ETH_FATDB
 			auto expectedAddrs = importer.m_statePost.addresses();
 			auto resultAddrs = theState.addresses();
 			for (auto& expectedPair : expectedAddrs)
@@ -103,6 +111,8 @@ void doStateTests(json_spirit::mValue& v, bool _fillin)
 				}
 			}
 			checkAddresses<map<Address, u256> >(expectedAddrs, resultAddrs);
+#endif
+			BOOST_CHECK_MESSAGE(theState.rootHash() == h256(o["postStateRoot"].get_str()), "wrong post state root");
 		}
 	}
 }
@@ -162,50 +172,51 @@ BOOST_AUTO_TEST_CASE(stBlockHashTest)
 
 BOOST_AUTO_TEST_CASE(stQuadraticComplexityTest)
 {
-	for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
-	{
-		string arg = boost::unit_test::framework::master_test_suite().argv[i];
-		if (arg == "--quadratic" || arg == "--all")
-		{
-			auto start = chrono::steady_clock::now();
-
-			dev::test::executeTests("stQuadraticComplexityTest", "/StateTests", dev::test::doStateTests);
-
-			auto end = chrono::steady_clock::now();
-			auto duration(chrono::duration_cast<chrono::milliseconds>(end - start));
-			cnote << "test duration: " << duration.count() << " milliseconds.\n";
-		}
-	}
+	   for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
+	   {
+			   string arg = boost::unit_test::framework::master_test_suite().argv[i];
+			   if (arg == "--quadratic" || arg == "--all")
+			   {
+					   auto start = chrono::steady_clock::now();
+
+					   dev::test::executeTests("stQuadraticComplexityTest", "/StateTests", dev::test::doStateTests);
+
+					   auto end = chrono::steady_clock::now();
+					   auto duration(chrono::duration_cast<chrono::milliseconds>(end - start));
+					   cnote << "test duration: " << duration.count() << " milliseconds.\n";
+			   }
+	   }
 }
 
 BOOST_AUTO_TEST_CASE(stMemoryStressTest)
 {
-	for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
-	{
-		string arg = boost::unit_test::framework::master_test_suite().argv[i];
-		if (arg == "--memory" || arg == "--all")
-		{
-			auto start = chrono::steady_clock::now();
-
-			dev::test::executeTests("stMemoryStressTest", "/StateTests", dev::test::doStateTests);
-
-			auto end = chrono::steady_clock::now();
-			auto duration(chrono::duration_cast<chrono::milliseconds>(end - start));
-			cnote << "test duration: " << duration.count() << " milliseconds.\n";
-		}
-	}
+	   for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
+	   {
+			   string arg = boost::unit_test::framework::master_test_suite().argv[i];
+			   if (arg == "--memory" || arg == "--all")
+			   {
+					   auto start = chrono::steady_clock::now();
+
+					   dev::test::executeTests("stMemoryStressTest", "/StateTests", dev::test::doStateTests);
+
+					   auto end = chrono::steady_clock::now();
+					   auto duration(chrono::duration_cast<chrono::milliseconds>(end - start));
+					   cnote << "test duration: " << duration.count() << " milliseconds.\n";
+			   }
+	   }
 }
 
-BOOST_AUTO_TEST_CASE(stSolidityTest)
-{
-	dev::test::executeTests("stSolidityTest", "/StateTests", dev::test::doStateTests);
-}
+ BOOST_AUTO_TEST_CASE(stSolidityTest)
+ {
+		dev::test::executeTests("stSolidityTest", "/StateTests", dev::test::doStateTests);
+ }
 
 BOOST_AUTO_TEST_CASE(stMemoryTest)
 {
-	dev::test::executeTests("stMemoryTest", "/StateTests", dev::test::doStateTests);
+	   dev::test::executeTests("stMemoryTest", "/StateTests", dev::test::doStateTests);
 }
 
+
 BOOST_AUTO_TEST_CASE(stCreateTest)
 {
 	for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
diff --git a/stateOriginal.cpp b/stateOriginal.cpp
index 65ff5084..5b7b0415 100644
--- a/stateOriginal.cpp
+++ b/stateOriginal.cpp
@@ -20,6 +20,7 @@
  * State test functions.
  */
 
+#include <boost/test/unit_test.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <secp256k1/secp256k1.h>
 #include <libethereum/CanonBlockChain.h>
@@ -29,7 +30,21 @@ using namespace std;
 using namespace dev;
 using namespace dev::eth;
 
-int stateTest()
+namespace dev
+{
+namespace test
+{
+
+int stateTest();
+
+BOOST_AUTO_TEST_SUITE(StateIntegration)
+
+BOOST_AUTO_TEST_CASE(Basic)
+{
+	State s;
+}
+
+BOOST_AUTO_TEST_CASE(Complex)
 {
 	cnote << "Testing State...";
 
@@ -37,14 +52,15 @@ int stateTest()
 	KeyPair myMiner = sha3("Gav's Miner");
 //	KeyPair you = sha3("123");
 
-	Defaults::setDBPath(boost::filesystem::temp_directory_path().string());
+	Defaults::setDBPath(boost::filesystem::temp_directory_path().string() + "/" + toString(chrono::system_clock::now().time_since_epoch().count()));
 
 	OverlayDB stateDB = State::openDB();
 	CanonBlockChain bc;
-	State s(myMiner.address(), stateDB);
-
 	cout << bc;
 
+	State s(myMiner.address(), stateDB);
+	cout << s;
+
 	// Sync up - this won't do much until we use the last state.
 	s.sync(bc);
 
@@ -52,7 +68,7 @@ int stateTest()
 
 	// Mine to get some ether!
 	s.commitToMine(bc);
-	while (!s.mine(100).completed) {}
+	while (!s.mine(100, true).completed) {}
 	s.completeMine();
 	bc.attemptImport(s.blockData(), stateDB);
 
@@ -65,7 +81,7 @@ int stateTest()
 	// Inject a transaction to transfer funds from miner to me.
 	bytes tx;
 	{
-		Transaction t(1000, 0, 0, me.address(), bytes(), s.transactionsFrom(myMiner.address()), myMiner.secret());
+		Transaction t(1000, 10000, 10000, me.address(), bytes(), s.transactionsFrom(myMiner.address()), myMiner.secret());
 		assert(t.sender() == myMiner.address());
 		tx = t.rlp();
 	}
@@ -76,7 +92,7 @@ int stateTest()
 	// Mine to get some ether and set in stone.
 	s.commitToMine(bc);
 	s.commitToMine(bc);
-	while (!s.mine(50).completed) { s.commitToMine(bc); }
+	while (!s.mine(100, true).completed) {}
 	s.completeMine();
 	bc.attemptImport(s.blockData(), stateDB);
 
@@ -85,7 +101,9 @@ int stateTest()
 	s.sync(bc);
 
 	cout << s;
-
-	return 0;
 }
 
+BOOST_AUTO_TEST_SUITE_END()
+
+}
+}
diff --git a/trie.cpp b/trie.cpp
index dd335b4a..9e59dd31 100644
--- a/trie.cpp
+++ b/trie.cpp
@@ -50,8 +50,92 @@ static unsigned fac(unsigned _i)
 }
 }
 
+using dev::operator <<;
+
 BOOST_AUTO_TEST_SUITE(TrieTests)
 
+BOOST_AUTO_TEST_CASE(fat_trie)
+{
+	h256 r;
+	MemoryDB fm;
+	{
+		FatGenericTrieDB<MemoryDB> ft(&fm);
+		ft.init();
+		ft.insert(h256("69", h256::FromHex, h256::AlignRight).ref(), h256("414243", h256::FromHex, h256::AlignRight).ref());
+		for (auto i: ft)
+			cnote << i.first << i.second;
+		r = ft.root();
+	}
+	{
+		FatGenericTrieDB<MemoryDB> ft(&fm);
+		ft.setRoot(r);
+		for (auto i: ft)
+			cnote << i.first << i.second;
+	}
+}
+
+BOOST_AUTO_TEST_CASE(hex_encoded_securetrie_test)
+{
+	string testPath = test::getTestPath();
+
+	testPath += "/TrieTests";
+
+	cnote << "Testing Secure Trie...";
+	js::mValue v;
+	string s = asString(contents(testPath + "/hex_encoded_securetrie_test.json"));
+	BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'hex_encoded_securetrie_test.json' is empty. Have you cloned the 'tests' repo branch develop?");
+	js::read_string(s, v);
+	for (auto& i: v.get_obj())
+	{
+		cnote << i.first;
+		js::mObject& o = i.second.get_obj();
+		vector<pair<string, string>> ss;
+		for (auto i: o["in"].get_obj())
+		{
+			ss.push_back(make_pair(i.first, i.second.get_str()));
+			if (!ss.back().first.find("0x"))
+				ss.back().first = asString(fromHex(ss.back().first.substr(2)));
+			if (!ss.back().second.find("0x"))
+				ss.back().second = asString(fromHex(ss.back().second.substr(2)));
+		}
+		for (unsigned j = 0; j < min(1000000000u, dev::test::fac((unsigned)ss.size())); ++j)
+		{
+			next_permutation(ss.begin(), ss.end());
+			MemoryDB m;
+			GenericTrieDB<MemoryDB> t(&m);
+			MemoryDB hm;
+			HashedGenericTrieDB<MemoryDB> ht(&hm);
+			MemoryDB fm;
+			FatGenericTrieDB<MemoryDB> ft(&fm);
+			t.init();
+			ht.init();
+			ft.init();
+			BOOST_REQUIRE(t.check(true));
+			BOOST_REQUIRE(ht.check(true));
+			BOOST_REQUIRE(ft.check(true));
+			for (auto const& k: ss)
+			{
+				t.insert(k.first, k.second);
+				ht.insert(k.first, k.second);
+				ft.insert(k.first, k.second);
+				BOOST_REQUIRE(t.check(true));
+				BOOST_REQUIRE(ht.check(true));
+				BOOST_REQUIRE(ft.check(true));
+				for (auto i = ft.begin(), j = t.begin(); i != ft.end() && j != t.end(); ++i, ++j)
+				{
+					BOOST_CHECK_EQUAL(i == ft.end(), j == t.end());
+					BOOST_REQUIRE((*i).first.toBytes() == (*j).first.toBytes());
+					BOOST_REQUIRE((*i).second.toBytes() == (*j).second.toBytes());
+				}
+				BOOST_CHECK_EQUAL(ht.root(), ft.root());
+			}
+			BOOST_REQUIRE(!o["root"].is_null());
+			BOOST_CHECK_EQUAL(o["root"].get_str(), "0x" + toHex(ht.root().asArray()));
+			BOOST_CHECK_EQUAL(o["root"].get_str(), "0x" + toHex(ft.root().asArray()));
+		}
+	}
+}
+
 BOOST_AUTO_TEST_CASE(trie_test_anyorder)
 {
 	string testPath = test::getTestPath();
@@ -81,15 +165,35 @@ BOOST_AUTO_TEST_CASE(trie_test_anyorder)
 			next_permutation(ss.begin(), ss.end());
 			MemoryDB m;
 			GenericTrieDB<MemoryDB> t(&m);
+			MemoryDB hm;
+			HashedGenericTrieDB<MemoryDB> ht(&hm);
+			MemoryDB fm;
+			FatGenericTrieDB<MemoryDB> ft(&fm);
 			t.init();
+			ht.init();
+			ft.init();
 			BOOST_REQUIRE(t.check(true));
+			BOOST_REQUIRE(ht.check(true));
+			BOOST_REQUIRE(ft.check(true));
 			for (auto const& k: ss)
 			{
 				t.insert(k.first, k.second);
+				ht.insert(k.first, k.second);
+				ft.insert(k.first, k.second);
 				BOOST_REQUIRE(t.check(true));
+				BOOST_REQUIRE(ht.check(true));
+				BOOST_REQUIRE(ft.check(true));
+				for (auto i = ft.begin(), j = t.begin(); i != ft.end() && j != t.end(); ++i, ++j)
+				{
+					BOOST_CHECK_EQUAL(i == ft.end(), j == t.end());
+					BOOST_REQUIRE((*i).first.toBytes() == (*j).first.toBytes());
+					BOOST_REQUIRE((*i).second.toBytes() == (*j).second.toBytes());
+				}
+				BOOST_CHECK_EQUAL(ht.root(), ft.root());
 			}
 			BOOST_REQUIRE(!o["root"].is_null());
 			BOOST_CHECK_EQUAL(o["root"].get_str(), "0x" + toHex(t.root().asArray()));
+			BOOST_CHECK_EQUAL(ht.root(), ft.root());
 		}
 	}
 }
@@ -141,15 +245,33 @@ BOOST_AUTO_TEST_CASE(trie_tests_ordered)
 
 		MemoryDB m;
 		GenericTrieDB<MemoryDB> t(&m);
+		MemoryDB hm;
+		HashedGenericTrieDB<MemoryDB> ht(&hm);
+		MemoryDB fm;
+		FatGenericTrieDB<MemoryDB> ft(&fm);
 		t.init();
+		ht.init();
+		ft.init();
 		BOOST_REQUIRE(t.check(true));
+		BOOST_REQUIRE(ht.check(true));
+		BOOST_REQUIRE(ft.check(true));
+
 		for (auto const& k: ss)
 		{
 			if (find(keysToBeDeleted.begin(), keysToBeDeleted.end(), k.first) != keysToBeDeleted.end() && k.second.empty())
-				t.remove(k.first);
+				t.remove(k.first), ht.remove(k.first), ft.remove(k.first);
 			else
-				t.insert(k.first, k.second);
+				t.insert(k.first, k.second), ht.insert(k.first, k.second), ft.insert(k.first, k.second);
 			BOOST_REQUIRE(t.check(true));
+			BOOST_REQUIRE(ht.check(true));
+			BOOST_REQUIRE(ft.check(true));
+			for (auto i = ft.begin(), j = t.begin(); i != ft.end() && j != t.end(); ++i, ++j)
+			{
+				BOOST_CHECK_EQUAL(i == ft.end(), j == t.end());
+				BOOST_REQUIRE((*i).first.toBytes() == (*j).first.toBytes());
+				BOOST_REQUIRE((*i).second.toBytes() == (*j).second.toBytes());
+			}
+			BOOST_CHECK_EQUAL(ht.root(), ft.root());
 		}
 
 		BOOST_REQUIRE(!o["root"].is_null());
diff --git a/vm.cpp b/vm.cpp
index e78753e6..eb7c174e 100644
--- a/vm.cpp
+++ b/vm.cpp
@@ -533,33 +533,33 @@ BOOST_AUTO_TEST_CASE(vmPerformanceTest)
 	}
 }
 
-BOOST_AUTO_TEST_CASE(vmInputLimitsTest1)
-{
-	for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
-	{
-		string arg = boost::unit_test::framework::master_test_suite().argv[i];
-		if (arg == "--inputlimits" || arg == "--all")
-		{
-			auto start = chrono::steady_clock::now();
-
-			dev::test::executeTests("vmInputLimitsTest1", "/VMTests", dev::test::doVMTests);
-
-			auto end = chrono::steady_clock::now();
-			auto duration(chrono::duration_cast<chrono::milliseconds>(end - start));
-			cnote << "test duration: " << duration.count() << " milliseconds.\n";
-		}
-	}
-}
-
-BOOST_AUTO_TEST_CASE(vmInputLimitsTest2)
-{
-	for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
-	{
-		string arg = boost::unit_test::framework::master_test_suite().argv[i];
-		if (arg == "--inputlimits" || arg == "--all")
-			dev::test::executeTests("vmInputLimitsTest2", "/VMTests", dev::test::doVMTests);
-	}
-}
+//BOOST_AUTO_TEST_CASE(vmInputLimitsTest1)
+//{
+//	for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
+//	{
+//		string arg = boost::unit_test::framework::master_test_suite().argv[i];
+//		if (arg == "--inputlimits" || arg == "--all")
+//		{
+//			auto start = chrono::steady_clock::now();
+
+//			dev::test::executeTests("vmInputLimitsTest1", "/VMTests", dev::test::doVMTests);
+
+//			auto end = chrono::steady_clock::now();
+//			auto duration(chrono::duration_cast<chrono::milliseconds>(end - start));
+//			cnote << "test duration: " << duration.count() << " milliseconds.\n";
+//		}
+//	}
+//}
+
+//BOOST_AUTO_TEST_CASE(vmInputLimitsTest2)
+//{
+//	for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
+//	{
+//		string arg = boost::unit_test::framework::master_test_suite().argv[i];
+//		if (arg == "--inputlimits" || arg == "--all")
+//			dev::test::executeTests("vmInputLimitsTest2", "/VMTests", dev::test::doVMTests);
+//	}
+//}
 
 BOOST_AUTO_TEST_CASE(vmRandom)
 {
diff --git a/vm.h b/vm.h
index f27bce50..1c0190b6 100644
--- a/vm.h
+++ b/vm.h
@@ -52,6 +52,7 @@ public:
 
 	virtual u256 store(u256 _n) override { return std::get<2>(addresses[myAddress])[_n]; }
 	virtual void setStore(u256 _n, u256 _v) override { std::get<2>(addresses[myAddress])[_n] = _v; }
+	virtual bool exists(Address _a) override { return !!addresses.count(_a); }
 	virtual u256 balance(Address _a) override { return std::get<0>(addresses[_a]); }
 	virtual void subBalance(u256 _a) override { std::get<0>(addresses[myAddress]) -= _a; }
 	virtual u256 txCount(Address _a) override { return std::get<1>(addresses[_a]); }
diff --git a/vmArithmeticTestFiller.json b/vmArithmeticTestFiller.json
index 1484de19..933df72d 100644
--- a/vmArithmeticTestFiller.json
+++ b/vmArithmeticTestFiller.json
@@ -23,7 +23,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -51,7 +51,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -79,7 +79,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -107,7 +107,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -135,7 +135,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -163,7 +163,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -192,7 +192,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -221,7 +221,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -249,7 +249,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -277,7 +277,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -305,7 +305,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -333,7 +333,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -361,7 +361,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -389,7 +389,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -417,7 +417,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -445,7 +445,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -473,7 +473,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -501,7 +501,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -529,7 +529,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -557,7 +557,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -585,7 +585,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -613,7 +613,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -641,7 +641,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -669,7 +669,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -697,7 +697,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -725,7 +725,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -753,7 +753,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -781,7 +781,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -809,7 +809,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -837,7 +837,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -865,7 +865,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -893,7 +893,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -921,7 +921,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1005,7 +1005,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1033,7 +1033,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1061,7 +1061,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1089,7 +1089,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1117,7 +1117,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1145,7 +1145,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1173,7 +1173,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1201,7 +1201,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1229,7 +1229,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1257,7 +1257,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1369,7 +1369,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1397,7 +1397,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1537,7 +1537,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1565,7 +1565,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1593,7 +1593,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1621,7 +1621,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1649,7 +1649,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1677,7 +1677,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1705,7 +1705,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1733,7 +1733,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1762,7 +1762,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1790,7 +1790,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1930,7 +1930,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1958,7 +1958,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1986,7 +1986,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2014,7 +2014,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2042,7 +2042,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2070,7 +2070,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2098,7 +2098,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2126,7 +2126,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2154,7 +2154,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2183,7 +2183,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2211,7 +2211,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2239,7 +2239,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2267,7 +2267,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2295,7 +2295,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2323,7 +2323,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2351,7 +2351,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2379,7 +2379,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2407,7 +2407,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2435,7 +2435,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2463,7 +2463,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2491,7 +2491,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2519,7 +2519,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2547,7 +2547,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2575,7 +2575,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2603,7 +2603,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2631,7 +2631,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2659,7 +2659,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2687,7 +2687,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2715,7 +2715,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2743,7 +2743,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2771,7 +2771,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2799,7 +2799,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2827,7 +2827,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2855,7 +2855,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2883,7 +2883,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2911,7 +2911,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2939,7 +2939,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2967,7 +2967,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2995,7 +2995,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3023,7 +3023,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3051,7 +3051,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3079,7 +3079,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3107,7 +3107,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3135,7 +3135,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3163,7 +3163,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3191,7 +3191,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3219,7 +3219,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3247,7 +3247,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3275,7 +3275,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3303,7 +3303,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3331,7 +3331,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3359,7 +3359,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3387,7 +3387,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3415,7 +3415,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3443,7 +3443,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3471,7 +3471,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3499,7 +3499,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3527,7 +3527,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3555,7 +3555,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3583,7 +3583,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3611,7 +3611,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3639,7 +3639,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3667,7 +3667,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3695,7 +3695,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3723,7 +3723,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3751,7 +3751,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3779,7 +3779,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3807,7 +3807,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3835,7 +3835,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3863,7 +3863,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3891,7 +3891,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3919,7 +3919,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3947,7 +3947,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3975,7 +3975,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4003,7 +4003,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4031,7 +4031,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4059,7 +4059,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4087,7 +4087,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4115,7 +4115,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4143,7 +4143,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4171,7 +4171,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4199,7 +4199,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4227,7 +4227,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4255,7 +4255,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4283,7 +4283,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4311,7 +4311,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4339,7 +4339,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4367,7 +4367,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4395,7 +4395,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4423,7 +4423,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4451,7 +4451,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4479,7 +4479,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4507,7 +4507,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4535,7 +4535,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4563,7 +4563,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4591,7 +4591,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4619,7 +4619,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4647,7 +4647,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4675,7 +4675,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4703,7 +4703,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4731,7 +4731,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4759,7 +4759,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4787,7 +4787,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4815,7 +4815,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4843,7 +4843,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4871,7 +4871,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -4899,7 +4899,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     }
 }
diff --git a/vmBitwiseLogicOperationTestFiller.json b/vmBitwiseLogicOperationTestFiller.json
index 8954dca1..1eb923f4 100644
--- a/vmBitwiseLogicOperationTestFiller.json
+++ b/vmBitwiseLogicOperationTestFiller.json
@@ -10,7 +10,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (LT (- 0 2) 0 )}",
             "storage": {}
@@ -20,10 +20,10 @@
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
+            "value" : "10000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -38,7 +38,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "10000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (LT 0 (- 0 2) )}",
             "storage": {}
@@ -48,10 +48,10 @@
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
+            "value" : "10000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -66,7 +66,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "10000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (LT 115792089237316195423570985008687907853269984665640564039457584007913129639935 0 )}",
             "storage": {}
@@ -76,10 +76,10 @@
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
+            "value" : "10000000000000000000",
+            "data" : "",  
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -95,7 +95,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "1000000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (LT 0 115792089237316195423570985008687907853269984665640564039457584007913129639935 )}",
             "storage": {}
@@ -108,7 +108,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -123,7 +123,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "1000000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] ( GT (- 0 2) 0 )}",
             "storage": {}
@@ -136,7 +136,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -151,7 +151,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "1000000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (GT 0 (- 0 2) )}",
             "storage": {}
@@ -164,7 +164,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -179,7 +179,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "1000000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (GT 115792089237316195423570985008687907853269984665640564039457584007913129639935 0 )}",
             "storage": {}
@@ -192,7 +192,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -208,7 +208,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "1000000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (GT 0 115792089237316195423570985008687907853269984665640564039457584007913129639935 )}",
             "storage": {}
@@ -221,7 +221,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -236,7 +236,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "1000000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (SLT (- 0 2) 0 )}",
             "storage": {}
@@ -249,7 +249,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -264,7 +264,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "1000000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (SLT 0 (- 0 2) )}",
             "storage": {}
@@ -277,7 +277,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -292,7 +292,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "1000000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (SLT 115792089237316195423570985008687907853269984665640564039457584007913129639935 0 )}",
             "storage": {}
@@ -305,7 +305,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -321,7 +321,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "1000000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (SLT 0 115792089237316195423570985008687907853269984665640564039457584007913129639935 )}",
             "storage": {}
@@ -334,7 +334,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -349,7 +349,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "1000000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (SLT (- 0 5) (- 0 3) )}",
             "storage": {}
@@ -362,7 +362,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -377,7 +377,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "1000000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (SGT (- 0 2) 0 )}",
             "storage": {}
@@ -390,7 +390,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -405,7 +405,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "1000000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (SGT 0 (- 0 2) )}",
             "storage": {}
@@ -418,7 +418,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -433,7 +433,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "1000000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (SGT 115792089237316195423570985008687907853269984665640564039457584007913129639935 0 )}",
             "storage": {}
@@ -446,7 +446,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -462,7 +462,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "1000000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (SGT 0 115792089237316195423570985008687907853269984665640564039457584007913129639935 )}",
             "storage": {}
@@ -475,7 +475,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -490,7 +490,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "1000000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (SGT (- 0 5) (- 0 3) )}",
             "storage": {}
@@ -503,7 +503,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -518,7 +518,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "1000000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (EQ (- 0 5) (- 0 3) )}",
             "storage": {}
@@ -531,7 +531,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -546,7 +546,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "1000000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (EQ 0 0)}",
             "storage": {}
@@ -559,7 +559,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -574,7 +574,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "1000000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (EQ 115792089237316195423570985008687907853269984665640564039457584007913129639935 115792089237316195423570985008687907853269984665640564039457584007913129639935 )}",
             "storage": {}
@@ -587,7 +587,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -602,7 +602,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "1000000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (ISZERO 115792089237316195423570985008687907853269984665640564039457584007913129639935 )}",
             "storage": {}
@@ -615,7 +615,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -630,7 +630,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "1000000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (ISZERO 0 )}",
             "storage": {}
@@ -643,7 +643,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
     "iszeo2": {
@@ -657,7 +657,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "1000000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (ISZERO (- 0 2) )}",
             "storage": {}
@@ -670,7 +670,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -685,7 +685,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (AND 2 2) }",
                 "storage": {}
@@ -698,7 +698,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -713,7 +713,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (AND 2 1) }",
                 "storage": {}
@@ -726,7 +726,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -741,7 +741,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (AND 3 1) }",
                 "storage": {}
@@ -754,7 +754,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
     "and3": {
@@ -768,7 +768,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (AND 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef) } ",
                 "storage": {}
@@ -781,7 +781,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
     "and4": {
@@ -795,7 +795,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (AND 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) } ",
                 "storage": {}
@@ -808,7 +808,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -823,7 +823,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (AND 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeefeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) } ",
                 "storage": {}
@@ -836,7 +836,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -851,7 +851,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (OR 2 2) } ",
                 "storage": {}
@@ -864,7 +864,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -879,7 +879,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (OR 2 1) } ",
                 "storage": {}
@@ -892,7 +892,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -907,7 +907,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (OR 3 1) } ",
                 "storage": {}
@@ -920,7 +920,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
     "or3": {
@@ -934,7 +934,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (OR 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef) } ",
                 "storage": {}
@@ -947,7 +947,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
     "or4": {
@@ -961,7 +961,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (OR 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) } ",
                 "storage": {}
@@ -974,7 +974,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -989,7 +989,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (OR 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeefeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) } ",
                 "storage": {}
@@ -1002,7 +1002,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1017,7 +1017,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (XOR 2 2) } ",
                 "storage": {}
@@ -1030,7 +1030,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1045,7 +1045,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (XOR 2 1) } ",
                 "storage": {}
@@ -1058,7 +1058,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1073,7 +1073,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (XOR 3 1) } ",
                 "storage": {}
@@ -1086,7 +1086,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
     "xor3": {
@@ -1100,7 +1100,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (XOR 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef) } ",
                 "storage": {}
@@ -1113,7 +1113,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
     "xor4": {
@@ -1127,7 +1127,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (XOR 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) } ",
                 "storage": {}
@@ -1140,7 +1140,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1155,7 +1155,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (XOR 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeefeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) } ",
                 "storage": {}
@@ -1168,7 +1168,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1183,7 +1183,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "1000000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (NOT 0 )}",
             "storage": {}
@@ -1196,7 +1196,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1211,7 +1211,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "1000000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (NOT 2 )}",
             "storage": {}
@@ -1224,7 +1224,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1239,7 +1239,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "1000000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (NOT 115792089237316195423570985008687907853269984665640564039457584007913129639935 )}",
             "storage": {}
@@ -1252,7 +1252,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1267,7 +1267,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "1000000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (NOT (- 0 2) )}",
             "storage": {}
@@ -1280,7 +1280,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1295,7 +1295,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "1000000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (NOT (- 0 115792089237316195423570985008687907853269984665640564039457584007913129639935) )}",
             "storage": {}
@@ -1308,7 +1308,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1323,7 +1323,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "1000000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (NOT (- 0 0) )}",
             "storage": {}
@@ -1336,7 +1336,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1351,7 +1351,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (BYTE (- 31 0) 0x8040201008040201 ) } ",
                 "storage": {}
@@ -1364,7 +1364,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
     "byte1": {
@@ -1378,7 +1378,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (BYTE (- 31 1) 0x8040201008040201 ) } ",
                 "storage": {}
@@ -1391,7 +1391,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
     "byte2": {
@@ -1405,7 +1405,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (BYTE (- 31 2) 0x8040201008040201 ) } ",
                 "storage": {}
@@ -1418,7 +1418,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1433,7 +1433,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (BYTE (- 31 3) 0x8040201008040201 ) } ",
                 "storage": {}
@@ -1446,7 +1446,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1461,7 +1461,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (BYTE (- 31 4) 0x8040201008040201 ) } ",
                 "storage": {}
@@ -1474,7 +1474,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1489,7 +1489,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (BYTE (- 31 5) 0x8040201008040201 ) } ",
                 "storage": {}
@@ -1502,7 +1502,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1518,7 +1518,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (BYTE (- 31 6) 0x8040201008040201 ) } ",
                 "storage": {}
@@ -1531,7 +1531,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1546,7 +1546,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (BYTE (- 31 7) 0x8040201008040201 ) } ",
                 "storage": {}
@@ -1559,7 +1559,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1575,7 +1575,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (BYTE (- 31 31) 0x8040201008040201 ) } ",
                 "storage": {}
@@ -1588,7 +1588,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1603,7 +1603,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (BYTE (SDIV 31 32) 0x8040201008040201 ) } ",
                 "storage": {}
@@ -1616,7 +1616,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1631,7 +1631,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (BYTE 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0x8040201008040201 ) } ",
                 "storage": {}
@@ -1644,7 +1644,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1659,7 +1659,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "1000000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (BYTE 0 0x8040201008040201) } ",
                 "storage": {}
@@ -1672,7 +1672,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     }
 }
diff --git a/vmBlockInfoTestFiller.json b/vmBlockInfoTestFiller.json
index 04cbec51..c86a9f2c 100644
--- a/vmBlockInfoTestFiller.json
+++ b/vmBlockInfoTestFiller.json
@@ -10,7 +10,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (BLOCKHASH 2) }",
             "storage": {}
@@ -23,7 +23,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -38,7 +38,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (BLOCKHASH 1) }",
             "storage": {}
@@ -51,7 +51,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -66,7 +66,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (BLOCKHASH 1) }",
             "storage": {}
@@ -79,7 +79,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -94,7 +94,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (BLOCKHASH 0) }",
             "storage": {}
@@ -107,7 +107,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -122,7 +122,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (BLOCKHASH 1) [[ 1 ]] (BLOCKHASH 2) [[ 2 ]] (BLOCKHASH 256) }",
             "storage": {}
@@ -135,7 +135,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -150,7 +150,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (BLOCKHASH 0) [[ 1 ]] (BLOCKHASH 257) [[ 2 ]] (BLOCKHASH 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }",
             "storage": {}
@@ -163,7 +163,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -178,7 +178,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (COINBASE) }",
             "storage": {}
@@ -191,7 +191,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -206,7 +206,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (TIMESTAMP) }",
             "storage": {}
@@ -219,7 +219,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -234,7 +234,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (NUMBER) }",
             "storage": {}
@@ -247,7 +247,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -262,7 +262,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (DIFFICULTY) }",
             "storage": {}
@@ -275,7 +275,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -290,7 +290,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (GASLIMIT) }",
             "storage": {}
@@ -303,7 +303,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     }
 }
diff --git a/vmEnvironmentalInfoTestFiller.json b/vmEnvironmentalInfoTestFiller.json
index c63cd914..4de871d9 100644
--- a/vmEnvironmentalInfoTestFiller.json
+++ b/vmEnvironmentalInfoTestFiller.json
@@ -10,7 +10,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (ADDRESS)}",
                 "storage": {}
@@ -38,7 +38,7 @@
         },
         "pre" : {
             "cd1722f3947def4cf144679da39c4c32bdc35681" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (ADDRESS)}",
                 "storage": {}
@@ -66,7 +66,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (BALANCE 0xcd1722f3947def4cf144679da39c4c32bdc35681 )}",
                 "storage": {}
@@ -94,7 +94,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (BALANCE 0xcd1722f3947def4cf144679da39c4c32bdc35681aa )}",
                 "storage": {}
@@ -122,7 +122,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (BALANCE 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6aa )}",
                 "storage": {}
@@ -150,7 +150,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (BALANCE 0xaa0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6 )}",
                 "storage": {}
@@ -179,7 +179,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (BALANCE 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6 )}",
                 "storage": {}
@@ -207,7 +207,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (EQ (BALANCE 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) (BALANCE (ADDRESS)))}",
                 "storage": {}
@@ -236,7 +236,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (EQ (BALANCE 0xcd1722f3947def4cf144679da39c4c32bdc35681) (BALANCE (CALLER)))}",
                 "storage": {}
@@ -264,7 +264,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (ORIGIN)}",
                 "storage": {}
@@ -292,7 +292,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (CALLER)}",
                 "storage": {}
@@ -321,7 +321,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (CALLVALUE)}",
                 "storage": {}
@@ -350,7 +350,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (CALLDATALOAD 0)}",
                 "storage": {}
@@ -378,7 +378,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (CALLDATALOAD 1)}",
                 "storage": {}
@@ -406,7 +406,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (CALLDATALOAD 5)}",
                 "storage": {}
@@ -434,7 +434,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (CALLDATALOAD 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa)}",
                 "storage": {}
@@ -462,7 +462,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (CALLDATASIZE)}",
                 "storage": {}
@@ -490,7 +490,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (CALLDATASIZE)}",
                 "storage": {}
@@ -518,7 +518,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (CALLDATASIZE)}",
                 "storage": {}
@@ -546,7 +546,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (CALLDATACOPY 0 1 2 ) [[ 0 ]] @0}",
                 "storage": {}
@@ -574,7 +574,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (CALLDATACOPY 0 0 0 ) [[ 0 ]] @0}",
                 "storage": {}
@@ -602,7 +602,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (CALLDATACOPY 0 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa 0xff ) [[ 0 ]] @0}",
                 "storage": {}
@@ -630,7 +630,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (CALLDATACOPY 0 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa 9 ) [[ 0 ]] @0}",
                 "storage": {}
@@ -658,7 +658,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (CALLDATACOPY 0 1 1 ) [[ 0 ]] @0}",
                 "storage": {}
@@ -686,7 +686,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (CALLDATACOPY 0 1 0 ) [[ 0 ]] @0}",
                 "storage": {}
@@ -882,7 +882,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (CODESIZE)}",
                 "storage": {}
@@ -910,7 +910,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (CODECOPY 0 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa 8 ) [[ 0 ]] @0}",
                 "storage": {}
@@ -938,7 +938,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (CODECOPY 0 0 5 ) [[ 0 ]] @0 }",
                 "storage": {}
@@ -966,7 +966,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (CODECOPY 0 0 5 ) [[ 0 ]] @0 }",
                 "storage": {}
@@ -994,7 +994,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (CODECOPY 0 0 0 ) [[ 0 ]] @0 }",
                 "storage": {}
@@ -1022,7 +1022,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (GASPRICE) }",
                 "storage": {}
@@ -1050,7 +1050,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (EXTCODESIZE 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6aa )}",
                 "storage": {}
@@ -1078,7 +1078,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (EXTCODESIZE 0xaa0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6 )}",
                 "storage": {}
@@ -1107,13 +1107,13 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (EQ (EXTCODESIZE (CALLER)) (CODESIZE) ) }",
                 "storage": {}
             },
             "cd1722f3947def4cf144679da39c4c32bdc35681" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{  [[ 0 ]] (EQ (EXTCODESIZE (CALLER)) (CODESIZE) ) }",
                 "storage": {}
@@ -1140,13 +1140,13 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (CODESIZE)  }",
                 "storage": {}
             },
             "cd1722f3947def4cf144679da39c4c32bdc35681" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (EXTCODESIZE (CALLER) ) }",
                 "storage": {}
@@ -1174,7 +1174,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (EXTCODECOPY (ADDRESS) 0 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa 8 ) [[ 0 ]] @0}",
                 "storage": {}
@@ -1202,13 +1202,13 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (EXTCODECOPY (CALLER) 0 0 0 ) ) [[ 0 ]] @0   }",
                 "storage": {}
             },
             "cd1722f3947def4cf144679da39c4c32bdc35681" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] 5 }",
                 "storage": {}
@@ -1237,13 +1237,13 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (EXTCODECOPY (CALLER) 0 0 (EXTCODESIZE (CALLER) ) ) [[ 0 ]] @0   }",
                 "storage": {}
             },
             "cd1722f3947def4cf144679da39c4c32bdc35681" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] 5 }",
                 "storage": {}
@@ -1271,13 +1271,13 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (EXTCODECOPY 0xaacd1722f3947def4cf144679da39c4c32bdc35681 0 0 (EXTCODESIZE (CALLER) ) ) [[ 0 ]] @0   }",
                 "storage": {}
             },
             "cd1722f3947def4cf144679da39c4c32bdc35681" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] 5 }",
                 "storage": {}
@@ -1305,13 +1305,13 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (EXTCODECOPY 0xcd1722f3947def4cf144679da39c4c32bdc35681aa 0 0 (EXTCODESIZE (CALLER) ) ) [[ 0 ]] @0   }",
                 "storage": {}
             },
             "cd1722f3947def4cf144679da39c4c32bdc35681" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] 5 }",
                 "storage": {}
diff --git a/vmIOandFlowOperationsTestFiller.json b/vmIOandFlowOperationsTestFiller.json
index f71109e1..995b9d6d 100644
--- a/vmIOandFlowOperationsTestFiller.json
+++ b/vmIOandFlowOperationsTestFiller.json
@@ -10,7 +10,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x6002600360045055",
             "storage": {}
@@ -23,7 +23,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -38,7 +38,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x5060026003600455",
             "storage": {}
@@ -51,7 +51,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -66,7 +66,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x600260035155",
             "storage": {}
@@ -79,7 +79,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -94,7 +94,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x600260035255",
             "storage": {}
@@ -107,7 +107,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -122,7 +122,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{(MSTORE 0 23) [[ 1 ]] (MLOAD 0) } ",
             "storage": {}
@@ -135,7 +135,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -150,7 +150,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{[[ 0 ]] (MLOAD 0) } ",
             "storage": {}
@@ -163,7 +163,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -178,7 +178,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{(MSTORE 1 23) [[ 1 ]] (MLOAD 0) } ",
             "storage": {}
@@ -191,7 +191,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -206,7 +206,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 1 ]] (MLOAD 7489573) } ",
             "storage": {}
@@ -219,7 +219,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -234,7 +234,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 1 ]] (MLOAD 1) } ",
             "storage": {}
@@ -247,7 +247,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -262,7 +262,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 1 (+ 2 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) ) [[ 1 ]] (MLOAD 1) } ",
             "storage": {}
@@ -275,7 +275,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -290,7 +290,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff23 ) [[ 1 ]] (MLOAD 1) } ",
             "storage": {}
@@ -303,7 +303,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -318,7 +318,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE8 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff23 ) [[ 1 ]] (MLOAD 1) } ",
             "storage": {}
@@ -331,7 +331,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -346,7 +346,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE8 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff ) [[ 1 ]] (MLOAD 1) } ",
             "storage": {}
@@ -359,7 +359,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -374,7 +374,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE8 1 0xff) (MSTORE8 2 0xee) [[ 1 ]] (MLOAD 0) } ",
             "storage": {}
@@ -387,7 +387,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -402,7 +402,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (SSTORE 0 0xff) (SSTORE 10 0xee)  [[ 20 ]] (SLOAD 0)  } ",
             "storage": {}
@@ -415,7 +415,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -430,7 +430,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (SSTORE 0 0xff) (SSTORE 10 0xee)  [[ 20 ]] (SLOAD 100)  } ",
             "storage": {}
@@ -443,7 +443,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -458,7 +458,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (SSTORE 0 0xff) (SSTORE 1 0xee) (SSTORE 2 0xdd) [[ 10 ]] (SLOAD 1) [[ 20 ]] (SLOAD 2)  } ",
             "storage": {}
@@ -471,7 +471,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -486,7 +486,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x6009565b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b",
             "storage": {}
@@ -514,7 +514,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x6006560060015b6002600355",
             "storage": {}
@@ -527,7 +527,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -542,7 +542,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x60016008570060015b6002600355",
             "storage": {}
@@ -555,7 +555,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -570,7 +570,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x60055661eeff",
             "storage": {}
@@ -583,7 +583,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -598,7 +598,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x600456655b6001600155",
             "storage": {}
@@ -611,7 +611,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -626,7 +626,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x600160075761eeff",
             "storage": {}
@@ -639,7 +639,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -654,7 +654,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x6001600657655b6001600155",
             "storage": {}
@@ -667,7 +667,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -682,7 +682,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x5b600056",
             "storage": {}
@@ -695,7 +695,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -710,7 +710,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x565b600056",
             "storage": {}
@@ -723,7 +723,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -823,7 +823,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x6002600401565b600360005260206000f3600656",
             "storage": {}
@@ -836,7 +836,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -851,7 +851,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x60236007566001600255",
             "storage": {}
@@ -864,7 +864,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
     "jump0_jumpdest0": {
@@ -878,7 +878,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x602360075660015b600255",
             "storage": {}
@@ -891,7 +891,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -906,7 +906,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x60236007566001600255",
             "storage": {}
@@ -919,7 +919,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -934,7 +934,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x602360085660015b600255",
             "storage": {}
@@ -947,7 +947,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -962,7 +962,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x6023600a6008505660015b600255",
             "storage": {}
@@ -975,7 +975,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -990,7 +990,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x6023600b6008505660015b600255",
             "storage": {}
@@ -1003,7 +1003,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1018,7 +1018,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x620fffff620fffff0156",
             "storage": {}
@@ -1031,7 +1031,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1046,7 +1046,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x602360016009576001600255",
             "storage": {}
@@ -1059,7 +1059,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1074,7 +1074,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x60236001600a5760015b600255",
             "storage": {}
@@ -1087,7 +1087,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1102,7 +1102,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x602360006009576001600255",
             "storage": {}
@@ -1115,7 +1115,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1130,7 +1130,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x60017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff576002600355",
             "storage": {}
@@ -1143,7 +1143,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1158,7 +1158,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x6008600101560060015b6002600355",
             "storage": {}
@@ -1171,7 +1171,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1186,7 +1186,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x60016008600301570060015b6002600355",
             "storage": {}
@@ -1199,7 +1199,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1214,7 +1214,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x60056003015661eeff",
             "storage": {}
@@ -1227,7 +1227,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1242,7 +1242,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x600460030156655b6001600155",
             "storage": {}
@@ -1255,7 +1255,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1270,7 +1270,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x600160076003015761eeff",
             "storage": {}
@@ -1283,7 +1283,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1298,7 +1298,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x6001600660030157655b6001600155",
             "storage": {}
@@ -1311,7 +1311,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1326,7 +1326,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x5b586000555960115758600052596000575b58600055",
             "storage": {}
@@ -1339,7 +1339,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1354,7 +1354,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x5b600060000156",
             "storage": {}
@@ -1367,7 +1367,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1382,7 +1382,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x60236007600301566001600255",
             "storage": {}
@@ -1395,7 +1395,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
     "DynamicJump0_jumpdest0": {
@@ -1409,7 +1409,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x602360076003015660015b600255",
             "storage": {}
@@ -1422,7 +1422,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1437,7 +1437,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x60236007600301566001600255",
             "storage": {}
@@ -1450,7 +1450,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1465,7 +1465,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x602360086003015660015b600255",
             "storage": {}
@@ -1478,7 +1478,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1493,7 +1493,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x6023600a6008506003015660015b600255",
             "storage": {}
@@ -1506,7 +1506,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1521,7 +1521,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x6023600b6008506003015660015b600255",
             "storage": {}
@@ -1534,7 +1534,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1549,7 +1549,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x620fffff620fffff0160030156",
             "storage": {}
@@ -1562,7 +1562,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1577,7 +1577,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x602360016009600301576001600255",
             "storage": {}
@@ -1590,7 +1590,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1605,7 +1605,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x60236001600a6003015760015b600255",
             "storage": {}
@@ -1618,7 +1618,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1633,7 +1633,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x602360006009600301576001600255",
             "storage": {}
@@ -1646,7 +1646,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1661,7 +1661,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x60017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0600301576002600355",
             "storage": {}
@@ -1674,7 +1674,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1689,7 +1689,7 @@
            },
            "pre" : {
            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-               "balance" : "1000000000000000000",
+               "balance" : "100000000000000000000000",
                "nonce" : "0",
                "code" : "0x600160084301570060015b6002600355",
                "storage": {}
@@ -1702,7 +1702,7 @@
                "value" : "1000000000000000000",
                "data" : "",
                "gasPrice" : "100000000000000",
-               "gas" : "10000"
+               "gas" : "100000"
            }
        },
 
@@ -1717,7 +1717,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x600543015661eeff",
            "storage": {}
@@ -1730,7 +1730,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
    },
 
@@ -1745,7 +1745,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x6004430156655b6001600155",
            "storage": {}
@@ -1758,7 +1758,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
    },
 
@@ -1773,7 +1773,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x6001600743015761eeff",
            "storage": {}
@@ -1786,7 +1786,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
    },
 
@@ -1801,7 +1801,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x60016006430157655b6001600155",
            "storage": {}
@@ -1814,7 +1814,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
    },
 
@@ -1829,7 +1829,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x5b600060000156",
            "storage": {}
@@ -1842,7 +1842,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
    },
 
@@ -1857,7 +1857,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x602360074301566001600255",
            "storage": {}
@@ -1870,7 +1870,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
    },
    "BlockNumberDynamicJump0_jumpdest0": {
@@ -1884,7 +1884,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x6023600743015660015b600255",
            "storage": {}
@@ -1897,7 +1897,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
    },
 
@@ -1912,7 +1912,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x602360074301566001600255",
            "storage": {}
@@ -1925,7 +1925,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
    },
 
@@ -1940,7 +1940,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x6023600843015660015b600255",
            "storage": {}
@@ -1953,7 +1953,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
    },
 
@@ -1968,7 +1968,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x6023600a60085043015660015b600255",
            "storage": {}
@@ -1981,7 +1981,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
    },
 
@@ -1996,7 +1996,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x6023600b60085043015660015b600255",
            "storage": {}
@@ -2009,7 +2009,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
    },
 
@@ -2024,7 +2024,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x620fffff620fffff01430156",
            "storage": {}
@@ -2037,7 +2037,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
    },
 
@@ -2052,7 +2052,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x6023600160094301576001600255",
            "storage": {}
@@ -2065,7 +2065,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
    },
 
@@ -2080,7 +2080,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x60236001600a43015760015b600255",
            "storage": {}
@@ -2093,7 +2093,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
    },
 
@@ -2108,7 +2108,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x6023600060094301576001600255",
            "storage": {}
@@ -2121,7 +2121,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
    },
 
@@ -2136,7 +2136,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x60017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff04301576002600355",
            "storage": {}
@@ -2149,7 +2149,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
    },
 
@@ -2165,7 +2165,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
                 "//" : "PUSH1 3 JUMP",
             "code" : "0x6009436006575b566001",
@@ -2179,7 +2179,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2194,7 +2194,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x600a436006575b5660015b6001600155",
             "storage": {}
@@ -2207,7 +2207,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2222,7 +2222,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x435660615b4343025660615b60615b5b5b6001600155",
             "storage": {}
@@ -2235,7 +2235,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2250,7 +2250,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x435660615b4343025660615b60615b605b6001600155",
             "storage": {}
@@ -2263,7 +2263,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2278,7 +2278,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x435631615b60615b60615b606001600155",
             "storage": {}
@@ -2291,7 +2291,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2306,7 +2306,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x435631615b60615b60615b606001600155",
             "storage": {}
@@ -2319,7 +2319,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2334,7 +2334,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "0x435631615b60615b60615b606001600155",
             "storage": {}
@@ -2347,7 +2347,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2362,7 +2362,7 @@
            },
            "pre" : {
            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-               "balance" : "1000000000000000000",
+               "balance" : "100000000000000000000000",
                "nonce" : "0",
                "code" : "0x6001600860005401570060015b6002600355",
                "storage" : {
@@ -2377,7 +2377,7 @@
                "value" : "1000000000000000000",
                "data" : "",
                "gasPrice" : "100000000000000",
-               "gas" : "10000"
+               "gas" : "100000"
            }
     },
 
@@ -2392,7 +2392,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x6005600054015661eeff",
            "storage" : {
@@ -2407,7 +2407,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
     },
 
@@ -2422,7 +2422,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x60046000540156655b6001600155",
            "storage" : {
@@ -2437,7 +2437,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
     },
 
@@ -2452,7 +2452,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x60016007600054015761eeff",
            "storage" : {
@@ -2467,7 +2467,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
     },
 
@@ -2482,7 +2482,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x600160066000540157655b6001600155",
            "storage" : {
@@ -2497,7 +2497,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
     },
 
@@ -2512,7 +2512,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x5b600060000156",
            "storage" : {
@@ -2527,7 +2527,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
     },
 
@@ -2542,7 +2542,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x6023600760005401566001600255",
            "storage" : {
@@ -2558,7 +2558,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
     },
     "JDfromStorageDynamicJump0_jumpdest0": {
@@ -2572,7 +2572,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x60236007600054015660015b600255",
            "storage" : {
@@ -2587,7 +2587,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
     },
 
@@ -2602,7 +2602,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x6023600760005401566001600255",
            "storage" : {
@@ -2618,7 +2618,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
     },
 
@@ -2633,7 +2633,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x60236008600054015660015b600255",
            "storage" : {
@@ -2648,7 +2648,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
     },
 
@@ -2663,7 +2663,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x6023600a600850600054015660015b600255",
            "storage" : {
@@ -2679,7 +2679,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
     },
 
@@ -2694,7 +2694,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x6023600b600850600054015660015b600255",
            "storage" : {
@@ -2709,7 +2709,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
     },
 
@@ -2724,7 +2724,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x620fffff620fffff016000540156",
            "storage" : {
@@ -2740,7 +2740,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
     },
 
@@ -2755,7 +2755,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x60236001600960005401576001600255",
            "storage" : {
@@ -2770,7 +2770,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
     },
 
@@ -2785,7 +2785,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x60236001600a600054015760015b600255",
            "storage" : {
@@ -2801,7 +2801,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
     },
 
@@ -2816,7 +2816,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x60236000600960005401576001600255",
            "storage" : {
@@ -2831,7 +2831,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
     },
 
@@ -2846,7 +2846,7 @@
        },
        "pre" : {
        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "1000000000000000000",
+           "balance" : "100000000000000000000000",
            "nonce" : "0",
            "code" : "0x60017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff060005401576002600355",
            "storage" : {
@@ -2861,7 +2861,7 @@
            "value" : "1000000000000000000",
            "data" : "",
            "gasPrice" : "100000000000000",
-           "gas" : "10000"
+           "gas" : "100000"
        }
     },
 
@@ -2877,7 +2877,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ [[ 0 ]] (PC)}",
             "storage": {}
@@ -2890,7 +2890,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2905,7 +2905,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{(SSTORE 0 0xff) [[ 0 ]] (PC)}",
             "storage": {}
@@ -2918,7 +2918,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2933,7 +2933,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{(MSTORE 0 0xff) [[ 0 ]] (MSIZE)}",
             "storage": {}
@@ -2946,7 +2946,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2961,7 +2961,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{(MSTORE 0 0xffffffffff) [[ 0 ]] (MSIZE)}",
             "storage": {}
@@ -2974,7 +2974,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -2989,7 +2989,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{(MSTORE 0 0xffffffffff)  (MSTORE 32 0xeeee) [[ 0 ]] (MSIZE)}",
             "storage": {}
@@ -3002,7 +3002,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3017,7 +3017,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{(MSTORE 0 0xffffffffff)  (MSTORE 90 0xeeee) [[ 0 ]] (MSIZE)}",
             "storage": {}
@@ -3030,7 +3030,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3045,7 +3045,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{(MSTORE 0 0xffffffffff)  (MSTORE 90 0xeeee) [[ 0 ]] (GAS)}",
             "storage": {}
@@ -3058,7 +3058,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3073,7 +3073,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{[[ 0 ]] (GAS)}",
             "storage": {}
@@ -3086,7 +3086,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3101,7 +3101,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "(asm 0x112233445566778899001122334455667788990011223344556677889900aabb 0 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 1 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 2 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 3 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 4 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 5 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 6 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 7 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 8 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 9 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 10 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 11 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 12 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 13 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 14 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 15 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 16 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 17 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 18 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 19 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 20 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 21 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 22 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 23 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 24 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 25 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 26 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 27 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 28 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 29 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 30 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 31 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 32 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 2014 BYTE 0 0 SSTORE)",
             "storage": {}
@@ -3114,7 +3114,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3129,7 +3129,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "(asm 2 0 MSTORE8 3 1 MSTORE8 0 MLOAD 1 MLOAD ADD 2 MSTORE 64 0 RETURN)",
             "storage": {}
@@ -3142,7 +3142,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3157,7 +3157,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "(asm 1 1000000 RETURN)",
             "storage": {}
@@ -3170,7 +3170,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3185,7 +3185,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ [i] 1 ( if (> @i 0) { (return 39) [i] 2 } (return 1) ) }",
             "storage": {}
@@ -3198,7 +3198,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3213,7 +3213,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "(asm 0x4 0x6 0x9 0x14 JUMP JUMPDEST 0xa SUB 0x0 MSTORE MSIZE 0x0 RETURN JUMPDEST 0x0 MSTORE ADD 0x9 JUMP)",
             "storage": {}
@@ -3226,7 +3226,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3241,7 +3241,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{    [[69]] (caller)   (return 0 (lll     (when (= (caller) @@69)       (for {} (< @i (calldatasize)) [i](+ @i 64)         [[ (calldataload @i) ]] (calldataload (+ @i 32))       )     )   0))}",
             "storage": {}
@@ -3254,7 +3254,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
     
@@ -3279,7 +3279,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
 				"code" : "(asm 10 0 MSTORE JUMPDEST 0 MLOAD 1 SWAP1 SUB DUP1 0 MSTORE 5 JUMPI)",
                 "nonce" : "0",
                 "storage" : {}
@@ -3298,7 +3298,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "(asm 27 37 MUL JUMP JUMPDEST)",
             "storage": {}
@@ -3311,7 +3311,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3326,7 +3326,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "(asm 1 3 3 MUL JUMPI 0 0 JUMP)",
             "storage": {}
@@ -3339,7 +3339,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3354,7 +3354,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "(for [i]:10 (> @i 0) [i](- @i 1) [j](+ @i @j))",
             "storage": {}
@@ -3367,7 +3367,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3382,7 +3382,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "(for [i]:0 (< @i 10) [i](+ @i 1) [j](+ @i @j))",
             "storage": {}
@@ -3395,7 +3395,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3410,7 +3410,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "(asm 4 3 ADD JUMP STOP JUMPDEST 1 0 MSTORE MSIZE 0 RETURN)",
             "storage": {}
@@ -3423,7 +3423,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3438,7 +3438,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "(asm 8 6 ADD JUMP STOP JUMPDEST 1 0 MSTORE STOP JUMPDEST 2 0 MSTORE MSIZE 0 RETURN)",
             "storage": {}
@@ -3451,7 +3451,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3466,7 +3466,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "(asm  1 4 5 ADD JUMPI STOP JUMPDEST 1 0 MSTORE MSIZE 0 RETURN)",
             "storage": {}
@@ -3479,7 +3479,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3494,7 +3494,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "(asm 0 7 5 ADD JUMPI 1 0 MSTORE STOP JUMPDEST)",
             "storage": {}
@@ -3507,7 +3507,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3522,7 +3522,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "(asm 10 JUMPDEST 1 DUP2 SUB DUP1 2 JUMPI   0 MSTORE8 1  MSTORE8 2  MSTORE8 3 MSTORE8 4 MSTORE8 5 MSTORE8 6 MSTORE8 7 MSTORE8 8 MSTORE8 9 MSTORE8 MSIZE 0 RETURN)",
             "storage": {}
@@ -3535,7 +3535,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -3550,7 +3550,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "(when (> 1 0) [i] 13)",
             "storage": {}
@@ -3563,7 +3563,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     }
 }
diff --git a/vmLogTestFiller.json b/vmLogTestFiller.json
index 5b63957c..fea69a4a 100644
--- a/vmLogTestFiller.json
+++ b/vmLogTestFiller.json
@@ -10,7 +10,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (LOG0 0 0) }",
             "storage": {}
@@ -23,7 +23,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -38,7 +38,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG0 0 32) }",
             "storage": {}
@@ -51,7 +51,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -66,7 +66,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG0 0 32) (LOG0 2 16) }",
             "storage": {}
@@ -79,7 +79,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -94,7 +94,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG0 0 1) }",
             "storage": {}
@@ -107,7 +107,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -123,7 +123,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG0 31 1) }",
             "storage": {}
@@ -136,7 +136,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -151,7 +151,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1) }",
             "storage": {}
@@ -164,7 +164,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -179,7 +179,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG0 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }",
             "storage": {}
@@ -192,7 +192,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -207,7 +207,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG0 1 0) }",
             "storage": {}
@@ -220,7 +220,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -235,7 +235,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (LOG1 0 0 0) }",
             "storage": {}
@@ -248,7 +248,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -263,7 +263,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
             "storage": {}
@@ -276,7 +276,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -291,7 +291,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG1 0 1 0) }",
             "storage": {}
@@ -304,7 +304,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -320,7 +320,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG1 31 1 0) }",
             "storage": {}
@@ -333,7 +333,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -348,7 +348,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1 0) }",
             "storage": {}
@@ -361,7 +361,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -376,7 +376,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG1 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0) }",
             "storage": {}
@@ -389,7 +389,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -404,7 +404,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG1 1 0 0) }",
             "storage": {}
@@ -417,7 +417,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -432,7 +432,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG1 0 32 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }",
             "storage": {}
@@ -445,7 +445,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -460,7 +460,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE8 0 0xff) (LOG1 0 32 (CALLER)) }",
             "storage": {}
@@ -473,7 +473,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -488,7 +488,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (LOG2 0 0 0 0) }",
             "storage": {}
@@ -501,7 +501,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -516,7 +516,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG2 0 32 0 0) }",
             "storage": {}
@@ -529,7 +529,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -544,7 +544,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG2 0 1 0 0) }",
             "storage": {}
@@ -557,7 +557,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -573,7 +573,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG2 31 1 0 0) }",
             "storage": {}
@@ -586,7 +586,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -601,7 +601,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG2 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1 0 0) }",
             "storage": {}
@@ -614,7 +614,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -629,7 +629,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG2 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0) }",
             "storage": {}
@@ -642,7 +642,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -657,7 +657,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG2 1 0 0 0) }",
             "storage": {}
@@ -670,7 +670,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -685,7 +685,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG2 0 32 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }",
             "storage": {}
@@ -698,7 +698,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -713,7 +713,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE8 0 0xff) (LOG2 0 32 0 (CALLER) ) }",
             "storage": {}
@@ -726,7 +726,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -741,7 +741,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (LOG3 0 0 0 0 0) }",
             "storage": {}
@@ -754,7 +754,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -769,7 +769,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG3 0 32 0 0 0) }",
             "storage": {}
@@ -782,7 +782,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -797,7 +797,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG3 0 1 0 0 0) }",
             "storage": {}
@@ -810,7 +810,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -826,7 +826,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG3 31 1 0 0 0) }",
             "storage": {}
@@ -839,7 +839,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -854,7 +854,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG3 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1 0 0 0) }",
             "storage": {}
@@ -867,7 +867,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -882,7 +882,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG3 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0 0) }",
             "storage": {}
@@ -895,7 +895,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -910,7 +910,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG3 1 0 0 0 0) }",
             "storage": {}
@@ -923,7 +923,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -938,7 +938,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG3 0 32 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }",
             "storage": {}
@@ -951,7 +951,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -966,7 +966,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE8 0 0xff) (LOG3 0 32 0 0 (CALLER) ) }",
             "storage": {}
@@ -979,7 +979,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -994,7 +994,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE8 0 0xff) (LOG3 0 32 (PC) (PC) (PC) ) }",
             "storage": {}
@@ -1007,7 +1007,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1022,7 +1022,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (LOG4 0 0 0 0 0 0) }",
             "storage": {}
@@ -1035,7 +1035,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1050,7 +1050,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG4 0 32 0 0 0 0) }",
             "storage": {}
@@ -1063,7 +1063,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1078,7 +1078,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG4 0 1 0 0 0 0) }",
             "storage": {}
@@ -1091,7 +1091,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1107,7 +1107,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG4 31 1 0 0 0 0) }",
             "storage": {}
@@ -1120,7 +1120,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1135,7 +1135,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG4 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1 0 0 0 0) }",
             "storage": {}
@@ -1148,7 +1148,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1163,7 +1163,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG4 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0 0 0) }",
             "storage": {}
@@ -1176,7 +1176,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1191,7 +1191,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG4 1 0 0 0 0 0) }",
             "storage": {}
@@ -1204,7 +1204,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1219,7 +1219,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG4 0 32 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }",
             "storage": {}
@@ -1232,7 +1232,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1247,7 +1247,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE8 0 0xff) (LOG3 0 32 0 0 0 (CALLER) ) }",
             "storage": {}
@@ -1260,7 +1260,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1275,7 +1275,7 @@
         },
         "pre" : {
         "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
+            "balance" : "100000000000000000000000",
             "nonce" : "0",
             "code" : "{ (MSTORE8 0 0xff) (LOG3 0 32 (PC) (PC) (PC) (PC) ) }",
             "storage": {}
@@ -1288,7 +1288,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     }
 }
diff --git a/vmPerformanceTestFiller.json b/vmPerformanceTestFiller.json
index e33bd195..e9cb4806 100644
--- a/vmPerformanceTestFiller.json
+++ b/vmPerformanceTestFiller.json
@@ -10,7 +10,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "//" : "ManyFunctions.sol",
                 "code" : "0x60e060020a60003504806301f99ad7146108c3578063023a624a146108d857806303bdecf5146108ed57806305fe035f14610902578063082d8f4914610917578063090bf3b71461092c5780630bd9c534146109415780630c4bfa94146109565780630e20ebe21461096b5780630f76de0d1461098057806310cfcc191461099557806313ce15a9146109aa578063140dcec4146109bf57806314d07a3e146109d45780631687f112146109e957806316eb6603146109fe578063172cf71714610a135780631bd6f59614610a285780631cdb857114610a3d5780631cf74ece14610a525780631d09ba2c14610a675780631f69aa5114610a7c578063223dcc7414610a9157806325e524d314610aa6578063261de7c414610abb5780632632924d14610ad05780632909cc5d14610ae55780632981699814610afa5780632a85a45d14610b0f5780632ca36da014610b245780632cbf1f0d14610b395780632d0f557314610b4e5780632d97867814610b6357806331db9efd14610b7857806332064db714610b8d57806332931fbb14610ba2578063355f51a014610bb7578063361bb34014610bcc578063364ddb0e14610be15780633792a01814610bf657806338c68f8f14610c0b57806338e586fd14610c20578063392d42ae14610c3557806339a87bd914610c4a5780633a95a33214610c5f5780633b8ecdf914610c745780633cf0659a14610c895780633eaf992314610c9e5780633fe97ead14610cb35780633ff11c8b14610cc8578063404efc5314610cdd578063407fce7b14610cf257806340c3b18714610d07578063440208c314610d1c57806344e86b2f14610d31578063455df57914610d465780634689ab4d14610d5b57806346be2e0c14610d70578063487cd86f14610d8557806348e6178214610d9a57806349d4a34414610daf5780634a0f597414610dc45780634bc24ec514610dd95780634c2fe45614610dee5780634cc885d414610e035780634eaaad7b14610e185780634eb166af14610e2d5780635050093414610e42578063506bff1114610e57578063508762c114610e6c578063526938f814610e8157806354400c6014610e96578063559510d814610eab57806355a5f70214610ec057806356ca528f14610ed5578063570a2a1614610eea5780635dab2e0f14610eff5780635dca53d314610f1457806362017ebc14610f29578063621a25f814610f3e578063626d4a3614610f5357806362b6a28214610f6857806364faf22c14610f7d57806366d7ffde14610f9257806367b886e814610fa757806367e902c714610fbc57806369d7774014610fd15780636b7ae8e614610fe65780636c3b659114610ffb5780636e54181e146110105780636e978d91146110255780636f63d2ec1461103a578063706332d11461104f57806370ac4bb9146110645780637138ef521461107957806371dd46a91461108e57806372a7c229146110a35780637376fc8d146110b8578063738a2679146110cd57806374552650146110e2578063746fc8d0146110f757806379254bb81461110c5780637adaa3f8146111215780637e4eb35b14611136578063885ec18e1461114b5780638b9ff6b6146111605780638ce113dc146111755780638defbc5e1461118a5780638f4613d51461119f5780638fdc24ba146111b45780639002dba4146111c957806391d15735146111de57806391d43b23146111f357806393b14daa1461120857806394d63afd1461121d57806395805dad1461123257806396f68782146112475780639740e4a21461125c578063981290131461127157806399a3f0e8146112865780639acb1ad41461129b5780639be07908146112b05780639c15be0b146112c55780639d451c4d146112da5780639d8ee943146112ef5780639ef6ca0f14611304578063a0db0a2214611319578063a18e2eb91461132e578063a408384914611343578063a57544da14611358578063a5a83e4d1461136d578063a6843f3414611382578063a6dacdd714611397578063a8c4c8bc146113ac578063aa058a73146113c1578063aad62da2146113d6578063aaf3e4f4146113eb578063ab81e77314611400578063abc93aee14611415578063abde33f71461142a578063b114b96c1461143f578063b3df873714611454578063b4174cb014611469578063b5d02a561461147e578063b731e84814611493578063b7b96723146114a8578063bbcded7a146114bd578063bbececa9146114d2578063beca7440146114e7578063bf8981c0146114fc578063c028c67414611511578063c2385fa614611526578063c319a02c1461153b578063c569bae014611550578063c6715f8114611565578063c7b98dec1461157a578063c9acab841461158f578063ca9efc73146115a4578063cad80024146115b9578063cdadb0fa146115ce578063cdbdf391146115e3578063cf460fa5146115f8578063cf69318a1461160d578063d1835b8c14611622578063d353a1cb14611637578063d3e141e01461164c578063d5ec7e1d14611661578063d7ead1de14611676578063d90b02aa1461168b578063d959e244146116a0578063d9e68b44146116b5578063daacb24f146116ca578063dc12a805146116df578063dd946033146116f4578063dda5142414611709578063de6612171461171e578063dfb9560c14611733578063e03827d214611748578063e21720001461175d578063e2c718d814611772578063e3da539914611787578063e48e603f1461179c578063e5f9ec29146117b1578063e6c0459a146117c6578063e70addec146117db578063e7a01215146117f0578063ea7f4d2714611805578063ebb6c59f1461181a578063ed6302be1461182f578063ed64b36b14611844578063eecd278914611859578063f0ed14e01461186e578063f0f2134414611883578063f1e328f914611898578063f1e6f4cd146118ad578063f32fe995146118c2578063f75165c6146118d7578063f7ed71d0146118ec578063f80f44f314611901578063f8bc050514611916578063fbd3c51a1461192b578063fd72009014611940578063fed3a3001461195557005b6108ce600435612edf565b8060005260206000f35b6108e3600435612fb5565b8060005260206000f35b6108f8600435613f47565b8060005260206000f35b61090d600435612a11565b8060005260206000f35b6109226004356127ec565b8060005260206000f35b61093760043561215c565b8060005260206000f35b61094c6004356128c2565b8060005260206000f35b61096160043561310f565b8060005260206000f35b610976600435614e0b565b8060005260206000f35b61098b600435613269565b8060005260206000f35b6109a0600435611a82565b8060005260206000f35b6109b5600435613e71565b8060005260206000f35b6109ca600435611dd2565b8060005260206000f35b6109df6004356120d0565b8060005260206000f35b6109f4600435613755565b8060005260206000f35b610a096004356134e3565b8060005260206000f35b610a1e6004356137e1565b8060005260206000f35b610a3360043561382b565b8060005260206000f35b610a48600435612b0b565b8060005260206000f35b610a5d60043561386d565b8060005260206000f35b610a726004356131e5565b8060005260206000f35b610a876004356143e9565b8060005260206000f35b610a9c60043561319b565b8060005260206000f35b610ab1600435612e11565b8060005260206000f35b610ac660043561234a565b8060005260206000f35b610adb6004356121e8565b8060005260206000f35b610af06004356119f6565b8060005260206000f35b610b05600435613bff565b8060005260206000f35b610b1a600435612606565b8060005260206000f35b610b2f6004356126d4565b8060005260206000f35b610b44600435613bb5565b8060005260206000f35b610b59600435612462565b8060005260206000f35b610b6e600435611e14565b8060005260206000f35b610b836004356149ab565b8060005260206000f35b610b98600435611c26565b8060005260206000f35b610bad600435612a7f565b8060005260206000f35b610bc2600435613457565b8060005260206000f35b610bd760043561340d565b8060005260206000f35b610bec60043561363d565b8060005260206000f35b610c01600435612e53565b8060005260206000f35b610c1660043561477b565b8060005260206000f35b610c2b600435612c6d565b8060005260206000f35b610c40600435612648565b8060005260206000f35b610c55600435612274565b8060005260206000f35b610c6a6004356138f9565b8060005260206000f35b610c7f600435612b55565b8060005260206000f35b610c94600435611eea565b8060005260206000f35b610ca9600435613ebb565b8060005260206000f35b610cbe600435613499565b8060005260206000f35b610cd3600435614807565b8060005260206000f35b610ce8600435611fb8565b8060005260206000f35b610cfd600435613083565b8060005260206000f35b610d126004356125bc565b8060005260206000f35b610d27600435613041565b8060005260206000f35b610d3c6004356140a1565b8060005260206000f35b610d516004356147bd565b8060005260206000f35b610d66600435611c70565b8060005260206000f35b610d7b600435612300565b8060005260206000f35b610d906004356123d6565b8060005260206000f35b610da5600435612c23565b8060005260206000f35b610dba600435614faf565b8060005260206000f35b610dcf600435612044565b8060005260206000f35b610de4600435613ae7565b8060005260206000f35b610df9600435614cf3565b8060005260206000f35b610e0e600435613d17565b8060005260206000f35b610e2360043561412d565b8060005260206000f35b610e38600435614177565b8060005260206000f35b610e4d60043561208e565b8060005260206000f35b610e62600435612dc7565b8060005260206000f35b610e77600435612f29565b8060005260206000f35b610e8c6004356124a4565b8060005260206000f35b610ea1600435611b58565b8060005260206000f35b610eb66004356136c9565b8060005260206000f35b610ecb600435613227565b8060005260206000f35b610ee0600435611acc565b8060005260206000f35b610ef5600435613687565b8060005260206000f35b610f0a6004356146a5565b8060005260206000f35b610f1f6004356121a6565b8060005260206000f35b610f346004356132f5565b8060005260206000f35b610f49600435613da3565b8060005260206000f35b610f5e60043561379f565b8060005260206000f35b610f73600435612878565b8060005260206000f35b610f88600435611b0e565b8060005260206000f35b610f9d600435611ea0565b8060005260206000f35b610fb2600435614ed9565b8060005260206000f35b610fc7600435614bdb565b8060005260206000f35b610fdc600435614c1d565b8060005260206000f35b610ff1600435614245565b8060005260206000f35b6110066004356146ef565b8060005260206000f35b61101b60043561428f565b8060005260206000f35b611030600435614ac3565b8060005260206000f35b611045600435613de5565b8060005260206000f35b61105a6004356132b3565b8060005260206000f35b61106f6004356122be565b8060005260206000f35b611084600435612e9d565b8060005260206000f35b611099600435611b9a565b8060005260206000f35b6110ae6004356127aa565b8060005260206000f35b6110c3600435613e2f565b8060005260206000f35b6110d8600435614849565b8060005260206000f35b6110ed600435614dc1565b8060005260206000f35b61110260043561333f565b8060005260206000f35b61111760043561211a565b8060005260206000f35b61112c600435612692565b8060005260206000f35b611141600435612904565b8060005260206000f35b611156600435612d3b565b8060005260206000f35b61116b600435614b91565b8060005260206000f35b611180600435613a5b565b8060005260206000f35b611195600435612232565b8060005260206000f35b6111aa600435612f6b565b8060005260206000f35b6111bf600435614d35565b8060005260206000f35b6111d4600435611a40565b8060005260206000f35b6111e9600435612ff7565b8060005260206000f35b6111fe60043561431b565b8060005260206000f35b611213600435613159565b8060005260206000f35b611228600435612b97565b8060005260206000f35b61123d600435612990565b8060005260206000f35b611252600435613b73565b8060005260206000f35b611267600435614961565b8060005260206000f35b61127c600435613381565b8060005260206000f35b611291600435613fd3565b8060005260206000f35b6112a660043561257a565b8060005260206000f35b6112bb600435614501565b8060005260206000f35b6112d0600435613d59565b8060005260206000f35b6112e56004356143a7565b8060005260206000f35b6112fa60043561405f565b8060005260206000f35b61130f60043561238c565b8060005260206000f35b611324600435612be1565b8060005260206000f35b611339600435613f89565b8060005260206000f35b61134e60043561294e565b8060005260206000f35b6113636004356124ee565b8060005260206000f35b611378600435614b4f565b8060005260206000f35b61138d6004356133cb565b8060005260206000f35b6113a26004356139cf565b8060005260206000f35b6113b7600435613c8b565b8060005260206000f35b6113cc600435612cf9565b8060005260206000f35b6113e1600435614a79565b8060005260206000f35b6113f66004356149ed565b8060005260206000f35b61140b600435613b29565b8060005260206000f35b611420600435613ccd565b8060005260206000f35b611435600435611f76565b8060005260206000f35b61144a600435614ff1565b8060005260206000f35b61145f600435613525565b8060005260206000f35b61147460043561356f565b8060005260206000f35b6114896004356129dc565b8060005260206000f35b61149e600435614ca9565b8060005260206000f35b6114b3600435612d85565b8060005260206000f35b6114c86004356141b9565b8060005260206000f35b6114dd600435614475565b8060005260206000f35b6114f26004356135fb565b8060005260206000f35b611507600435612530565b8060005260206000f35b61151c600435614663565b8060005260206000f35b611531600435614433565b8060005260206000f35b611546600435614f23565b8060005260206000f35b61155b600435614c67565b8060005260206000f35b611570600435611d3e565b8060005260206000f35b611585600435612a3d565b8060005260206000f35b61159a600435613a11565b8060005260206000f35b6115af600435614619565b8060005260206000f35b6115c4600435613985565b8060005260206000f35b6115d9600435613943565b8060005260206000f35b6115ee600435612418565b8060005260206000f35b6116036004356119b4565b8060005260206000f35b611618600435613a9d565b8060005260206000f35b61162d600435611cb2565b8060005260206000f35b6116426004356129d2565b8060005260206000f35b611657600435612caf565b8060005260206000f35b61166c600435611d88565b8060005260206000f35b611681600435614203565b8060005260206000f35b61169660043561458d565b8060005260206000f35b6116ab600435611f2c565b8060005260206000f35b6116c0600435612a23565b8060005260206000f35b6116d5600435612836565b8060005260206000f35b6116ea6004356138b7565b8060005260206000f35b6116ff6004356145d7565b8060005260206000f35b61171460043561454b565b8060005260206000f35b6117296004356142d1565b8060005260206000f35b61173e600435611e5e565b8060005260206000f35b611753600435614015565b8060005260206000f35b611768600435613c41565b8060005260206000f35b61177d600435611be4565b8060005260206000f35b611792600435614b05565b8060005260206000f35b6117a7600435613713565b8060005260206000f35b6117bc6004356135b1565b8060005260206000f35b6117d16004356144bf565b8060005260206000f35b6117e660043561491f565b8060005260206000f35b6117fb600435612ac9565b8060005260206000f35b6118106004356130cd565b8060005260206000f35b6118256004356140eb565b8060005260206000f35b61183a600435614f65565b8060005260206000f35b61184f60043561196a565b8060005260206000f35b6118646004356148d5565b8060005260206000f35b611879600435614d7f565b8060005260206000f35b61188e600435612002565b8060005260206000f35b6118a3600435613efd565b8060005260206000f35b6118b860043561271e565b8060005260206000f35b6118cd600435614e4d565b8060005260206000f35b6118e2600435611cfc565b8060005260206000f35b6118f7600435612760565b8060005260206000f35b61190c600435614e97565b8060005260206000f35b61192160043561435d565b8060005260206000f35b611936600435614731565b8060005260206000f35b61194b600435614893565b8060005260206000f35b611960600435614a37565b8060005260206000f35b6000600061197f61197a846129dc565b6129dc565b9050605d60020a811015611992576119a2565b61199b816119f6565b91506119ae565b6119ab816119b4565b91505b50919050565b600060006119c1836129dc565b9050605e60020a8110156119d4576119e4565b6119dd81611a40565b91506119f0565b6119ed81611a82565b91505b50919050565b60006000611a0b611a06846129dc565b6129dc565b9050605e60020a811015611a1e57611a2e565b611a2781611a82565b9150611a3a565b611a3781611a40565b91505b50919050565b60006000611a4d836129dc565b9050605f60020a811015611a6057611a70565b611a6981611acc565b9150611a7c565b611a7981611b0e565b91505b50919050565b60006000611a97611a92846129dc565b6129dc565b9050605f60020a811015611aaa57611aba565b611ab381611b0e565b9150611ac6565b611ac381611acc565b91505b50919050565b60006000611ad9836129dc565b9050606060020a811015611aec57611afc565b611af581611b58565b9150611b08565b611b0581611b9a565b91505b50919050565b60006000611b23611b1e846129dc565b6129dc565b9050606060020a811015611b3657611b46565b611b3f81611b9a565b9150611b52565b611b4f81611b58565b91505b50919050565b60006000611b65836129dc565b9050606160020a811015611b7857611b88565b611b8181611be4565b9150611b94565b611b9181611c26565b91505b50919050565b60006000611baf611baa846129dc565b6129dc565b9050606160020a811015611bc257611bd2565b611bcb81611c26565b9150611bde565b611bdb81611be4565b91505b50919050565b60006000611bf1836129dc565b9050606260020a811015611c0457611c14565b611c0d81611c70565b9150611c20565b611c1d81611cb2565b91505b50919050565b60006000611c3b611c36846129dc565b6129dc565b9050606260020a811015611c4e57611c5e565b611c5781611cb2565b9150611c6a565b611c6781611c70565b91505b50919050565b60006000611c7d836129dc565b9050606360020a811015611c9057611ca0565b611c9981611cfc565b9150611cac565b611ca981611d88565b91505b50919050565b60006000611cc7611cc2846129dc565b6129dc565b9050606360020a811015611cda57611cea565b611ce381611d88565b9150611cf6565b611cf381611cfc565b91505b50919050565b60006000611d09836129dc565b9050606460020a811015611d1c57611d2c565b611d2581611dd2565b9150611d38565b611d3581611e14565b91505b50919050565b60006000611d53611d4e846129dc565b6129dc565b9050607a60020a811015611d6657611d76565b611d6f81613269565b9150611d82565b611d7f81613227565b91505b50919050565b60006000611d9d611d98846129dc565b6129dc565b9050606460020a811015611db057611dc0565b611db981611e14565b9150611dcc565b611dc981611dd2565b91505b50919050565b60006000611ddf836129dc565b9050606560020a811015611df257611e02565b611dfb81611e5e565b9150611e0e565b611e0b81611ea0565b91505b50919050565b60006000611e29611e24846129dc565b6129dc565b9050606560020a811015611e3c57611e4c565b611e4581611ea0565b9150611e58565b611e5581611e5e565b91505b50919050565b60006000611e6b836129dc565b9050606660020a811015611e7e57611e8e565b611e8781611eea565b9150611e9a565b611e9781611f2c565b91505b50919050565b60006000611eb5611eb0846129dc565b6129dc565b9050606660020a811015611ec857611ed8565b611ed181611f2c565b9150611ee4565b611ee181611eea565b91505b50919050565b60006000611ef7836129dc565b9050606760020a811015611f0a57611f1a565b611f1381611f76565b9150611f26565b611f2381611fb8565b91505b50919050565b60006000611f41611f3c846129dc565b6129dc565b9050606760020a811015611f5457611f64565b611f5d81611fb8565b9150611f70565b611f6d81611f76565b91505b50919050565b60006000611f83836129dc565b9050606860020a811015611f9657611fa6565b611f9f81612002565b9150611fb2565b611faf81612044565b91505b50919050565b60006000611fcd611fc8846129dc565b6129dc565b9050606860020a811015611fe057611ff0565b611fe981612044565b9150611ffc565b611ff981612002565b91505b50919050565b6000600061200f836129dc565b9050606960020a81101561202257612032565b61202b8161208e565b915061203e565b61203b816120d0565b91505b50919050565b60006000612059612054846129dc565b6129dc565b9050606960020a81101561206c5761207c565b612075816120d0565b9150612088565b6120858161208e565b91505b50919050565b6000600061209b836129dc565b9050606a60020a8110156120ae576120be565b6120b78161211a565b91506120ca565b6120c78161215c565b91505b50919050565b600060006120e56120e0846129dc565b6129dc565b9050606a60020a8110156120f857612108565b6121018161215c565b9150612114565b6121118161211a565b91505b50919050565b60006000612127836129dc565b9050606b60020a81101561213a5761214a565b612143816121a6565b9150612156565b612153816121e8565b91505b50919050565b6000600061217161216c846129dc565b6129dc565b9050606b60020a81101561218457612194565b61218d816121e8565b91506121a0565b61219d816121a6565b91505b50919050565b600060006121b3836129dc565b9050606c60020a8110156121c6576121d6565b6121cf81612232565b91506121e2565b6121df81612274565b91505b50919050565b600060006121fd6121f8846129dc565b6129dc565b9050606c60020a81101561221057612220565b61221981612274565b915061222c565b61222981612232565b91505b50919050565b6000600061223f836129dc565b9050606d60020a81101561225257612262565b61225b816122be565b915061226e565b61226b81612300565b91505b50919050565b60006000612289612284846129dc565b6129dc565b9050606d60020a81101561229c576122ac565b6122a581612300565b91506122b8565b6122b5816122be565b91505b50919050565b600060006122cb836129dc565b9050606e60020a8110156122de576122ee565b6122e78161234a565b91506122fa565b6122f78161238c565b91505b50919050565b60006000612315612310846129dc565b6129dc565b9050606e60020a81101561232857612338565b6123318161238c565b9150612344565b6123418161234a565b91505b50919050565b60006000612357836129dc565b9050606f60020a81101561236a5761237a565b612373816123d6565b9150612386565b61238381612418565b91505b50919050565b600060006123a161239c846129dc565b6129dc565b9050606f60020a8110156123b4576123c4565b6123bd81612418565b91506123d0565b6123cd816123d6565b91505b50919050565b600060006123e3836129dc565b9050607060020a8110156123f657612406565b6123ff81612462565b9150612412565b61240f816124a4565b91505b50919050565b6000600061242d612428846129dc565b6129dc565b9050607060020a81101561244057612450565b612449816124a4565b915061245c565b61245981612462565b91505b50919050565b6000600061246f836129dc565b9050607160020a81101561248257612492565b61248b816124ee565b915061249e565b61249b81612530565b91505b50919050565b600060006124b96124b4846129dc565b6129dc565b9050607160020a8110156124cc576124dc565b6124d581612530565b91506124e8565b6124e5816124ee565b91505b50919050565b600060006124fb836129dc565b9050607260020a81101561250e5761251e565b6125178161257a565b915061252a565b612527816125bc565b91505b50919050565b60006000612545612540846129dc565b6129dc565b9050607260020a81101561255857612568565b612561816125bc565b9150612574565b6125718161257a565b91505b50919050565b60006000612587836129dc565b9050607360020a81101561259a576125aa565b6125a381612606565b91506125b6565b6125b381612648565b91505b50919050565b600060006125d16125cc846129dc565b6129dc565b9050607360020a8110156125e4576125f4565b6125ed81612648565b9150612600565b6125fd81612606565b91505b50919050565b60006000612613836129dc565b9050607460020a81101561262657612636565b61262f81612692565b9150612642565b61263f816126d4565b91505b50919050565b6000600061265d612658846129dc565b6129dc565b9050607460020a81101561267057612680565b612679816126d4565b915061268c565b61268981612692565b91505b50919050565b6000600061269f836129dc565b9050607560020a8110156126b2576126c2565b6126bb8161271e565b91506126ce565b6126cb81612760565b91505b50919050565b600060006126e96126e4846129dc565b6129dc565b9050607560020a8110156126fc5761270c565b61270581612760565b9150612718565b6127158161271e565b91505b50919050565b6000600061272b836129dc565b9050607660020a81101561273e5761274e565b612747816127aa565b915061275a565b612757816127ec565b91505b50919050565b60006000612775612770846129dc565b6129dc565b9050607660020a81101561278857612798565b612791816127ec565b91506127a4565b6127a1816127aa565b91505b50919050565b600060006127b7836129dc565b9050607760020a8110156127ca576127da565b6127d381612836565b91506127e6565b6127e381612878565b91505b50919050565b600060006128016127fc846129dc565b6129dc565b9050607760020a81101561281457612824565b61281d81612878565b9150612830565b61282d81612836565b91505b50919050565b60006000612843836129dc565b9050607860020a81101561285657612866565b61285f816128c2565b9150612872565b61286f81612904565b91505b50919050565b6000600061288d612888846129dc565b6129dc565b9050607860020a8110156128a0576128b0565b6128a981612904565b91506128bc565b6128b9816128c2565b91505b50919050565b600060006128cf836129dc565b9050607960020a8110156128e2576128f2565b6128eb8161294e565b91506128fe565b6128fb81611d3e565b91505b50919050565b60006000612919612914846129dc565b6129dc565b9050607960020a81101561292c5761293c565b61293581611d3e565b9150612948565b6129458161294e565b91505b50919050565b6000600061295b836129dc565b9050607a60020a81101561296e5761297e565b61297781613227565b915061298a565b61298781613269565b91505b50919050565b6000600061299d836129dc565b9050604e60020a8110156129b0576129c0565b6129b981612a7f565b91506129cc565b6129c981612a3d565b91505b50919050565b6000819050919050565b600060007f5851f42d4c957f2c0000000000000000000000000000000000000000000000019050828102600101915050919050565b6000612a1c826129d2565b9050919050565b6000612a36612a31836129dc565b6129d2565b9050919050565b60006000612a4a836129dc565b9050604f60020a811015612a5d57612a6d565b612a6681612ac9565b9150612a79565b612a7681612b0b565b91505b50919050565b60006000612a94612a8f846129dc565b6129dc565b9050604f60020a811015612aa757612ab7565b612ab081612b0b565b9150612ac3565b612ac081612ac9565b91505b50919050565b60006000612ad6836129dc565b9050605060020a811015612ae957612af9565b612af281612b55565b9150612b05565b612b0281612b97565b91505b50919050565b60006000612b20612b1b846129dc565b6129dc565b9050605060020a811015612b3357612b43565b612b3c81612b97565b9150612b4f565b612b4c81612b55565b91505b50919050565b60006000612b62836129dc565b9050605160020a811015612b7557612b85565b612b7e81612be1565b9150612b91565b612b8e81612c23565b91505b50919050565b60006000612bac612ba7846129dc565b6129dc565b9050605160020a811015612bbf57612bcf565b612bc881612c23565b9150612bdb565b612bd881612be1565b91505b50919050565b60006000612bee836129dc565b9050605260020a811015612c0157612c11565b612c0a81612c6d565b9150612c1d565b612c1a81612caf565b91505b50919050565b60006000612c38612c33846129dc565b6129dc565b9050605260020a811015612c4b57612c5b565b612c5481612caf565b9150612c67565b612c6481612c6d565b91505b50919050565b60006000612c7a836129dc565b9050605360020a811015612c8d57612c9d565b612c9681612cf9565b9150612ca9565b612ca681612d3b565b91505b50919050565b60006000612cc4612cbf846129dc565b6129dc565b9050605360020a811015612cd757612ce7565b612ce081612d3b565b9150612cf3565b612cf081612cf9565b91505b50919050565b60006000612d06836129dc565b9050605460020a811015612d1957612d29565b612d2281612d85565b9150612d35565b612d3281612dc7565b91505b50919050565b60006000612d50612d4b846129dc565b6129dc565b9050605460020a811015612d6357612d73565b612d6c81612dc7565b9150612d7f565b612d7c81612d85565b91505b50919050565b60006000612d92836129dc565b9050605560020a811015612da557612db5565b612dae81612e11565b9150612dc1565b612dbe81612e53565b91505b50919050565b60006000612ddc612dd7846129dc565b6129dc565b9050605560020a811015612def57612dff565b612df881612e53565b9150612e0b565b612e0881612e11565b91505b50919050565b60006000612e1e836129dc565b9050605660020a811015612e3157612e41565b612e3a81612e9d565b9150612e4d565b612e4a81612edf565b91505b50919050565b60006000612e68612e63846129dc565b6129dc565b9050605660020a811015612e7b57612e8b565b612e8481612edf565b9150612e97565b612e9481612e9d565b91505b50919050565b60006000612eaa836129dc565b9050605760020a811015612ebd57612ecd565b612ec681612f29565b9150612ed9565b612ed681612f6b565b91505b50919050565b60006000612ef4612eef846129dc565b6129dc565b9050605760020a811015612f0757612f17565b612f1081612f6b565b9150612f23565b612f2081612f29565b91505b50919050565b60006000612f36836129dc565b9050605860020a811015612f4957612f59565b612f5281612fb5565b9150612f65565b612f6281612ff7565b91505b50919050565b60006000612f80612f7b846129dc565b6129dc565b9050605860020a811015612f9357612fa3565b612f9c81612ff7565b9150612faf565b612fac81612fb5565b91505b50919050565b60006000612fc2836129dc565b9050605960020a811015612fd557612fe5565b612fde81613041565b9150612ff1565b612fee81613083565b91505b50919050565b6000600061300c613007846129dc565b6129dc565b9050605960020a81101561301f5761302f565b61302881613083565b915061303b565b61303881613041565b91505b50919050565b6000600061304e836129dc565b9050605a60020a81101561306157613071565b61306a816130cd565b915061307d565b61307a8161310f565b91505b50919050565b60006000613098613093846129dc565b6129dc565b9050605a60020a8110156130ab576130bb565b6130b48161310f565b91506130c7565b6130c4816130cd565b91505b50919050565b600060006130da836129dc565b9050605b60020a8110156130ed576130fd565b6130f681613159565b9150613109565b6131068161319b565b91505b50919050565b6000600061312461311f846129dc565b6129dc565b9050605b60020a81101561313757613147565b6131408161319b565b9150613153565b61315081613159565b91505b50919050565b60006000613166836129dc565b9050605c60020a81101561317957613189565b613182816131e5565b9150613195565b6131928161196a565b91505b50919050565b600060006131b06131ab846129dc565b6129dc565b9050605c60020a8110156131c3576131d3565b6131cc8161196a565b91506131df565b6131dc816131e5565b91505b50919050565b600060006131f2836129dc565b9050605d60020a81101561320557613215565b61320e816119b4565b9150613221565b61321e816119f6565b91505b50919050565b60006000613234836129dc565b9050607b60020a81101561324757613257565b613250816132b3565b9150613263565b613260816132f5565b91505b50919050565b6000600061327e613279846129dc565b6129dc565b9050607b60020a811015613291576132a1565b61329a816132f5565b91506132ad565b6132aa816132b3565b91505b50919050565b600060006132c0836129dc565b9050607c60020a8110156132d3576132e3565b6132dc8161333f565b91506132ef565b6132ec81613381565b91505b50919050565b6000600061330a613305846129dc565b6129dc565b9050607c60020a81101561331d5761332d565b61332681613381565b9150613339565b6133368161333f565b91505b50919050565b6000600061334c836129dc565b9050607d60020a81101561335f5761336f565b613368816133cb565b915061337b565b6133788161340d565b91505b50919050565b60006000613396613391846129dc565b6129dc565b9050607d60020a8110156133a9576133b9565b6133b28161340d565b91506133c5565b6133c2816133cb565b91505b50919050565b600060006133d8836129dc565b9050607e60020a8110156133eb576133fb565b6133f481613457565b9150613407565b61340481613499565b91505b50919050565b6000600061342261341d846129dc565b6129dc565b9050607e60020a81101561343557613445565b61343e81613499565b9150613451565b61344e81613457565b91505b50919050565b60006000613464836129dc565b9050607f60020a81101561347757613487565b613480816134e3565b9150613493565b61349081613525565b91505b50919050565b600060006134ae6134a9846129dc565b6129dc565b9050607f60020a8110156134c1576134d1565b6134ca81613525565b91506134dd565b6134da816134e3565b91505b50919050565b600060006134f0836129dc565b9050608060020a81101561350357613513565b61350c8161356f565b915061351f565b61351c816135b1565b91505b50919050565b6000600061353a613535846129dc565b6129dc565b9050608060020a81101561354d5761355d565b613556816135b1565b9150613569565b6135668161356f565b91505b50919050565b6000600061357c836129dc565b9050608160020a81101561358f5761359f565b613598816135fb565b91506135ab565b6135a88161363d565b91505b50919050565b600060006135c66135c1846129dc565b6129dc565b9050608160020a8110156135d9576135e9565b6135e28161363d565b91506135f5565b6135f2816135fb565b91505b50919050565b60006000613608836129dc565b9050608260020a81101561361b5761362b565b61362481613687565b9150613637565b613634816136c9565b91505b50919050565b6000600061365261364d846129dc565b6129dc565b9050608260020a81101561366557613675565b61366e816136c9565b9150613681565b61367e81613687565b91505b50919050565b60006000613694836129dc565b9050608360020a8110156136a7576136b7565b6136b081613713565b91506136c3565b6136c081613755565b91505b50919050565b600060006136de6136d9846129dc565b6129dc565b9050608360020a8110156136f157613701565b6136fa81613755565b915061370d565b61370a81613713565b91505b50919050565b60006000613720836129dc565b9050608460020a81101561373357613743565b61373c8161379f565b915061374f565b61374c816137e1565b91505b50919050565b6000600061376a613765846129dc565b6129dc565b9050608460020a81101561377d5761378d565b613786816137e1565b9150613799565b6137968161379f565b91505b50919050565b600060006137ac836129dc565b9050608560020a8110156137bf576137cf565b6137c88161382b565b91506137db565b6137d88161386d565b91505b50919050565b600060006137f66137f1846129dc565b6129dc565b9050608560020a81101561380957613819565b6138128161386d565b9150613825565b6138228161382b565b91505b50919050565b60006000613838836129dc565b9050608660020a81101561384b5761385b565b613854816138b7565b9150613867565b613864816138f9565b91505b50919050565b6000600061388261387d846129dc565b6129dc565b9050608660020a811015613895576138a5565b61389e816138f9565b91506138b1565b6138ae816138b7565b91505b50919050565b600060006138c4836129dc565b9050608760020a8110156138d7576138e7565b6138e081613943565b91506138f3565b6138f081613985565b91505b50919050565b6000600061390e613909846129dc565b6129dc565b9050608760020a81101561392157613931565b61392a81613985565b915061393d565b61393a81613943565b91505b50919050565b60006000613950836129dc565b9050608860020a81101561396357613973565b61396c816139cf565b915061397f565b61397c81613a11565b91505b50919050565b6000600061399a613995846129dc565b6129dc565b9050608860020a8110156139ad576139bd565b6139b681613a11565b91506139c9565b6139c6816139cf565b91505b50919050565b600060006139dc836129dc565b9050608960020a8110156139ef576139ff565b6139f881613a5b565b9150613a0b565b613a0881613a9d565b91505b50919050565b60006000613a26613a21846129dc565b6129dc565b9050608960020a811015613a3957613a49565b613a4281613a9d565b9150613a55565b613a5281613a5b565b91505b50919050565b60006000613a68836129dc565b9050608a60020a811015613a7b57613a8b565b613a8481613ae7565b9150613a97565b613a9481613b29565b91505b50919050565b60006000613ab2613aad846129dc565b6129dc565b9050608a60020a811015613ac557613ad5565b613ace81613b29565b9150613ae1565b613ade81613ae7565b91505b50919050565b60006000613af4836129dc565b9050608b60020a811015613b0757613b17565b613b1081613b73565b9150613b23565b613b2081613bb5565b91505b50919050565b60006000613b3e613b39846129dc565b6129dc565b9050608b60020a811015613b5157613b61565b613b5a81613bb5565b9150613b6d565b613b6a81613b73565b91505b50919050565b60006000613b80836129dc565b9050608c60020a811015613b9357613ba3565b613b9c81613bff565b9150613baf565b613bac81613c41565b91505b50919050565b60006000613bca613bc5846129dc565b6129dc565b9050608c60020a811015613bdd57613bed565b613be681613c41565b9150613bf9565b613bf681613bff565b91505b50919050565b60006000613c0c836129dc565b9050608d60020a811015613c1f57613c2f565b613c2881613c8b565b9150613c3b565b613c3881613ccd565b91505b50919050565b60006000613c56613c51846129dc565b6129dc565b9050608d60020a811015613c6957613c79565b613c7281613ccd565b9150613c85565b613c8281613c8b565b91505b50919050565b60006000613c98836129dc565b9050608e60020a811015613cab57613cbb565b613cb481613d17565b9150613cc7565b613cc481613d59565b91505b50919050565b60006000613ce2613cdd846129dc565b6129dc565b9050608e60020a811015613cf557613d05565b613cfe81613d59565b9150613d11565b613d0e81613d17565b91505b50919050565b60006000613d24836129dc565b9050608f60020a811015613d3757613d47565b613d4081613da3565b9150613d53565b613d5081613de5565b91505b50919050565b60006000613d6e613d69846129dc565b6129dc565b9050608f60020a811015613d8157613d91565b613d8a81613de5565b9150613d9d565b613d9a81613da3565b91505b50919050565b60006000613db0836129dc565b9050609060020a811015613dc357613dd3565b613dcc81613e2f565b9150613ddf565b613ddc81613e71565b91505b50919050565b60006000613dfa613df5846129dc565b6129dc565b9050609060020a811015613e0d57613e1d565b613e1681613e71565b9150613e29565b613e2681613e2f565b91505b50919050565b60006000613e3c836129dc565b9050609160020a811015613e4f57613e5f565b613e5881613ebb565b9150613e6b565b613e6881613efd565b91505b50919050565b60006000613e86613e81846129dc565b6129dc565b9050609160020a811015613e9957613ea9565b613ea281613efd565b9150613eb5565b613eb281613ebb565b91505b50919050565b60006000613ec8836129dc565b9050609260020a811015613edb57613eeb565b613ee481613f47565b9150613ef7565b613ef481613f89565b91505b50919050565b60006000613f12613f0d846129dc565b6129dc565b9050609260020a811015613f2557613f35565b613f2e81613f89565b9150613f41565b613f3e81613f47565b91505b50919050565b60006000613f54836129dc565b9050609360020a811015613f6757613f77565b613f7081613fd3565b9150613f83565b613f8081614015565b91505b50919050565b60006000613f9e613f99846129dc565b6129dc565b9050609360020a811015613fb157613fc1565b613fba81614015565b9150613fcd565b613fca81613fd3565b91505b50919050565b60006000613fe0836129dc565b9050609460020a811015613ff357614003565b613ffc8161405f565b915061400f565b61400c816140a1565b91505b50919050565b6000600061402a614025846129dc565b6129dc565b9050609460020a81101561403d5761404d565b614046816140a1565b9150614059565b6140568161405f565b91505b50919050565b6000600061406c836129dc565b9050609560020a81101561407f5761408f565b614088816140eb565b915061409b565b6140988161412d565b91505b50919050565b600060006140b66140b1846129dc565b6129dc565b9050609560020a8110156140c9576140d9565b6140d28161412d565b91506140e5565b6140e2816140eb565b91505b50919050565b600060006140f8836129dc565b9050609660020a81101561410b5761411b565b61411481614177565b9150614127565b614124816141b9565b91505b50919050565b6000600061414261413d846129dc565b6129dc565b9050609660020a81101561415557614165565b61415e816141b9565b9150614171565b61416e81614177565b91505b50919050565b60006000614184836129dc565b9050609760020a811015614197576141a7565b6141a081614203565b91506141b3565b6141b081614245565b91505b50919050565b600060006141ce6141c9846129dc565b6129dc565b9050609760020a8110156141e1576141f1565b6141ea81614245565b91506141fd565b6141fa81614203565b91505b50919050565b60006000614210836129dc565b9050609860020a81101561422357614233565b61422c8161428f565b915061423f565b61423c816142d1565b91505b50919050565b6000600061425a614255846129dc565b6129dc565b9050609860020a81101561426d5761427d565b614276816142d1565b9150614289565b6142868161428f565b91505b50919050565b6000600061429c836129dc565b9050609960020a8110156142af576142bf565b6142b88161431b565b91506142cb565b6142c88161435d565b91505b50919050565b600060006142e66142e1846129dc565b6129dc565b9050609960020a8110156142f957614309565b6143028161435d565b9150614315565b6143128161431b565b91505b50919050565b60006000614328836129dc565b9050609a60020a81101561433b5761434b565b614344816143a7565b9150614357565b614354816143e9565b91505b50919050565b6000600061437261436d846129dc565b6129dc565b9050609a60020a81101561438557614395565b61438e816143e9565b91506143a1565b61439e816143a7565b91505b50919050565b600060006143b4836129dc565b9050609b60020a8110156143c7576143d7565b6143d081614433565b91506143e3565b6143e081614475565b91505b50919050565b600060006143fe6143f9846129dc565b6129dc565b9050609b60020a81101561441157614421565b61441a81614475565b915061442d565b61442a81614433565b91505b50919050565b60006000614440836129dc565b9050609c60020a81101561445357614463565b61445c816144bf565b915061446f565b61446c81614501565b91505b50919050565b6000600061448a614485846129dc565b6129dc565b9050609c60020a81101561449d576144ad565b6144a681614501565b91506144b9565b6144b6816144bf565b91505b50919050565b600060006144cc836129dc565b9050609d60020a8110156144df576144ef565b6144e88161454b565b91506144fb565b6144f88161458d565b91505b50919050565b60006000614516614511846129dc565b6129dc565b9050609d60020a81101561452957614539565b6145328161458d565b9150614545565b6145428161454b565b91505b50919050565b60006000614558836129dc565b9050609e60020a81101561456b5761457b565b614574816145d7565b9150614587565b61458481614619565b91505b50919050565b600060006145a261459d846129dc565b6129dc565b9050609e60020a8110156145b5576145c5565b6145be81614619565b91506145d1565b6145ce816145d7565b91505b50919050565b600060006145e4836129dc565b9050609f60020a8110156145f757614607565b61460081614663565b9150614613565b614610816146a5565b91505b50919050565b6000600061462e614629846129dc565b6129dc565b9050609f60020a81101561464157614651565b61464a816146a5565b915061465d565b61465a81614663565b91505b50919050565b60006000614670836129dc565b905060a060020a81101561468357614693565b61468c816146ef565b915061469f565b61469c81614731565b91505b50919050565b600060006146ba6146b5846129dc565b6129dc565b905060a060020a8110156146cd576146dd565b6146d681614731565b91506146e9565b6146e6816146ef565b91505b50919050565b600060006146fc836129dc565b905060a160020a81101561470f5761471f565b6147188161477b565b915061472b565b614728816147bd565b91505b50919050565b60006000614746614741846129dc565b6129dc565b905060a160020a81101561475957614769565b614762816147bd565b9150614775565b6147728161477b565b91505b50919050565b60006000614788836129dc565b905060a260020a81101561479b576147ab565b6147a481614807565b91506147b7565b6147b481614849565b91505b50919050565b600060006147d26147cd846129dc565b6129dc565b905060a260020a8110156147e5576147f5565b6147ee81614849565b9150614801565b6147fe81614807565b91505b50919050565b60006000614814836129dc565b905060a360020a81101561482757614837565b61483081614893565b9150614843565b614840816148d5565b91505b50919050565b6000600061485e614859846129dc565b6129dc565b905060a360020a81101561487157614881565b61487a816148d5565b915061488d565b61488a81614893565b91505b50919050565b600060006148a0836129dc565b905060a460020a8110156148b3576148c3565b6148bc8161491f565b91506148cf565b6148cc81614961565b91505b50919050565b600060006148ea6148e5846129dc565b6129dc565b905060a460020a8110156148fd5761490d565b61490681614961565b9150614919565b6149168161491f565b91505b50919050565b6000600061492c836129dc565b905060a560020a81101561493f5761494f565b614948816149ab565b915061495b565b614958816149ed565b91505b50919050565b60006000614976614971846129dc565b6129dc565b905060a560020a81101561498957614999565b614992816149ed565b91506149a5565b6149a2816149ab565b91505b50919050565b600060006149b8836129dc565b905060a660020a8110156149cb576149db565b6149d481614a37565b91506149e7565b6149e481614a79565b91505b50919050565b60006000614a026149fd846129dc565b6129dc565b905060a660020a811015614a1557614a25565b614a1e81614a79565b9150614a31565b614a2e81614a37565b91505b50919050565b60006000614a44836129dc565b905060a760020a811015614a5757614a67565b614a6081614ac3565b9150614a73565b614a7081614b05565b91505b50919050565b60006000614a8e614a89846129dc565b6129dc565b905060a760020a811015614aa157614ab1565b614aaa81614b05565b9150614abd565b614aba81614ac3565b91505b50919050565b60006000614ad0836129dc565b905060a860020a811015614ae357614af3565b614aec81614b4f565b9150614aff565b614afc81614b91565b91505b50919050565b60006000614b1a614b15846129dc565b6129dc565b905060a860020a811015614b2d57614b3d565b614b3681614b91565b9150614b49565b614b4681614b4f565b91505b50919050565b60006000614b5c836129dc565b905060a960020a811015614b6f57614b7f565b614b7881614bdb565b9150614b8b565b614b8881614c1d565b91505b50919050565b60006000614ba6614ba1846129dc565b6129dc565b905060a960020a811015614bb957614bc9565b614bc281614c1d565b9150614bd5565b614bd281614bdb565b91505b50919050565b60006000614be8836129dc565b905060aa60020a811015614bfb57614c0b565b614c0481614c67565b9150614c17565b614c1481614ca9565b91505b50919050565b60006000614c32614c2d846129dc565b6129dc565b905060aa60020a811015614c4557614c55565b614c4e81614ca9565b9150614c61565b614c5e81614c67565b91505b50919050565b60006000614c74836129dc565b905060ab60020a811015614c8757614c97565b614c9081614cf3565b9150614ca3565b614ca081614d35565b91505b50919050565b60006000614cbe614cb9846129dc565b6129dc565b905060ab60020a811015614cd157614ce1565b614cda81614d35565b9150614ced565b614cea81614cf3565b91505b50919050565b60006000614d00836129dc565b905060ac60020a811015614d1357614d23565b614d1c81614d7f565b9150614d2f565b614d2c81614dc1565b91505b50919050565b60006000614d4a614d45846129dc565b6129dc565b905060ac60020a811015614d5d57614d6d565b614d6681614dc1565b9150614d79565b614d7681614d7f565b91505b50919050565b60006000614d8c836129dc565b905060ad60020a811015614d9f57614daf565b614da881614e0b565b9150614dbb565b614db881614e4d565b91505b50919050565b60006000614dd6614dd1846129dc565b6129dc565b905060ad60020a811015614de957614df9565b614df281614e4d565b9150614e05565b614e0281614e0b565b91505b50919050565b60006000614e18836129dc565b905060ae60020a811015614e2b57614e3b565b614e3481614e97565b9150614e47565b614e4481614ed9565b91505b50919050565b60006000614e62614e5d846129dc565b6129dc565b905060ae60020a811015614e7557614e85565b614e7e81614ed9565b9150614e91565b614e8e81614e97565b91505b50919050565b60006000614ea4836129dc565b905060af60020a811015614eb757614ec7565b614ec081614f23565b9150614ed3565b614ed081614f65565b91505b50919050565b60006000614eee614ee9846129dc565b6129dc565b905060af60020a811015614f0157614f11565b614f0a81614f65565b9150614f1d565b614f1a81614f23565b91505b50919050565b60006000614f30836129dc565b905060b060020a811015614f4357614f53565b614f4c81614faf565b9150614f5f565b614f5c81614ff1565b91505b50919050565b60006000614f7a614f75846129dc565b6129dc565b905060b060020a811015614f8d57614f9d565b614f9681614ff1565b9150614fa9565b614fa681614faf565b91505b50919050565b60006000614fbc836129dc565b905060b160020a811015614fcf57614fdf565b614fd881612a11565b9150614feb565b614fe881612a23565b91505b50919050565b60006000615006615001846129dc565b6129dc565b905060b160020a81101561501957615029565b61502281612a23565b9150615035565b61503281612a11565b91505b5091905056",
@@ -25,7 +25,7 @@
             "//"   : "ManyFunctions.start(1)",
             "data" : "0x95805DAD0000000000000000000000000000000000000000000000000000000000000001",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
     "ackermann31": {
@@ -39,7 +39,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "//" : "PerformanceTester.sol",
                 "code" : "0x60e060020a6000350480632839e92814601e57806361047ff414603457005b602a6004356024356047565b8060005260206000f35b603d6004356099565b8060005260206000f35b600082600014605457605e565b8160010190506093565b81600014606957607b565b60756001840360016047565b90506093565b609060018403608c85600186036047565b6047565b90505b92915050565b6000816000148060a95750816001145b60b05760b7565b81905060cf565b60c1600283036099565b60cb600184036099565b0190505b91905056",
@@ -54,7 +54,7 @@
             "//"   : "ackermann(3, 1)",
             "data" : "0x2839e92800000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000001",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
     "ackermann32": {
@@ -68,7 +68,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "//" : "PerformanceTester.sol",
                 "code" : "0x60e060020a6000350480632839e92814601e57806361047ff414603457005b602a6004356024356047565b8060005260206000f35b603d6004356099565b8060005260206000f35b600082600014605457605e565b8160010190506093565b81600014606957607b565b60756001840360016047565b90506093565b609060018403608c85600186036047565b6047565b90505b92915050565b6000816000148060a95750816001145b60b05760b7565b81905060cf565b60c1600283036099565b60cb600184036099565b0190505b91905056",
@@ -97,7 +97,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "//" : "PerformanceTester.sol",
                 "code" : "0x60e060020a6000350480632839e92814601e57806361047ff414603457005b602a6004356024356047565b8060005260206000f35b603d6004356099565b8060005260206000f35b600082600014605457605e565b8160010190506093565b81600014606957607b565b60756001840360016047565b90506093565b609060018403608c85600186036047565b6047565b90505b92915050565b6000816000148060a95750816001145b60b05760b7565b81905060cf565b60c1600283036099565b60cb600184036099565b0190505b91905056",
@@ -126,7 +126,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "//"   : "PerformanceTester.sol",
                 "code" : "0x60e060020a6000350480632839e92814601e57806361047ff414603457005b602a6004356024356047565b8060005260206000f35b603d6004356099565b8060005260206000f35b600082600014605457605e565b8160010190506093565b81600014606957607b565b60756001840360016047565b90506093565b609060018403608c85600186036047565b6047565b90505b92915050565b6000816000148060a95750816001145b60b05760b7565b81905060cf565b60c1600283036099565b60cb600184036099565b0190505b91905056",
@@ -155,7 +155,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "//"   : "PerformanceTester.sol",
                 "code" : "0x60e060020a6000350480632839e92814601e57806361047ff414603457005b602a6004356024356047565b8060005260206000f35b603d6004356099565b8060005260206000f35b600082600014605457605e565b8160010190506093565b81600014606957607b565b60756001840360016047565b90506093565b609060018403608c85600186036047565b6047565b90505b92915050565b6000816000148060a95750816001145b60b05760b7565b81905060cf565b60c1600283036099565b60cb600184036099565b0190505b91905056",
diff --git a/vmPushDupSwapTestFiller.json b/vmPushDupSwapTestFiller.json
index 1aca4792..9b8930e0 100644
--- a/vmPushDupSwapTestFiller.json
+++ b/vmPushDupSwapTestFiller.json
@@ -10,7 +10,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x60ff600355",
                 "storage": {}
@@ -23,7 +23,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -38,7 +38,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x60",
                 "storage": {}
@@ -51,7 +51,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -66,7 +66,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x61eeff600355",
                 "storage": {}
@@ -79,7 +79,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -94,7 +94,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x62ddeeff600355",
                 "storage": {}
@@ -107,7 +107,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -122,7 +122,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x63ccddeeff600355",
                 "storage": {}
@@ -135,7 +135,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -150,7 +150,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x64bbccddeeff600355",
                 "storage": {}
@@ -163,7 +163,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -178,7 +178,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x65aabbccddeeff600355",
                 "storage": {}
@@ -191,7 +191,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -206,7 +206,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x6699aabbccddeeff600355",
                 "storage": {}
@@ -219,7 +219,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -234,7 +234,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x678899aabbccddeeff600355",
                 "storage": {}
@@ -247,7 +247,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -262,7 +262,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x68778899aabbccddeeff600355",
                 "storage": {}
@@ -275,7 +275,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -290,7 +290,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x6966778899aabbccddeeff600355",
                 "storage": {}
@@ -303,7 +303,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -318,7 +318,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x6a5566778899aabbccddeeff600355",
                 "storage": {}
@@ -331,7 +331,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -346,7 +346,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x6b445566778899aabbccddeeff600355",
                 "storage": {}
@@ -359,7 +359,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -374,7 +374,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x6c33445566778899aabbccddeeff600355",
                 "storage": {}
@@ -387,7 +387,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -402,7 +402,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x6d2233445566778899aabbccddeeff600355",
                 "storage": {}
@@ -415,7 +415,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -430,7 +430,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x6e112233445566778899aabbccddeeff600355",
                 "storage": {}
@@ -443,7 +443,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -458,7 +458,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x6f10112233445566778899aabbccddeeff600355",
                 "storage": {}
@@ -471,7 +471,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -486,7 +486,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x70ff00112233445566778899aabbccddeeff600355",
                 "storage": {}
@@ -499,7 +499,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -514,7 +514,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x71eeff00112233445566778899aabbccddeeff600355",
                 "storage": {}
@@ -527,7 +527,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -542,7 +542,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x72ddeeff00112233445566778899aabbccddeeff600355",
                 "storage": {}
@@ -555,7 +555,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -570,7 +570,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x73ccddeeff00112233445566778899aabbccddeeff600355",
                 "storage": {}
@@ -583,7 +583,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -598,7 +598,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x74bbccddeeff00112233445566778899aabbccddeeff600355",
                 "storage": {}
@@ -611,7 +611,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -626,7 +626,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x75aabbccddeeff00112233445566778899aabbccddeeff600355",
                 "storage": {}
@@ -639,7 +639,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -654,7 +654,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x7699aabbccddeeff00112233445566778899aabbccddeeff600355",
                 "storage": {}
@@ -667,7 +667,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -682,7 +682,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x778899aabbccddeeff00112233445566778899aabbccddeeff600355",
                 "storage": {}
@@ -695,7 +695,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -710,7 +710,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x78778899aabbccddeeff00112233445566778899aabbccddeeff600355",
                 "storage": {}
@@ -723,7 +723,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -738,7 +738,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x7966778899aabbccddeeff00112233445566778899aabbccddeeff600355",
                 "storage": {}
@@ -751,7 +751,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -767,7 +767,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x7a5566778899aabbccddeeff00112233445566778899aabbccddeeff600355",
                 "storage": {}
@@ -780,7 +780,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -795,7 +795,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x7b445566778899aabbccddeeff00112233445566778899aabbccddeeff600355",
                 "storage": {}
@@ -808,7 +808,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -823,7 +823,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x7c33445566778899aabbccddeeff00112233445566778899aabbccddeeff600355",
                 "storage": {}
@@ -836,7 +836,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -851,7 +851,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x7d2233445566778899aabbccddeeff00112233445566778899aabbccddeeff600355",
                 "storage": {}
@@ -864,7 +864,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -879,7 +879,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x7e112233445566778899aabbccddeeff00112233445566778899aabbccddeeff600355",
                 "storage": {}
@@ -892,7 +892,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -907,7 +907,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x7f10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff600355",
                 "storage": {}
@@ -920,7 +920,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -935,7 +935,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x7fff10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff600355",
                 "storage": {}
@@ -948,7 +948,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -964,7 +964,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x7fff10112233445566778899aabbccddeeff00112233445566778899aabbccdd",
                 "storage": {}
@@ -977,7 +977,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -992,7 +992,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "(asm 101 2002 303303 40444404 50555555505 60666666666606 7777777777777777 888888888888888888 99999999999999999999 10000000000000000000001 10111111111111111111111101 2022222222222222222222222202 303333333333333333333333333303 4044444444444444444444444444444404 505555555555555555555555555555555505 60666666666666666666666666666666666606 7077777777777777777777777777777777777707 808888888888888888888888888888888888888808 90999999999999999999999999999999999999999909 100000000000000000000000000000000000000000000001 10111111111111111111111111111111111111111111111101 2022222222222222222222222222222222222222222222222202 303333333333333333333333333333333333333333333333333303 40444444444444444444444444444444444444444444444444444404 50555555555555555555555555555555555555555555555555555555505 6066666666666666666666666666666666666666666666666666666666606 707777777777777777777777777777777777777777777777777777777777707 808888888888888888888888888888888888888888888888888888888888888808 90999999999999999999999999999999999999999999999999999999999999999909 100000000000000000000000000000000000000000000000000000000000000000000001 10111111111111111111111111111111111111111111111111111111111111111111111101 2022222222222222222222222222222222222222222222222222222222222222222222222202)",
                 "storage": {}
@@ -1020,7 +1020,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x7f10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff80600355",
                 "storage": {}
@@ -1033,7 +1033,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1048,7 +1048,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x7f10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff81600355",
                 "storage": {}
@@ -1061,7 +1061,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1076,7 +1076,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x6002600181600355",
                 "storage": {}
@@ -1089,7 +1089,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1104,7 +1104,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x60036002600182600355",
                 "storage": {}
@@ -1117,7 +1117,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1132,7 +1132,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x600460036002600183600355",
                 "storage": {}
@@ -1145,7 +1145,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1160,7 +1160,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x6005600460036002600184600355",
                 "storage": {}
@@ -1173,7 +1173,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1188,7 +1188,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x60066005600460036002600185600355",
                 "storage": {}
@@ -1201,7 +1201,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1216,7 +1216,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x600760066005600460036002600186600355",
                 "storage": {}
@@ -1229,7 +1229,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1244,7 +1244,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x6008600760066005600460036002600187600355",
                 "storage": {}
@@ -1257,7 +1257,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1272,7 +1272,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x60096008600760066005600460036002600188600355",
                 "storage": {}
@@ -1285,7 +1285,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1300,7 +1300,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x600a60096008600760066005600460036002600189600355",
                 "storage": {}
@@ -1313,7 +1313,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1328,7 +1328,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x600b600a6009600860076006600560046003600260018a600355",
                 "storage": {}
@@ -1341,7 +1341,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1356,7 +1356,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x600c600b600a6009600860076006600560046003600260018b600355",
                 "storage": {}
@@ -1369,7 +1369,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1384,7 +1384,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x600d600c600b600a6009600860076006600560046003600260018c600355",
                 "storage": {}
@@ -1397,7 +1397,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1412,7 +1412,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x600e600d600c600b600a6009600860076006600560046003600260018d600355",
                 "storage": {}
@@ -1425,7 +1425,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1440,7 +1440,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x600f600e600d600c600b600a6009600860076006600560046003600260018e600355",
                 "storage": {}
@@ -1453,7 +1453,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1468,7 +1468,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x6010600f600e600d600c600b600a6009600860076006600560046003600260018f600355",
                 "storage": {}
@@ -1481,7 +1481,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1496,7 +1496,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x7f10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff60039055",
                 "storage": {}
@@ -1509,7 +1509,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1524,7 +1524,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x7f10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff60039155",
                 "storage": {}
@@ -1537,7 +1537,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1552,7 +1552,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x6002600160039155",
                 "storage": {}
@@ -1565,7 +1565,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1580,7 +1580,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x60036002600160039255",
                 "storage": {}
@@ -1593,7 +1593,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1608,7 +1608,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x600460036002600160039355",
                 "storage": {}
@@ -1621,7 +1621,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1636,7 +1636,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x6005600460036002600160039455",
                 "storage": {}
@@ -1649,7 +1649,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1664,7 +1664,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x60066005600460036002600160039555",
                 "storage": {}
@@ -1677,7 +1677,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1692,7 +1692,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x600760066005600460036002600160039655",
                 "storage": {}
@@ -1705,7 +1705,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1720,7 +1720,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x6008600760066005600460036002600160039755",
                 "storage": {}
@@ -1733,7 +1733,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1748,7 +1748,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x60096008600760066005600460036002600160039855",
                 "storage": {}
@@ -1761,7 +1761,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1776,7 +1776,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x600a60096008600760066005600460036002600160039955",
                 "storage": {}
@@ -1789,7 +1789,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1804,7 +1804,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x600b600a60096008600760066005600460036002600160039a55",
                 "storage": {}
@@ -1817,7 +1817,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1832,7 +1832,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x600c600b600a60096008600760066005600460036002600160039b55",
                 "storage": {}
@@ -1845,7 +1845,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1860,7 +1860,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x600d600c600b600a60096008600760066005600460036002600160039c55",
                 "storage": {}
@@ -1873,7 +1873,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1888,7 +1888,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x600e600d600c600b600a60096008600760066005600460036002600160039d55",
                 "storage": {}
@@ -1901,7 +1901,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1916,7 +1916,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x600f600e600d600c600b600a60096008600760066005600460036002600160039e55",
                 "storage": {}
@@ -1929,7 +1929,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1944,7 +1944,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x6010600f600e600d600c600b600a60096008600760066005600460036002600160039f55",
                 "storage": {}
@@ -1957,7 +1957,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1972,7 +1972,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "(asm 5 2 1 12 JUMPI POP POP STOP JUMPDEST SWAP1 1 22 JUMPI POP POP STOP JUMPDEST SUB 0 MSTORE 1 31 RETURN)",
                 "storage": {}
@@ -1985,7 +1985,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     }
 }
diff --git a/vmSha3TestFiller.json b/vmSha3TestFiller.json
index 142af79d..f10601f0 100644
--- a/vmSha3TestFiller.json
+++ b/vmSha3TestFiller.json
@@ -10,7 +10,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (SHA3 0 0)}",
                 "storage": {}
@@ -38,7 +38,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (SHA3 4 5)}",
                 "storage": {}
@@ -51,7 +51,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -66,7 +66,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (SHA3 10 10)}",
                 "storage": {}
@@ -79,7 +79,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -94,7 +94,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (SHA3 1000 0xfffff)}",
                 "storage": {}
@@ -107,7 +107,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -122,7 +122,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (SHA3  0xfffffffff 100)}",
                 "storage": {}
@@ -135,7 +135,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -150,7 +150,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (SHA3 10000 0xfffffffff )}",
                 "storage": {}
@@ -163,7 +163,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -178,7 +178,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ [[ 0 ]] (SHA3 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)}",
                 "storage": {}
@@ -191,7 +191,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
diff --git a/vmSystemOperationsTestFiller.json b/vmSystemOperationsTestFiller.json
index 709af707..bdbbdc29 100644
--- a/vmSystemOperationsTestFiller.json
+++ b/vmSystemOperationsTestFiller.json
@@ -10,7 +10,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (MSTORE 0 0x601080600c6000396000f3006000355415600957005b60203560003555) [[ 0 ]] (CREATE 23 3 29) }",
                 "storage": {}
@@ -23,7 +23,7 @@
             "value" : "1000000000000000000",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -51,7 +51,7 @@
             "value" : "100",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -79,7 +79,7 @@
             "value" : "100",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -107,7 +107,7 @@
             "value" : "100",
             "data" : "",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -122,7 +122,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 1000000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 64 0) }",
                 "storage": {}
@@ -161,14 +161,14 @@
                 "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
                 "code" : "0x4243434242434243f14555",
                 "data" : "0x",
-                "gas" : "10000",
+                "gas" : "100000",
                 "gasPrice" : "100000000000000",
                 "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
                 "value" : "1000000000000000000"
             },
             "pre" : {
                 "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                    "balance" : "1000000000000000000",
+                    "balance" : "100000000000000000000000",
                     "code" : "0x4243434242434243f14555",
                     "nonce" : "0",
                     "storage" : {
@@ -188,7 +188,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 1000000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 0 2) }",
                 "storage": {}
@@ -224,7 +224,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) (POST 1000000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 ) }",
                 "storage": {}
@@ -260,7 +260,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALLSTATELESS 500 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 0 2 ) }",
                 "storage": {}
@@ -296,7 +296,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALLCODE 500 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 0 2 ) }",
                 "storage": {}
@@ -333,7 +333,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (MSTORE 0 0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 100 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 64 0) }",
                 "storage": {}
@@ -369,7 +369,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (MSTORE 0 0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 500 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 987654321 64 64 0) }",
                 "storage": {}
@@ -405,7 +405,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (MSTORE 0 0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 500 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 9865432 64 0) }",
                 "storage": {}
@@ -441,7 +441,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (MSTORE 0 0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 500 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 987654 1) }",
                 "storage": {}
@@ -478,7 +478,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (MSTORE 0 0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 500 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 987654 0) }",
                 "storage": {}
@@ -514,7 +514,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (MSTORE 0 0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 500 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 987654 0 64 0) }",
                 "storage": {}
@@ -556,7 +556,7 @@
                  "storage": {}
              },
              "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                 "balance" : "1000000000000000000",
+                 "balance" : "100000000000000000000000",
                  "nonce" : "0",
                  "code" : "{ [[ 0 ]] (+ (SLOAD 0) 1) [[ 1 ]] (CALL (- (GAS) 224) (ADDRESS) 0 0 0 0 0) } ",
                  "storage": {}
@@ -668,7 +668,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (SUICIDE (CALLER))}",
                 "storage": {}
@@ -704,7 +704,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (SUICIDE 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}",
                 "storage": {}
@@ -740,7 +740,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (SUICIDE (ADDRESS) )}",
                 "storage": {}
@@ -866,7 +866,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) (POST 1000000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 ) }",
                 "storage": {}
@@ -902,7 +902,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALLSTATELESS 1000000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 64 0) }",
                 "storage": {}
@@ -938,7 +938,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALLCODE 1000000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 64 0) }",
                 "storage": {}
@@ -974,7 +974,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "0x6000355415600957005b60203560003555",
                 "storage": {}
@@ -987,7 +987,7 @@
             "value" : "1000000000000000000",
             "data" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffafffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa",
             "gasPrice" : "100000000000000",
-            "gas" : "10000"
+            "gas" : "100000"
         }
     },
 
@@ -1002,7 +1002,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{  [[ (PC) ]] (CALL 1000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) }",
                 "storage": {}
@@ -1038,7 +1038,7 @@
          },
          "pre" : {
              "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                 "balance" : "1000000000000000000",
+                 "balance" : "100000000000000000000000",
                  "nonce" : "0",
                  "code" : "{  [[ (PC) ]] (CALL (- (GAS) 1000) 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) }",
                  "storage": {}
@@ -1074,7 +1074,7 @@
          },
          "pre" : {
              "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                 "balance" : "1000000000000000000",
+                 "balance" : "100000000000000000000000",
                  "nonce" : "0",
                  "code" : "{  [[ 0 ]] (ADD (SLOAD 0) 1) (CALL (- (GAS) 1000) 0x945304eb96065b2a98b57a48a06ae28d285a71b5 1 0 0 0 0) }",
                  "storage": {}
@@ -1146,7 +1146,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{  [[ (PC) ]] (CALL 1000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SUICIDE 0x945304eb96065b2a98b57a48a06ae28d285a71b5)  }",
                 "storage": {}
@@ -1182,7 +1182,7 @@
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
+                "balance" : "100000000000000000000000",
                 "nonce" : "0",
                 "code" : "{  [[ (PC) ]] (CALL 1000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0)   }",
                 "storage": {}
diff --git a/vmtestsFiller.json b/vmtestsFiller.json
index 75bf1da8..c9f157f1 100644
--- a/vmtestsFiller.json
+++ b/vmtestsFiller.json
@@ -10,7 +10,7 @@
 		},
 		"pre" : {
 		"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-			"balance" : "1000000000000000000",
+			"balance" : "100000000000000000000000",
 			"nonce" : "0",
 			"code" : "(suicide (caller))",
 			"storage": {}
@@ -23,7 +23,7 @@
 			"value" : "1000000000000000000",
 			"data" : "",
 			"gasPrice" : "100000000000000",
-		    "gas" : "10000"
+		    	"gas" : "100000"
 		}
 	},
 
@@ -38,7 +38,7 @@
 		},
 		"pre" : {
 		"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-			"balance" : "1000000000000000000",
+			"balance" : "100000000000000000000000",
 			"nonce" : "0",
 			"code" : "{ (call (- (gas) 200) (caller) (+ 2 2 (* 4 4 4) (/ 2 2) (% 3 2) (- 8 2 2)) 0 0 0 0) }",
 			"storage": {}
@@ -51,7 +51,7 @@
 			"value" : "1000000000000000000",
 			"data" : "",
 			"gasPrice" : "100000000000000",
-		    "gas" : "10000"
+		   	 "gas" : "100000"
 		}
 	},
 
@@ -66,7 +66,7 @@
 		},
 		"pre" : {
 		"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-			"balance" : "1000000000000000000",
+			"balance" : "100000000000000000000000",
 			"nonce" : "0",
 			"code" : "(seq (when (and 1 1) (call (- (gas) 200) (caller) 2 0 0 0 0)) (when (and 1 0) (call (- (gas) 200) (caller) 3 0 0 0 0)) (when (and 0 1) (call (- (gas) 200) (caller) 4 0 0 0 0)) (when (and 0 0) (call (- (gas) 200) (caller) 5 0 0 0 0)) (when (or 1 1) (call (- (gas) 200) (caller) 12 0 0 0 0)) (when (or 1 0) (call (- (gas) 200) (caller) 13 0 0 0 0)) (when (or 0 1) (call (- (gas) 200) (caller) 14 0 0 0 0)) (when (or 0 0) (call (- (gas) 200) (caller) 15 0 0 0 0)) )",
 			"storage": {}
@@ -79,7 +79,7 @@
 			"value" : "1000000000000000000",
 			"data" : "",
 			"gasPrice" : "100000000000000",
-		    "gas" : "10000"
+		    	"gas" : "100000"
 		}
 	},
 
@@ -94,7 +94,7 @@
 	    },
 	    "pre" : {
 		"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-		    "balance" : "1000000000000000000",
+		    "balance" : "100000000000000000000000",
 		    "nonce" : "0",
 		    "code" : "(call (- (gas) 200) (caller) 500000000000000000 0 0 0 0)",
 		    "storage": {}
@@ -107,7 +107,7 @@
 		    "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
 		    "value" : "1000000000000000000",
 		    "gasPrice" : "100000000000000",
-		    "gas" : "10000",
+		    "gas" : "100000",
 		    "data" : ""
 		}
 	}
diff --git a/webthreestubclient.h b/webthreestubclient.h
index 8b1893a4..454162e7 100644
--- a/webthreestubclient.h
+++ b/webthreestubclient.h
@@ -404,10 +404,11 @@ class WebThreeStubClient : public jsonrpc::Client
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        bool eth_submitWork(const std::string& param1) throw (jsonrpc::JsonRpcException)
+        bool eth_submitWork(const std::string& param1, const std::string& param2) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
+            p.append(param2);
             Json::Value result = this->CallMethod("eth_submitWork",p);
             if (result.isBool())
                 return result.asBool();