diff --git a/test_apps/contracts_app/.gitignore b/test_apps/contracts_app/.gitignore
index 77bcafb1a..b335e859e 100644
--- a/test_apps/contracts_app/.gitignore
+++ b/test_apps/contracts_app/.gitignore
@@ -3,3 +3,4 @@ node_modules/
 dist/
 config/production/password
 config/livenet/password
+build/
diff --git a/test_apps/contracts_app/build/contracts/AlreadyDeployedToken.json b/test_apps/contracts_app/build/contracts/AlreadyDeployedToken.json
deleted file mode 100644
index 7272f1730..000000000
--- a/test_apps/contracts_app/build/contracts/AlreadyDeployedToken.json
+++ /dev/null
@@ -1,244 +0,0 @@
-{
-  "contract_name": "AlreadyDeployedToken",
-  "address": "0xece374063fe5cc7efbaca0a498477cada94e5ad6",
-  "code": "6060604052341561000f57600080fd5b60405160208061049983398101604052808051600160a060020a03331660009081526020819052604090208190556002555050610448806100516000396000f300606060405236156100805763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008557806315945790146100bb57806318160ddd146100e057806323b872dd146100f357806370a082311461011b578063a9059cbb1461013a578063dd62ed3e1461015c575b600080fd5b341561009057600080fd5b6100a7600160a060020a0360043516602435610181565b604051901515815260200160405180910390f35b34156100c657600080fd5b6100ce6101ed565b60405190815260200160405180910390f35b34156100eb57600080fd5b6100ce6101f3565b34156100fe57600080fd5b6100a7600160a060020a03600435811690602435166044356101f9565b341561012657600080fd5b6100ce600160a060020a036004351661030d565b341561014557600080fd5b6100a7600160a060020a0360043516602435610328565b341561016757600080fd5b6100ce600160a060020a03600435811690602435166103ea565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561021f57600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025357600080fd5b600160a060020a0383166000908152602081905260409020546102769083610415565b151561028157600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561034e57600080fd5b600160a060020a0383166000908152602081905260409020546103719083610415565b151561037c57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820296acec21220568a1b9f9dcf20f96accf851205e34513c360b7e90ac6c1e70dd0029",
-  "runtime_bytecode": "606060405236156100805763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008557806315945790146100bb57806318160ddd146100e057806323b872dd146100f357806370a082311461011b578063a9059cbb1461013a578063dd62ed3e1461015c575b600080fd5b341561009057600080fd5b6100a7600160a060020a0360043516602435610181565b604051901515815260200160405180910390f35b34156100c657600080fd5b6100ce6101ed565b60405190815260200160405180910390f35b34156100eb57600080fd5b6100ce6101f3565b34156100fe57600080fd5b6100a7600160a060020a03600435811690602435166044356101f9565b341561012657600080fd5b6100ce600160a060020a036004351661030d565b341561014557600080fd5b6100a7600160a060020a0360043516602435610328565b341561016757600080fd5b6100ce600160a060020a03600435811690602435166103ea565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561021f57600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025357600080fd5b600160a060020a0383166000908152602081905260409020546102769083610415565b151561028157600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561034e57600080fd5b600160a060020a0383166000908152602081905260409020546103719083610415565b151561037c57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820296acec21220568a1b9f9dcf20f96accf851205e34513c360b7e90ac6c1e70dd0029",
-  "gas_estimates": {
-    "creation": {
-      "codeDepositCost": "219200",
-      "executionCost": "40465",
-      "totalCost": "259665"
-    },
-    "external": {
-      "_supply()": "392",
-      "allowance(address,address)": "826",
-      "approve(address,uint256)": "22330",
-      "balanceOf(address)": "683",
-      "totalSupply()": "414",
-      "transfer(address,uint256)": "43630",
-      "transferFrom(address,address,uint256)": "64413"
-    },
-    "internal": {
-      "safeToAdd(uint256,uint256)": "24"
-    }
-  },
-  "function_hashes": {
-    "_supply()": "15945790",
-    "allowance(address,address)": "dd62ed3e",
-    "approve(address,uint256)": "095ea7b3",
-    "balanceOf(address)": "70a08231",
-    "totalSupply()": "18160ddd",
-    "transfer(address,uint256)": "a9059cbb",
-    "transferFrom(address,address,uint256)": "23b872dd"
-  },
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "approve",
-      "outputs": [
-        {
-          "name": "ok",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x095ea7b3"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "_supply",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x15945790"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "totalSupply",
-      "outputs": [
-        {
-          "name": "supply",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x18160ddd"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "from",
-          "type": "address"
-        },
-        {
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "transferFrom",
-      "outputs": [
-        {
-          "name": "ok",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x23b872dd"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "who",
-          "type": "address"
-        }
-      ],
-      "name": "balanceOf",
-      "outputs": [
-        {
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x70a08231"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "transfer",
-      "outputs": [
-        {
-          "name": "ok",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xa9059cbb"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "name": "spender",
-          "type": "address"
-        }
-      ],
-      "name": "allowance",
-      "outputs": [
-        {
-          "name": "_allowance",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xdd62ed3e"
-    },
-    {
-      "inputs": [
-        {
-          "name": "initial_balance",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "constructor",
-      "signature": "constructor"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "from",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "Transfer",
-      "type": "event",
-      "signature": "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "Approval",
-      "type": "event",
-      "signature": "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925"
-    }
-  ]
-}
diff --git a/test_apps/contracts_app/build/contracts/AnotherStorage.json b/test_apps/contracts_app/build/contracts/AnotherStorage.json
deleted file mode 100644
index ba9a291b2..000000000
--- a/test_apps/contracts_app/build/contracts/AnotherStorage.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "contract_name": "AnotherStorage",
-  "address": "0xbd1470c4E242141Ce45c82A570755bfe9965e99C",
-  "code": "6060604052341561000f57600080fd5b60405160208061010f8339810160405280805160008054600160a060020a03909216600160a060020a0319909216919091179055505060bc806100536000396000f300606060405263ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633610eb0e8114603b57600080fd5b3415604557600080fd5b604b6074565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b60005473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a72305820aa2dd4341eb309d7ab52796cab3bf8c9a7e2da0b6ab9b4d9bdd1411b90d116ca0029",
-  "runtime_bytecode": "606060405263ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633610eb0e8114603b57600080fd5b3415604557600080fd5b604b6074565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b60005473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a72305820aa2dd4341eb309d7ab52796cab3bf8c9a7e2da0b6ab9b4d9bdd1411b90d116ca0029",
-  "real_runtime_bytecode": "606060405263ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633610eb0e8114603b57600080fd5b3415604557600080fd5b604b6074565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b60005473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a72305820aa2dd4341eb309d7ab52796cab3bf8c9a7e2da0b6ab9b4d9bdd1411b90d116ca0029",
-  "swarm_hash": "aa2dd4341eb309d7ab52796cab3bf8c9a7e2da0b6ab9b4d9bdd1411b90d116ca",
-  "gas_estimates": {
-    "creation": {
-      "codeDepositCost": "37600",
-      "executionCost": "20517",
-      "totalCost": "58117"
-    },
-    "external": {
-      "simpleStorageAddress()": "367"
-    }
-  },
-  "function_hashes": {
-    "simpleStorageAddress()": "3610eb0e"
-  },
-  "abi": [
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "simpleStorageAddress",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x3610eb0e"
-    },
-    {
-      "inputs": [
-        {
-          "name": "addr",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "constructor",
-      "signature": "constructor"
-    }
-  ]
-}
diff --git a/test_apps/contracts_app/build/contracts/Assert.json b/test_apps/contracts_app/build/contracts/Assert.json
deleted file mode 100644
index 70cc325d2..000000000
--- a/test_apps/contracts_app/build/contracts/Assert.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "contract_name": "Assert",
-  "address": "0x5c24Fd0BAB4B6EA1C0f057C770815b82EcE9013F",
-  "code": "60606040523415600e57600080fd5b603580601b6000396000f3006060604052600080fd00a165627a7a723058207e9fb136396db529578f03c3c5e389346c9d5d10cadd8a760ea8be2baa47083c0029",
-  "runtime_bytecode": "6060604052600080fd00a165627a7a723058207e9fb136396db529578f03c3c5e389346c9d5d10cadd8a760ea8be2baa47083c0029",
-  "real_runtime_bytecode": "6060604052600080fd00a165627a7a723058207e9fb136396db529578f03c3c5e389346c9d5d10cadd8a760ea8be2baa47083c0029",
-  "swarm_hash": "7e9fb136396db529578f03c3c5e389346c9d5d10cadd8a760ea8be2baa47083c",
-  "gas_estimates": {
-    "creation": {
-      "codeDepositCost": "10600",
-      "executionCost": "61",
-      "totalCost": "10661"
-    },
-    "internal": {
-      "triggerEvent(bool,string memory)": "infinite"
-    }
-  },
-  "function_hashes": {},
-  "abi": [
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "name": "passed",
-          "type": "bool"
-        },
-        {
-          "indexed": false,
-          "name": "message",
-          "type": "string"
-        }
-      ],
-      "name": "TestEvent",
-      "type": "event",
-      "signature": "0xd204e27263771793b3472e4c07118500eb1ab892c2b2f0a4b90b33c33d4df42f"
-    }
-  ]
-}
diff --git a/test_apps/contracts_app/build/contracts/ContractArgs.json b/test_apps/contracts_app/build/contracts/ContractArgs.json
deleted file mode 100644
index 350042b15..000000000
--- a/test_apps/contracts_app/build/contracts/ContractArgs.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "contract_name": "ContractArgs",
-  "address": "0xD38d37b84d83DAfEADd35D98354d47609456aEA4",
-  "code": "6060604052341561000f57600080fd5b6040516101da3803806101da83398101604052808051820191906020018051915082905060008151811061003f57fe5b9060200190602002015160008054600160a060020a031916600160a060020a03929092169190911790558160018151811061007657fe5b9060200190602002015160018054600160a060020a031916600160a060020a039290921691909117905560025550610127806100b36000396000f3006060604052361560505763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811460525780636b79ff5b146074578063fc25626f1460ad575b005b3415605c57600080fd5b606260bd565b60405190815260200160405180910390f35b3415607e57600080fd5b608460c3565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341560b757600080fd5b608460df565b60025481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60015473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a7230582028b74fdaf5ca55629608c9a3b4a0c3ae50a12d6fd589ce27538782c5cda54c730029",
-  "runtime_bytecode": "6060604052361560505763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811460525780636b79ff5b146074578063fc25626f1460ad575b005b3415605c57600080fd5b606260bd565b60405190815260200160405180910390f35b3415607e57600080fd5b608460c3565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341560b757600080fd5b608460df565b60025481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60015473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a7230582028b74fdaf5ca55629608c9a3b4a0c3ae50a12d6fd589ce27538782c5cda54c730029",
-  "real_runtime_bytecode": "6060604052361560505763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811460525780636b79ff5b146074578063fc25626f1460ad575b005b3415605c57600080fd5b606260bd565b60405190815260200160405180910390f35b3415607e57600080fd5b608460c3565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341560b757600080fd5b608460df565b60025481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60015473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a7230582028b74fdaf5ca55629608c9a3b4a0c3ae50a12d6fd589ce27538782c5cda54c730029",
-  "swarm_hash": "28b74fdaf5ca55629608c9a3b4a0c3ae50a12d6fd589ce27538782c5cda54c73",
-  "gas_estimates": {
-    "creation": {
-      "codeDepositCost": "59000",
-      "executionCost": "infinite",
-      "totalCost": "infinite"
-    },
-    "external": {
-      "": "123",
-      "addr_1()": "407",
-      "addr_2()": "429",
-      "value()": "370"
-    }
-  },
-  "function_hashes": {
-    "addr_1()": "6b79ff5b",
-    "addr_2()": "fc25626f",
-    "value()": "3fa4f245"
-  },
-  "abi": [
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "value",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x3fa4f245"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "addr_1",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x6b79ff5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "addr_2",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xfc25626f"
-    },
-    {
-      "inputs": [
-        {
-          "name": "_addresses",
-          "type": "address[]"
-        },
-        {
-          "name": "initialValue",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "constructor",
-      "signature": "constructor"
-    },
-    {
-      "payable": true,
-      "stateMutability": "payable",
-      "type": "fallback"
-    }
-  ]
-}
diff --git a/test_apps/contracts_app/build/contracts/MyToken.json b/test_apps/contracts_app/build/contracts/MyToken.json
deleted file mode 100644
index ff9da699b..000000000
--- a/test_apps/contracts_app/build/contracts/MyToken.json
+++ /dev/null
@@ -1,244 +0,0 @@
-{
-  "contract_name": "MyToken",
-  "address": "0x11B0cb61776C29125cE3C2Eb86611933E8f9d5F1",
-  "code": "6060604052341561000f57600080fd5b60405160208061049983398101604052808051600160a060020a03331660009081526020819052604090208190556002555050610448806100516000396000f300606060405236156100805763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008557806315945790146100bb57806318160ddd146100e057806323b872dd146100f357806370a082311461011b578063a9059cbb1461013a578063dd62ed3e1461015c575b600080fd5b341561009057600080fd5b6100a7600160a060020a0360043516602435610181565b604051901515815260200160405180910390f35b34156100c657600080fd5b6100ce6101ed565b60405190815260200160405180910390f35b34156100eb57600080fd5b6100ce6101f3565b34156100fe57600080fd5b6100a7600160a060020a03600435811690602435166044356101f9565b341561012657600080fd5b6100ce600160a060020a036004351661030d565b341561014557600080fd5b6100a7600160a060020a0360043516602435610328565b341561016757600080fd5b6100ce600160a060020a03600435811690602435166103ea565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561021f57600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025357600080fd5b600160a060020a0383166000908152602081905260409020546102769083610415565b151561028157600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561034e57600080fd5b600160a060020a0383166000908152602081905260409020546103719083610415565b151561037c57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820296acec21220568a1b9f9dcf20f96accf851205e34513c360b7e90ac6c1e70dd0029",
-  "runtime_bytecode": "606060405236156100805763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008557806315945790146100bb57806318160ddd146100e057806323b872dd146100f357806370a082311461011b578063a9059cbb1461013a578063dd62ed3e1461015c575b600080fd5b341561009057600080fd5b6100a7600160a060020a0360043516602435610181565b604051901515815260200160405180910390f35b34156100c657600080fd5b6100ce6101ed565b60405190815260200160405180910390f35b34156100eb57600080fd5b6100ce6101f3565b34156100fe57600080fd5b6100a7600160a060020a03600435811690602435166044356101f9565b341561012657600080fd5b6100ce600160a060020a036004351661030d565b341561014557600080fd5b6100a7600160a060020a0360043516602435610328565b341561016757600080fd5b6100ce600160a060020a03600435811690602435166103ea565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561021f57600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025357600080fd5b600160a060020a0383166000908152602081905260409020546102769083610415565b151561028157600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561034e57600080fd5b600160a060020a0383166000908152602081905260409020546103719083610415565b151561037c57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820296acec21220568a1b9f9dcf20f96accf851205e34513c360b7e90ac6c1e70dd0029",
-  "gas_estimates": {
-    "creation": {
-      "codeDepositCost": "219200",
-      "executionCost": "40465",
-      "totalCost": "259665"
-    },
-    "external": {
-      "_supply()": "392",
-      "allowance(address,address)": "826",
-      "approve(address,uint256)": "22330",
-      "balanceOf(address)": "683",
-      "totalSupply()": "414",
-      "transfer(address,uint256)": "43630",
-      "transferFrom(address,address,uint256)": "64413"
-    },
-    "internal": {
-      "safeToAdd(uint256,uint256)": "24"
-    }
-  },
-  "function_hashes": {
-    "_supply()": "15945790",
-    "allowance(address,address)": "dd62ed3e",
-    "approve(address,uint256)": "095ea7b3",
-    "balanceOf(address)": "70a08231",
-    "totalSupply()": "18160ddd",
-    "transfer(address,uint256)": "a9059cbb",
-    "transferFrom(address,address,uint256)": "23b872dd"
-  },
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "approve",
-      "outputs": [
-        {
-          "name": "ok",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x095ea7b3"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "_supply",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x15945790"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "totalSupply",
-      "outputs": [
-        {
-          "name": "supply",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x18160ddd"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "from",
-          "type": "address"
-        },
-        {
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "transferFrom",
-      "outputs": [
-        {
-          "name": "ok",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x23b872dd"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "who",
-          "type": "address"
-        }
-      ],
-      "name": "balanceOf",
-      "outputs": [
-        {
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x70a08231"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "transfer",
-      "outputs": [
-        {
-          "name": "ok",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xa9059cbb"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "name": "spender",
-          "type": "address"
-        }
-      ],
-      "name": "allowance",
-      "outputs": [
-        {
-          "name": "_allowance",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xdd62ed3e"
-    },
-    {
-      "inputs": [
-        {
-          "name": "initial_balance",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "constructor",
-      "signature": "constructor"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "from",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "Transfer",
-      "type": "event",
-      "signature": "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "Approval",
-      "type": "event",
-      "signature": "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925"
-    }
-  ]
-}
diff --git a/test_apps/contracts_app/build/contracts/MyToken2.json b/test_apps/contracts_app/build/contracts/MyToken2.json
deleted file mode 100644
index ca764b0dd..000000000
--- a/test_apps/contracts_app/build/contracts/MyToken2.json
+++ /dev/null
@@ -1,244 +0,0 @@
-{
-  "contract_name": "MyToken2",
-  "address": "0x32858548ab987Bf2161A666824734eca77667fEc",
-  "code": "6060604052341561000f57600080fd5b60405160208061049983398101604052808051600160a060020a03331660009081526020819052604090208190556002555050610448806100516000396000f300606060405236156100805763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008557806315945790146100bb57806318160ddd146100e057806323b872dd146100f357806370a082311461011b578063a9059cbb1461013a578063dd62ed3e1461015c575b600080fd5b341561009057600080fd5b6100a7600160a060020a0360043516602435610181565b604051901515815260200160405180910390f35b34156100c657600080fd5b6100ce6101ed565b60405190815260200160405180910390f35b34156100eb57600080fd5b6100ce6101f3565b34156100fe57600080fd5b6100a7600160a060020a03600435811690602435166044356101f9565b341561012657600080fd5b6100ce600160a060020a036004351661030d565b341561014557600080fd5b6100a7600160a060020a0360043516602435610328565b341561016757600080fd5b6100ce600160a060020a03600435811690602435166103ea565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561021f57600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025357600080fd5b600160a060020a0383166000908152602081905260409020546102769083610415565b151561028157600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561034e57600080fd5b600160a060020a0383166000908152602081905260409020546103719083610415565b151561037c57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820296acec21220568a1b9f9dcf20f96accf851205e34513c360b7e90ac6c1e70dd0029",
-  "runtime_bytecode": "606060405236156100805763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008557806315945790146100bb57806318160ddd146100e057806323b872dd146100f357806370a082311461011b578063a9059cbb1461013a578063dd62ed3e1461015c575b600080fd5b341561009057600080fd5b6100a7600160a060020a0360043516602435610181565b604051901515815260200160405180910390f35b34156100c657600080fd5b6100ce6101ed565b60405190815260200160405180910390f35b34156100eb57600080fd5b6100ce6101f3565b34156100fe57600080fd5b6100a7600160a060020a03600435811690602435166044356101f9565b341561012657600080fd5b6100ce600160a060020a036004351661030d565b341561014557600080fd5b6100a7600160a060020a0360043516602435610328565b341561016757600080fd5b6100ce600160a060020a03600435811690602435166103ea565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561021f57600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025357600080fd5b600160a060020a0383166000908152602081905260409020546102769083610415565b151561028157600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561034e57600080fd5b600160a060020a0383166000908152602081905260409020546103719083610415565b151561037c57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820296acec21220568a1b9f9dcf20f96accf851205e34513c360b7e90ac6c1e70dd0029",
-  "gas_estimates": {
-    "creation": {
-      "codeDepositCost": "219200",
-      "executionCost": "40465",
-      "totalCost": "259665"
-    },
-    "external": {
-      "_supply()": "392",
-      "allowance(address,address)": "826",
-      "approve(address,uint256)": "22330",
-      "balanceOf(address)": "683",
-      "totalSupply()": "414",
-      "transfer(address,uint256)": "43630",
-      "transferFrom(address,address,uint256)": "64413"
-    },
-    "internal": {
-      "safeToAdd(uint256,uint256)": "24"
-    }
-  },
-  "function_hashes": {
-    "_supply()": "15945790",
-    "allowance(address,address)": "dd62ed3e",
-    "approve(address,uint256)": "095ea7b3",
-    "balanceOf(address)": "70a08231",
-    "totalSupply()": "18160ddd",
-    "transfer(address,uint256)": "a9059cbb",
-    "transferFrom(address,address,uint256)": "23b872dd"
-  },
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "approve",
-      "outputs": [
-        {
-          "name": "ok",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x095ea7b3"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "_supply",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x15945790"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "totalSupply",
-      "outputs": [
-        {
-          "name": "supply",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x18160ddd"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "from",
-          "type": "address"
-        },
-        {
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "transferFrom",
-      "outputs": [
-        {
-          "name": "ok",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x23b872dd"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "who",
-          "type": "address"
-        }
-      ],
-      "name": "balanceOf",
-      "outputs": [
-        {
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x70a08231"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "transfer",
-      "outputs": [
-        {
-          "name": "ok",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xa9059cbb"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "name": "spender",
-          "type": "address"
-        }
-      ],
-      "name": "allowance",
-      "outputs": [
-        {
-          "name": "_allowance",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xdd62ed3e"
-    },
-    {
-      "inputs": [
-        {
-          "name": "initial_balance",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "constructor",
-      "signature": "constructor"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "from",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "Transfer",
-      "type": "event",
-      "signature": "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "Approval",
-      "type": "event",
-      "signature": "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925"
-    }
-  ]
-}
diff --git a/test_apps/contracts_app/build/contracts/Ownable.json b/test_apps/contracts_app/build/contracts/Ownable.json
deleted file mode 100644
index 62f2968c6..000000000
--- a/test_apps/contracts_app/build/contracts/Ownable.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "contract_name": "Ownable",
-  "code": "6060604052341561000f57600080fd5b60008054600160a060020a033316600160a060020a031990911617905561011e8061003b6000396000f300606060405263ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416638da5cb5b81146045578063f2fde38b14607157600080fd5b3415604f57600080fd5b6055608f565b604051600160a060020a03909116815260200160405180910390f35b3415607b57600080fd5b608d600160a060020a0360043516609e565b005b600054600160a060020a031681565b60005433600160a060020a0390811691161460b857600080fd5b600160a060020a0381161560ef576000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b505600a165627a7a7230582067ba6a1663c106e8fb91d00a40cba5ec79dd7586990cda210ada6288f949c5dd0029",
-  "runtime_bytecode": "606060405263ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416638da5cb5b81146045578063f2fde38b14607157600080fd5b3415604f57600080fd5b6055608f565b604051600160a060020a03909116815260200160405180910390f35b3415607b57600080fd5b608d600160a060020a0360043516609e565b005b600054600160a060020a031681565b60005433600160a060020a0390811691161460b857600080fd5b600160a060020a0381161560ef576000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b505600a165627a7a7230582067ba6a1663c106e8fb91d00a40cba5ec79dd7586990cda210ada6288f949c5dd0029",
-  "real_runtime_bytecode": "606060405263ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416638da5cb5b81146045578063f2fde38b14607157600080fd5b3415604f57600080fd5b6055608f565b604051600160a060020a03909116815260200160405180910390f35b3415607b57600080fd5b608d600160a060020a0360043516609e565b005b600054600160a060020a031681565b60005433600160a060020a0390811691161460b857600080fd5b600160a060020a0381161560ef576000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b505600a165627a7a7230582067ba6a1663c106e8fb91d00a40cba5ec79dd7586990cda210ada6288f949c5dd0029",
-  "swarm_hash": "67ba6a1663c106e8fb91d00a40cba5ec79dd7586990cda210ada6288f949c5dd",
-  "gas_estimates": {
-    "creation": {
-      "codeDepositCost": "57200",
-      "executionCost": "20473",
-      "totalCost": "77673"
-    },
-    "external": {
-      "owner()": "505",
-      "transferOwnership(address)": "20912"
-    }
-  },
-  "function_hashes": {
-    "owner()": "8da5cb5b",
-    "transferOwnership(address)": "f2fde38b"
-  },
-  "abi": [
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "constructor"
-    }
-  ]
-}
diff --git a/test_apps/contracts_app/build/contracts/SimpleStorage.json b/test_apps/contracts_app/build/contracts/SimpleStorage.json
deleted file mode 100644
index b9610414f..000000000
--- a/test_apps/contracts_app/build/contracts/SimpleStorage.json
+++ /dev/null
@@ -1,162 +0,0 @@
-{
-  "contract_name": "SimpleStorage",
-  "address": "0xbA43cfc248f026765Ce3076bDa8B932FE7BA9E17",
-  "code": "6060604052341561000f57600080fd5b60405160208061042d8339810160405280805160008054600160a060020a033316600160a060020a031990911617905560015550506103da806100536000396000f300606060405236156100805763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416632a1afcd981146100825780634f829ee8146100a757806360fe47b1146100c05780636d4ce63c146100d65780638da5cb5b146100e9578063e93314ab14610118578063f2fde38b146101a2575b005b341561008d57600080fd5b6100956101c1565b60405190815260200160405180910390f35b34156100b257600080fd5b6100806004356024356101c7565b34156100cb57600080fd5b6100806004356101e8565b34156100e157600080fd5b61009561024a565b34156100f457600080fd5b6100fc610250565b604051600160a060020a03909116815260200160405180910390f35b341561012357600080fd5b61012b61025f565b60405160208082528190810183818151815260200191508051906020019080838360005b8381101561016757808201518382015260200161014f565b50505050905090810190601f1680156101945780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34156101ad57600080fd5b610080600160a060020a03600435166102a0565b60015481565b60005433600160a060020a039081169116146101e257600080fd5b50600155565b600181905560005b6103e8811015610208576001805482018155016101f0565b610246600160408051908101604052600281527f686900000000000000000000000000000000000000000000000000000000000060208201526102f6565b5050565b60015490565b600054600160a060020a031681565b61026761039c565b60408051908101604052600581527f68656c6c6f0000000000000000000000000000000000000000000000000000006020820152905090565b60005433600160a060020a039081169116146102bb57600080fd5b600160a060020a038116156102f3576000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b50565b7fd204e27263771793b3472e4c07118500eb1ab892c2b2f0a4b90b33c33d4df42f8282604051821515815260406020820181815290820183818151815260200191508051906020019080838360005b8381101561035d578082015183820152602001610345565b50505050905090810190601f16801561038a5780820380516001836020036101000a031916815260200191505b50935050505060405180910390a15050565b602060405190810160405260008152905600a165627a7a723058206bcde2c3a4cf689ece10c413be63964fef8fc035e4668441e53765fc2b5f61910029",
-  "runtime_bytecode": "606060405236156100805763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416632a1afcd981146100825780634f829ee8146100a757806360fe47b1146100c05780636d4ce63c146100d65780638da5cb5b146100e9578063e93314ab14610118578063f2fde38b146101a2575b005b341561008d57600080fd5b6100956101c1565b60405190815260200160405180910390f35b34156100b257600080fd5b6100806004356024356101c7565b34156100cb57600080fd5b6100806004356101e8565b34156100e157600080fd5b61009561024a565b34156100f457600080fd5b6100fc610250565b604051600160a060020a03909116815260200160405180910390f35b341561012357600080fd5b61012b61025f565b60405160208082528190810183818151815260200191508051906020019080838360005b8381101561016757808201518382015260200161014f565b50505050905090810190601f1680156101945780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34156101ad57600080fd5b610080600160a060020a03600435166102a0565b60015481565b60005433600160a060020a039081169116146101e257600080fd5b50600155565b600181905560005b6103e8811015610208576001805482018155016101f0565b610246600160408051908101604052600281527f686900000000000000000000000000000000000000000000000000000000000060208201526102f6565b5050565b60015490565b600054600160a060020a031681565b61026761039c565b60408051908101604052600581527f68656c6c6f0000000000000000000000000000000000000000000000000000006020820152905090565b60005433600160a060020a039081169116146102bb57600080fd5b600160a060020a038116156102f3576000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b50565b7fd204e27263771793b3472e4c07118500eb1ab892c2b2f0a4b90b33c33d4df42f8282604051821515815260406020820181815290820183818151815260200191508051906020019080838360005b8381101561035d578082015183820152602001610345565b50505050905090810190601f16801561038a5780820380516001836020036101000a031916815260200191505b50935050505060405180910390a15050565b602060405190810160405260008152905600a165627a7a723058206bcde2c3a4cf689ece10c413be63964fef8fc035e4668441e53765fc2b5f61910029",
-  "real_runtime_bytecode": "606060405236156100805763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416632a1afcd981146100825780634f829ee8146100a757806360fe47b1146100c05780636d4ce63c146100d65780638da5cb5b146100e9578063e93314ab14610118578063f2fde38b146101a2575b005b341561008d57600080fd5b6100956101c1565b60405190815260200160405180910390f35b34156100b257600080fd5b6100806004356024356101c7565b34156100cb57600080fd5b6100806004356101e8565b34156100e157600080fd5b61009561024a565b34156100f457600080fd5b6100fc610250565b604051600160a060020a03909116815260200160405180910390f35b341561012357600080fd5b61012b61025f565b60405160208082528190810183818151815260200191508051906020019080838360005b8381101561016757808201518382015260200161014f565b50505050905090810190601f1680156101945780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34156101ad57600080fd5b610080600160a060020a03600435166102a0565b60015481565b60005433600160a060020a039081169116146101e257600080fd5b50600155565b600181905560005b6103e8811015610208576001805482018155016101f0565b610246600160408051908101604052600281527f686900000000000000000000000000000000000000000000000000000000000060208201526102f6565b5050565b60015490565b600054600160a060020a031681565b61026761039c565b60408051908101604052600581527f68656c6c6f0000000000000000000000000000000000000000000000000000006020820152905090565b60005433600160a060020a039081169116146102bb57600080fd5b600160a060020a038116156102f3576000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b50565b7fd204e27263771793b3472e4c07118500eb1ab892c2b2f0a4b90b33c33d4df42f8282604051821515815260406020820181815290820183818151815260200191508051906020019080838360005b8381101561035d578082015183820152602001610345565b50505050905090810190601f16801561038a5780820380516001836020036101000a031916815260200191505b50935050505060405180910390a15050565b602060405190810160405260008152905600a165627a7a723058206bcde2c3a4cf689ece10c413be63964fef8fc035e4668441e53765fc2b5f61910029",
-  "swarm_hash": "6bcde2c3a4cf689ece10c413be63964fef8fc035e4668441e53765fc2b5f6191",
-  "gas_estimates": {
-    "creation": {
-      "codeDepositCost": "197200",
-      "executionCost": "40658",
-      "totalCost": "237858"
-    },
-    "external": {
-      "": "211",
-      "get()": "436",
-      "getS()": "infinite",
-      "owner()": "611",
-      "set(uint256)": "infinite",
-      "set2(uint256,uint256)": "20470",
-      "storedData()": "370",
-      "transferOwnership(address)": "21040"
-    }
-  },
-  "function_hashes": {
-    "get()": "6d4ce63c",
-    "getS()": "e93314ab",
-    "owner()": "8da5cb5b",
-    "set(uint256)": "60fe47b1",
-    "set2(uint256,uint256)": "4f829ee8",
-    "storedData()": "2a1afcd9",
-    "transferOwnership(address)": "f2fde38b"
-  },
-  "abi": [
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "storedData",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x2a1afcd9"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "x",
-          "type": "uint256"
-        },
-        {
-          "name": "unusedGiveWarning",
-          "type": "uint256"
-        }
-      ],
-      "name": "set2",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x4f829ee8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "x",
-          "type": "uint256"
-        }
-      ],
-      "name": "set",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x60fe47b1"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "get",
-      "outputs": [
-        {
-          "name": "retVal",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x6d4ce63c"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getS",
-      "outputs": [
-        {
-          "name": "d",
-          "type": "string"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0xe93314ab"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "inputs": [
-        {
-          "name": "initialValue",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "constructor",
-      "signature": "constructor"
-    },
-    {
-      "payable": true,
-      "stateMutability": "payable",
-      "type": "fallback"
-    }
-  ]
-}
diff --git a/test_apps/contracts_app/build/contracts/SomeContract.json b/test_apps/contracts_app/build/contracts/SomeContract.json
deleted file mode 100644
index 0ad634ae3..000000000
--- a/test_apps/contracts_app/build/contracts/SomeContract.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "contract_name": "SomeContract",
-  "address": "0x8Ceaf75fff52a769582ca880E0be830B95D1C5FC",
-  "code": "6060604052341561000f57600080fd5b6040516101da3803806101da83398101604052808051820191906020018051915082905060008151811061003f57fe5b9060200190602002015160008054600160a060020a031916600160a060020a03929092169190911790558160018151811061007657fe5b9060200190602002015160018054600160a060020a031916600160a060020a039290921691909117905560025550610127806100b36000396000f3006060604052361560505763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811460525780636b79ff5b146074578063fc25626f1460ad575b005b3415605c57600080fd5b606260bd565b60405190815260200160405180910390f35b3415607e57600080fd5b608460c3565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341560b757600080fd5b608460df565b60025481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60015473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a7230582009157ecead8ad8ed45f0c217be7423629f8b7e97649637aff999fcc9f10ae07a0029",
-  "runtime_bytecode": "6060604052361560505763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811460525780636b79ff5b146074578063fc25626f1460ad575b005b3415605c57600080fd5b606260bd565b60405190815260200160405180910390f35b3415607e57600080fd5b608460c3565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341560b757600080fd5b608460df565b60025481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60015473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a7230582009157ecead8ad8ed45f0c217be7423629f8b7e97649637aff999fcc9f10ae07a0029",
-  "real_runtime_bytecode": "6060604052361560505763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811460525780636b79ff5b146074578063fc25626f1460ad575b005b3415605c57600080fd5b606260bd565b60405190815260200160405180910390f35b3415607e57600080fd5b608460c3565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341560b757600080fd5b608460df565b60025481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60015473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a7230582009157ecead8ad8ed45f0c217be7423629f8b7e97649637aff999fcc9f10ae07a0029",
-  "swarm_hash": "09157ecead8ad8ed45f0c217be7423629f8b7e97649637aff999fcc9f10ae07a",
-  "gas_estimates": {
-    "creation": {
-      "codeDepositCost": "59000",
-      "executionCost": "infinite",
-      "totalCost": "infinite"
-    },
-    "external": {
-      "": "123",
-      "addr_1()": "407",
-      "addr_2()": "429",
-      "value()": "370"
-    }
-  },
-  "function_hashes": {
-    "addr_1()": "6b79ff5b",
-    "addr_2()": "fc25626f",
-    "value()": "3fa4f245"
-  },
-  "abi": [
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "value",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x3fa4f245"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "addr_1",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x6b79ff5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "addr_2",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xfc25626f"
-    },
-    {
-      "inputs": [
-        {
-          "name": "_addresses",
-          "type": "address[]"
-        },
-        {
-          "name": "initialValue",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "constructor",
-      "signature": "constructor"
-    },
-    {
-      "payable": true,
-      "stateMutability": "payable",
-      "type": "fallback"
-    }
-  ]
-}
diff --git a/test_apps/contracts_app/build/contracts/Test.json b/test_apps/contracts_app/build/contracts/Test.json
deleted file mode 100644
index 5b9a8e49d..000000000
--- a/test_apps/contracts_app/build/contracts/Test.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "contract_name": "Test",
-  "address": "0x4CDbA232389410680E90A3450f4b7456febf3312",
-  "code": "6060604052341561000f57600080fd5b6101ff8061001e6000396000f300606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de8114610052578063ae40f72f1461008e578063fe64d6ff146100b357600080fd5b341561005d57600080fd5b6100656100e1565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341561009957600080fd5b6100a16100fd565b60405190815260200160405180910390f35b34156100be57600080fd5b6100df73ffffffffffffffffffffffffffffffffffffffff60043516610197565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b600073d9F35C730c43e9f5E8de5AB11289a8f0f494669263771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561017857600080fd5b6102c65a03f4151561018957600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a723058205dafb55d35d578bd855a7b1cda88129ff1b062f3524edfa58cd7cd0f4441dabe0029",
-  "runtime_bytecode": "606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de8114610052578063ae40f72f1461008e578063fe64d6ff146100b357600080fd5b341561005d57600080fd5b6100656100e1565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341561009957600080fd5b6100a16100fd565b60405190815260200160405180910390f35b34156100be57600080fd5b6100df73ffffffffffffffffffffffffffffffffffffffff60043516610197565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b600073__test.sol:ZAMyLib______________________63771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561017857600080fd5b6102c65a03f4151561018957600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a723058205dafb55d35d578bd855a7b1cda88129ff1b062f3524edfa58cd7cd0f4441dabe0029",
-  "real_runtime_bytecode": "606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de8114610052578063ae40f72f1461008e578063fe64d6ff146100b357600080fd5b341561005d57600080fd5b6100656100e1565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341561009957600080fd5b6100a16100fd565b60405190815260200160405180910390f35b34156100be57600080fd5b6100df73ffffffffffffffffffffffffffffffffffffffff60043516610197565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b600073__test.sol:ZAMyLib______________________63771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561017857600080fd5b6102c65a03f4151561018957600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a723058205dafb55d35d578bd855a7b1cda88129ff1b062f3524edfa58cd7cd0f4441dabe0029",
-  "swarm_hash": "5dafb55d35d578bd855a7b1cda88129ff1b062f3524edfa58cd7cd0f4441dabe",
-  "gas_estimates": {
-    "creation": {
-      "codeDepositCost": "102200",
-      "executionCost": "142",
-      "totalCost": "102342"
-    },
-    "external": {
-      "addr()": "367",
-      "changeAddress(address)": "20405",
-      "testAdd()": "infinite"
-    }
-  },
-  "function_hashes": {
-    "addr()": "767800de",
-    "changeAddress(address)": "fe64d6ff",
-    "testAdd()": "ae40f72f"
-  },
-  "abi": [
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "addr",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x767800de"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "testAdd",
-      "outputs": [
-        {
-          "name": "_result",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0xae40f72f"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_addr",
-          "type": "address"
-        }
-      ],
-      "name": "changeAddress",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xfe64d6ff"
-    }
-  ]
-}
diff --git a/test_apps/contracts_app/build/contracts/Test2.json b/test_apps/contracts_app/build/contracts/Test2.json
deleted file mode 100644
index 031ed2ae0..000000000
--- a/test_apps/contracts_app/build/contracts/Test2.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "contract_name": "Test2",
-  "address": "0x3Cd5eb0A7da804BE54AAEaA7fd4594F65CCDA089",
-  "code": "6060604052341561000f57600080fd5b6101ff8061001e6000396000f300606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de8114610052578063ae40f72f1461008e578063fe64d6ff146100b357600080fd5b341561005d57600080fd5b6100656100e1565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341561009957600080fd5b6100a16100fd565b60405190815260200160405180910390f35b34156100be57600080fd5b6100df73ffffffffffffffffffffffffffffffffffffffff60043516610197565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60007368A4e859B23056B6D2967409002861158E1CBF1563771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561017857600080fd5b6102c65a03f4151561018957600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a72305820244a0919426b3941e7ee07bde5a6f76cbf7fea7960467f09a6afe5c6effef8b70029",
-  "runtime_bytecode": "606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de8114610052578063ae40f72f1461008e578063fe64d6ff146100b357600080fd5b341561005d57600080fd5b6100656100e1565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341561009957600080fd5b6100a16100fd565b60405190815260200160405180910390f35b34156100be57600080fd5b6100df73ffffffffffffffffffffffffffffffffffffffff60043516610197565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b600073__zlib2.sol:ZAMyLib2____________________63771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561017857600080fd5b6102c65a03f4151561018957600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a72305820244a0919426b3941e7ee07bde5a6f76cbf7fea7960467f09a6afe5c6effef8b70029",
-  "real_runtime_bytecode": "606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de8114610052578063ae40f72f1461008e578063fe64d6ff146100b357600080fd5b341561005d57600080fd5b6100656100e1565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341561009957600080fd5b6100a16100fd565b60405190815260200160405180910390f35b34156100be57600080fd5b6100df73ffffffffffffffffffffffffffffffffffffffff60043516610197565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b600073__zlib2.sol:ZAMyLib2____________________63771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561017857600080fd5b6102c65a03f4151561018957600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a72305820244a0919426b3941e7ee07bde5a6f76cbf7fea7960467f09a6afe5c6effef8b70029",
-  "swarm_hash": "244a0919426b3941e7ee07bde5a6f76cbf7fea7960467f09a6afe5c6effef8b7",
-  "gas_estimates": {
-    "creation": {
-      "codeDepositCost": "102200",
-      "executionCost": "142",
-      "totalCost": "102342"
-    },
-    "external": {
-      "addr()": "367",
-      "changeAddress(address)": "20405",
-      "testAdd()": "infinite"
-    }
-  },
-  "function_hashes": {
-    "addr()": "767800de",
-    "changeAddress(address)": "fe64d6ff",
-    "testAdd()": "ae40f72f"
-  },
-  "abi": [
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "addr",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x767800de"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "testAdd",
-      "outputs": [
-        {
-          "name": "_result",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0xae40f72f"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_addr",
-          "type": "address"
-        }
-      ],
-      "name": "changeAddress",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xfe64d6ff"
-    }
-  ]
-}
diff --git a/test_apps/contracts_app/build/contracts/Token.json b/test_apps/contracts_app/build/contracts/Token.json
deleted file mode 100644
index 5b846360c..000000000
--- a/test_apps/contracts_app/build/contracts/Token.json
+++ /dev/null
@@ -1,245 +0,0 @@
-{
-  "contract_name": "Token",
-  "code": "6060604052341561000f57600080fd5b60405160208061049983398101604052808051600160a060020a03331660009081526020819052604090208190556002555050610448806100516000396000f300606060405236156100805763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008557806315945790146100bb57806318160ddd146100e057806323b872dd146100f357806370a082311461011b578063a9059cbb1461013a578063dd62ed3e1461015c575b600080fd5b341561009057600080fd5b6100a7600160a060020a0360043516602435610181565b604051901515815260200160405180910390f35b34156100c657600080fd5b6100ce6101ed565b60405190815260200160405180910390f35b34156100eb57600080fd5b6100ce6101f3565b34156100fe57600080fd5b6100a7600160a060020a03600435811690602435166044356101f9565b341561012657600080fd5b6100ce600160a060020a036004351661030d565b341561014557600080fd5b6100a7600160a060020a0360043516602435610328565b341561016757600080fd5b6100ce600160a060020a03600435811690602435166103ea565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561021f57600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025357600080fd5b600160a060020a0383166000908152602081905260409020546102769083610415565b151561028157600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561034e57600080fd5b600160a060020a0383166000908152602081905260409020546103719083610415565b151561037c57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820296acec21220568a1b9f9dcf20f96accf851205e34513c360b7e90ac6c1e70dd0029",
-  "runtime_bytecode": "606060405236156100805763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008557806315945790146100bb57806318160ddd146100e057806323b872dd146100f357806370a082311461011b578063a9059cbb1461013a578063dd62ed3e1461015c575b600080fd5b341561009057600080fd5b6100a7600160a060020a0360043516602435610181565b604051901515815260200160405180910390f35b34156100c657600080fd5b6100ce6101ed565b60405190815260200160405180910390f35b34156100eb57600080fd5b6100ce6101f3565b34156100fe57600080fd5b6100a7600160a060020a03600435811690602435166044356101f9565b341561012657600080fd5b6100ce600160a060020a036004351661030d565b341561014557600080fd5b6100a7600160a060020a0360043516602435610328565b341561016757600080fd5b6100ce600160a060020a03600435811690602435166103ea565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561021f57600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025357600080fd5b600160a060020a0383166000908152602081905260409020546102769083610415565b151561028157600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561034e57600080fd5b600160a060020a0383166000908152602081905260409020546103719083610415565b151561037c57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820296acec21220568a1b9f9dcf20f96accf851205e34513c360b7e90ac6c1e70dd0029",
-  "real_runtime_bytecode": "606060405236156100805763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008557806315945790146100bb57806318160ddd146100e057806323b872dd146100f357806370a082311461011b578063a9059cbb1461013a578063dd62ed3e1461015c575b600080fd5b341561009057600080fd5b6100a7600160a060020a0360043516602435610181565b604051901515815260200160405180910390f35b34156100c657600080fd5b6100ce6101ed565b60405190815260200160405180910390f35b34156100eb57600080fd5b6100ce6101f3565b34156100fe57600080fd5b6100a7600160a060020a03600435811690602435166044356101f9565b341561012657600080fd5b6100ce600160a060020a036004351661030d565b341561014557600080fd5b6100a7600160a060020a0360043516602435610328565b341561016757600080fd5b6100ce600160a060020a03600435811690602435166103ea565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561021f57600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025357600080fd5b600160a060020a0383166000908152602081905260409020546102769083610415565b151561028157600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561034e57600080fd5b600160a060020a0383166000908152602081905260409020546103719083610415565b151561037c57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820296acec21220568a1b9f9dcf20f96accf851205e34513c360b7e90ac6c1e70dd0029",
-  "swarm_hash": "296acec21220568a1b9f9dcf20f96accf851205e34513c360b7e90ac6c1e70dd",
-  "gas_estimates": {
-    "creation": {
-      "codeDepositCost": "219200",
-      "executionCost": "40465",
-      "totalCost": "259665"
-    },
-    "external": {
-      "_supply()": "392",
-      "allowance(address,address)": "826",
-      "approve(address,uint256)": "22330",
-      "balanceOf(address)": "683",
-      "totalSupply()": "414",
-      "transfer(address,uint256)": "43630",
-      "transferFrom(address,address,uint256)": "64413"
-    },
-    "internal": {
-      "safeToAdd(uint256,uint256)": "24"
-    }
-  },
-  "function_hashes": {
-    "_supply()": "15945790",
-    "allowance(address,address)": "dd62ed3e",
-    "approve(address,uint256)": "095ea7b3",
-    "balanceOf(address)": "70a08231",
-    "totalSupply()": "18160ddd",
-    "transfer(address,uint256)": "a9059cbb",
-    "transferFrom(address,address,uint256)": "23b872dd"
-  },
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "approve",
-      "outputs": [
-        {
-          "name": "ok",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x095ea7b3"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "_supply",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x15945790"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "totalSupply",
-      "outputs": [
-        {
-          "name": "supply",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x18160ddd"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "from",
-          "type": "address"
-        },
-        {
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "transferFrom",
-      "outputs": [
-        {
-          "name": "ok",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x23b872dd"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "who",
-          "type": "address"
-        }
-      ],
-      "name": "balanceOf",
-      "outputs": [
-        {
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x70a08231"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "transfer",
-      "outputs": [
-        {
-          "name": "ok",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xa9059cbb"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "name": "spender",
-          "type": "address"
-        }
-      ],
-      "name": "allowance",
-      "outputs": [
-        {
-          "name": "_allowance",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xdd62ed3e"
-    },
-    {
-      "inputs": [
-        {
-          "name": "initial_balance",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "constructor",
-      "signature": "constructor"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "from",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "Transfer",
-      "type": "event",
-      "signature": "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "Approval",
-      "type": "event",
-      "signature": "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925"
-    }
-  ]
-}
diff --git a/test_apps/contracts_app/build/contracts/ZAMyLib.json b/test_apps/contracts_app/build/contracts/ZAMyLib.json
deleted file mode 100644
index a39e9c8dc..000000000
--- a/test_apps/contracts_app/build/contracts/ZAMyLib.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "contract_name": "ZAMyLib",
-  "address": "0xd9F35C730c43e9f5E8de5AB11289a8f0f4946692",
-  "code": "60606040523415600e57600080fd5b60898061001c6000396000f300606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663771602f78114603b57600080fd5b60476004356024356059565b60405190815260200160405180910390f35b01905600a165627a7a72305820ede2cb131e1daa954b133652da10a32a7854ec4efe9627ca423678710326ea090029",
-  "runtime_bytecode": "606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663771602f78114603b57600080fd5b60476004356024356059565b60405190815260200160405180910390f35b01905600a165627a7a72305820ede2cb131e1daa954b133652da10a32a7854ec4efe9627ca423678710326ea090029",
-  "real_runtime_bytecode": "606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663771602f78114603b57600080fd5b60476004356024356059565b60405190815260200160405180910390f35b01905600a165627a7a72305820ede2cb131e1daa954b133652da10a32a7854ec4efe9627ca423678710326ea090029",
-  "swarm_hash": "ede2cb131e1daa954b133652da10a32a7854ec4efe9627ca423678710326ea09",
-  "gas_estimates": {
-    "creation": {
-      "codeDepositCost": "27400",
-      "executionCost": "76",
-      "totalCost": "27476"
-    },
-    "external": {
-      "add(uint256,uint256)": "145"
-    }
-  },
-  "function_hashes": {
-    "add(uint256,uint256)": "771602f7"
-  },
-  "abi": [
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_a",
-          "type": "uint256"
-        },
-        {
-          "name": "_b",
-          "type": "uint256"
-        }
-      ],
-      "name": "add",
-      "outputs": [
-        {
-          "name": "_c",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0x771602f7"
-    }
-  ]
-}
diff --git a/test_apps/contracts_app/build/contracts/ZAMyLib2.json b/test_apps/contracts_app/build/contracts/ZAMyLib2.json
deleted file mode 100644
index 2154d87cf..000000000
--- a/test_apps/contracts_app/build/contracts/ZAMyLib2.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "contract_name": "ZAMyLib2",
-  "address": "0x68A4e859B23056B6D2967409002861158E1CBF15",
-  "code": "60606040523415600e57600080fd5b60898061001c6000396000f300606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663771602f78114603b57600080fd5b60476004356024356059565b60405190815260200160405180910390f35b01905600a165627a7a72305820d084d179422d3aec0f3377343cb85adf4bf4558a605e7cc86551c24d8af313420029",
-  "runtime_bytecode": "606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663771602f78114603b57600080fd5b60476004356024356059565b60405190815260200160405180910390f35b01905600a165627a7a72305820d084d179422d3aec0f3377343cb85adf4bf4558a605e7cc86551c24d8af313420029",
-  "real_runtime_bytecode": "606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663771602f78114603b57600080fd5b60476004356024356059565b60405190815260200160405180910390f35b01905600a165627a7a72305820d084d179422d3aec0f3377343cb85adf4bf4558a605e7cc86551c24d8af313420029",
-  "swarm_hash": "d084d179422d3aec0f3377343cb85adf4bf4558a605e7cc86551c24d8af31342",
-  "gas_estimates": {
-    "creation": {
-      "codeDepositCost": "27400",
-      "executionCost": "76",
-      "totalCost": "27476"
-    },
-    "external": {
-      "add(uint256,uint256)": "145"
-    }
-  },
-  "function_hashes": {
-    "add(uint256,uint256)": "771602f7"
-  },
-  "abi": [
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_a",
-          "type": "uint256"
-        },
-        {
-          "name": "_b",
-          "type": "uint256"
-        }
-      ],
-      "name": "add",
-      "outputs": [
-        {
-          "name": "_c",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0x771602f7"
-    }
-  ]
-}
diff --git a/test_apps/contracts_app/contracts.json b/test_apps/contracts_app/contracts.json
index d4112a285..2b0dfc599 100644
--- a/test_apps/contracts_app/contracts.json
+++ b/test_apps/contracts_app/contracts.json
@@ -2,7 +2,7 @@
   "default": {
     "versions": {
       "web3": "1.0.0-beta.27",
-      "solc": "0.4.17"
+      "solc": "0.4.24"
     },
     "deployment": {
       "host": "localhost",
diff --git a/test_apps/contracts_app/contracts/another_storage.sol b/test_apps/contracts_app/contracts/another_storage.sol
index 92233769b..2bf83d1da 100644
--- a/test_apps/contracts_app/contracts/another_storage.sol
+++ b/test_apps/contracts_app/contracts/another_storage.sol
@@ -1,9 +1,9 @@
-pragma solidity ^0.4.17;
+pragma solidity ^0.4.24;
 contract AnotherStorage {
   address public simpleStorageAddress;
   address simpleStorageAddress2;
 
-  function AnotherStorage(address addr) public {
+  constructor(address addr) public {
     simpleStorageAddress = addr;
   }
 
diff --git a/test_apps/contracts_app/contracts/contract_args.sol b/test_apps/contracts_app/contracts/contract_args.sol
index 1bf7a2d37..a1019181e 100644
--- a/test_apps/contracts_app/contracts/contract_args.sol
+++ b/test_apps/contracts_app/contracts/contract_args.sol
@@ -1,3 +1,5 @@
+pragma solidity ^0.4.24;
+
 contract ContractArgs {
   address public addr_1;
   address public addr_2;
@@ -5,7 +7,7 @@ contract ContractArgs {
 
   function() public payable { }
 
-  function ContractArgs(address[] _addresses, uint initialValue) public {
+  constructor(address[] _addresses, uint initialValue) public {
     addr_1 = _addresses[0];
     addr_2 = _addresses[1];
     value = initialValue;
diff --git a/test_apps/contracts_app/contracts/ownable.sol b/test_apps/contracts_app/contracts/ownable.sol
index af8aa0cfc..3725007cc 100644
--- a/test_apps/contracts_app/contracts/ownable.sol
+++ b/test_apps/contracts_app/contracts/ownable.sol
@@ -13,7 +13,7 @@ contract Ownable {
    * @dev The Ownable constructor sets the original `owner` of the contract to the sender
    * account.
    */
-  function Ownable() public {
+  constructor() public {
     owner = msg.sender;
   }
 
diff --git a/test_apps/contracts_app/contracts/simple_storage.sol b/test_apps/contracts_app/contracts/simple_storage.sol
index c72e8e98d..333c03ff7 100644
--- a/test_apps/contracts_app/contracts/simple_storage.sol
+++ b/test_apps/contracts_app/contracts/simple_storage.sol
@@ -6,7 +6,7 @@ library Assert {
   event TestEvent(bool passed, string message);
 
   function triggerEvent(bool passed, string message) internal {
-    TestEvent(passed, message);
+    emit TestEvent(passed, message);
   }
 }
 
@@ -15,7 +15,7 @@ contract SimpleStorage is Ownable {
 
   function() public payable { }
 
-  function SimpleStorage(uint initialValue) public {
+  constructor(uint initialValue) public {
     storedData = initialValue;
   }
 
@@ -27,7 +27,7 @@ contract SimpleStorage is Ownable {
     Assert.triggerEvent(true, "hi");
   }
 
-  function set2(uint x, uint unusedGiveWarning) public onlyOwner {
+  function set2(uint x) public onlyOwner {
     storedData = x;
   }
 
diff --git a/test_apps/contracts_app/contracts/some_contract.sol b/test_apps/contracts_app/contracts/some_contract.sol
index fa69a88b3..9297cfae8 100644
--- a/test_apps/contracts_app/contracts/some_contract.sol
+++ b/test_apps/contracts_app/contracts/some_contract.sol
@@ -1,3 +1,5 @@
+pragma solidity ^0.4.24;
+
 contract SomeContract {
   address public addr_1;
   address public addr_2;
@@ -5,7 +7,7 @@ contract SomeContract {
 
   function() public payable { }
 
-  function SomeContract(address[] _addresses, uint initialValue) public {
+  constructor(address[] _addresses, uint initialValue) public {
     addr_1 = _addresses[0];
     addr_2 = _addresses[1];
     value = initialValue;
diff --git a/test_apps/contracts_app/contracts/token.sol b/test_apps/contracts_app/contracts/token.sol
index 32b1dafdc..39584bca4 100644
--- a/test_apps/contracts_app/contracts/token.sol
+++ b/test_apps/contracts_app/contracts/token.sol
@@ -10,7 +10,7 @@ contract Token {
   mapping( address => mapping( address => uint ) ) _approvals;
   uint public _supply;
   //uint public _supply2;
-  function Token( uint initial_balance ) public {
+  constructor( uint initial_balance ) public {
     _balances[msg.sender] = initial_balance;
     _supply = initial_balance;
   }
@@ -29,7 +29,7 @@ contract Token {
     }
     _balances[msg.sender] -= value;
     _balances[to] += value;
-    Transfer( msg.sender, to, value );
+    emit Transfer( msg.sender, to, value );
     return true;
   }
   function transferFrom( address from, address to, uint value) public returns (bool ok) {
@@ -48,13 +48,13 @@ contract Token {
     _approvals[from][msg.sender] -= value;
     _balances[from] -= value;
     _balances[to] += value;
-    Transfer( from, to, value );
+    emit Transfer( from, to, value );
     return true;
   }
   function approve(address spender, uint value) public returns (bool ok) {
     // TODO: should increase instead
     _approvals[msg.sender][spender] = value;
-    Approval( msg.sender, spender, value );
+    emit Approval( msg.sender, spender, value );
     return true;
   }
   function allowance(address owner, address spender) public constant returns (uint _allowance) {
diff --git a/test_apps/test_app/app/contracts/SimpleStorageWithHttpImport.sol b/test_apps/test_app/app/contracts/SimpleStorageWithHttpImport.sol
index 8af1557c4..b67e12c03 100644
--- a/test_apps/test_app/app/contracts/SimpleStorageWithHttpImport.sol
+++ b/test_apps/test_app/app/contracts/SimpleStorageWithHttpImport.sol
@@ -9,7 +9,7 @@ contract SimpleStorageWithHttpImport is Ownable {
 
   function() public payable { }
 
-  function SimpleStorageWithHttpImport(uint initialValue) public {
+  constructor(uint initialValue) public {
     storedData = initialValue;
   }
 
@@ -20,7 +20,7 @@ contract SimpleStorageWithHttpImport is Ownable {
     }
   }
 
-  function set2(uint x, uint unusedGiveWarning) public onlyOwner {
+  function set2(uint x) public onlyOwner {
     storedData = x;
   }
 
diff --git a/test_apps/test_app/app/contracts/another_storage.sol b/test_apps/test_app/app/contracts/another_storage.sol
index d8e0a1a81..ba845f931 100644
--- a/test_apps/test_app/app/contracts/another_storage.sol
+++ b/test_apps/test_app/app/contracts/another_storage.sol
@@ -3,7 +3,7 @@ contract AnotherStorage {
   address public simpleStorageAddress;
   address simpleStorageAddress2;
 
-  function AnotherStorage(address addr) public {
+  constructor(address addr) public {
     simpleStorageAddress = addr;
   }
 
diff --git a/test_apps/test_app/app/contracts/contract_args.sol b/test_apps/test_app/app/contracts/contract_args.sol
index 1bf7a2d37..a1019181e 100644
--- a/test_apps/test_app/app/contracts/contract_args.sol
+++ b/test_apps/test_app/app/contracts/contract_args.sol
@@ -1,3 +1,5 @@
+pragma solidity ^0.4.24;
+
 contract ContractArgs {
   address public addr_1;
   address public addr_2;
@@ -5,7 +7,7 @@ contract ContractArgs {
 
   function() public payable { }
 
-  function ContractArgs(address[] _addresses, uint initialValue) public {
+  constructor(address[] _addresses, uint initialValue) public {
     addr_1 = _addresses[0];
     addr_2 = _addresses[1];
     value = initialValue;
diff --git a/test_apps/test_app/app/contracts/ownable.sol b/test_apps/test_app/app/contracts/ownable.sol
index af8aa0cfc..1ecf427b9 100644
--- a/test_apps/test_app/app/contracts/ownable.sol
+++ b/test_apps/test_app/app/contracts/ownable.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.4.17;
+pragma solidity ^0.4.24;
 
 /**
  * @title Ownable
@@ -13,7 +13,7 @@ contract Ownable {
    * @dev The Ownable constructor sets the original `owner` of the contract to the sender
    * account.
    */
-  function Ownable() public {
+  constructor() public {
     owner = msg.sender;
   }
 
diff --git a/test_apps/test_app/app/contracts/simple_storage.sol b/test_apps/test_app/app/contracts/simple_storage.sol
index 608b3af9a..43bd0d4e8 100644
--- a/test_apps/test_app/app/contracts/simple_storage.sol
+++ b/test_apps/test_app/app/contracts/simple_storage.sol
@@ -6,7 +6,7 @@ library Assert {
   event TestEvent(bool passed, string message);
 
   function triggerEvent(bool passed, string message) internal {
-    TestEvent(passed, message);
+    emit TestEvent(passed, message);
   }
 }
 
@@ -17,7 +17,7 @@ contract SimpleStorage is Ownable {
 
   function() public payable { }
 
-  function SimpleStorage(uint initialValue) public {
+  constructor(uint initialValue) public {
     storedData = initialValue;
   }
 
@@ -26,7 +26,7 @@ contract SimpleStorage is Ownable {
     Assert.triggerEvent(true, "hi");
   }
 
-  function set2(uint x, uint unusedGiveWarning) public onlyOwner {
+  function set2(uint x) public onlyOwner {
     storedData = x;
     emit EventOnSet2(true, "hi");
   }
diff --git a/test_apps/test_app/app/contracts/some_contract.sol b/test_apps/test_app/app/contracts/some_contract.sol
index fa69a88b3..9297cfae8 100644
--- a/test_apps/test_app/app/contracts/some_contract.sol
+++ b/test_apps/test_app/app/contracts/some_contract.sol
@@ -1,3 +1,5 @@
+pragma solidity ^0.4.24;
+
 contract SomeContract {
   address public addr_1;
   address public addr_2;
@@ -5,7 +7,7 @@ contract SomeContract {
 
   function() public payable { }
 
-  function SomeContract(address[] _addresses, uint initialValue) public {
+  constructor(address[] _addresses, uint initialValue) public {
     addr_1 = _addresses[0];
     addr_2 = _addresses[1];
     value = initialValue;
diff --git a/test_apps/test_app/config/contracts.js b/test_apps/test_app/config/contracts.js
index 831466acf..8b4a36bcd 100644
--- a/test_apps/test_app/config/contracts.js
+++ b/test_apps/test_app/config/contracts.js
@@ -66,8 +66,9 @@ module.exports = {
         file: "./some_folder/test_contract.sol",
         args: [1000]
       },
-      Identity: {
-        file: "https://github.com/status-im/contracts/blob/master/contracts/identity/Identity.sol"
+      StandardToken: {
+        file: "https://github.com/status-im/contracts/blob/151-embark31/contracts/token/StandardToken.sol",
+        deploy: false
       },
       SimpleStorageWithHttpImport: {
         fromIndex: 0,
diff --git a/test_apps/test_app/contracts/token.sol b/test_apps/test_app/contracts/token.sol
index cf1a54d6d..8c6e5d29f 100644
--- a/test_apps/test_app/contracts/token.sol
+++ b/test_apps/test_app/contracts/token.sol
@@ -10,7 +10,7 @@ contract Token {
   mapping( address => mapping( address => uint ) ) _approvals;
   uint public _supply;
   //uint public _supply2;
-  function Token( uint initial_balance ) public {
+  constructor( uint initial_balance ) public {
     _balances[msg.sender] = initial_balance;
     _supply = initial_balance;
   }
@@ -29,7 +29,7 @@ contract Token {
     }
     _balances[msg.sender] -= value;
     _balances[to] += value;
-    Transfer( msg.sender, to, value );
+    emit Transfer( msg.sender, to, value );
     return true;
   }
   function transferFrom( address from, address to, uint value) public returns (bool ok) {
@@ -48,13 +48,13 @@ contract Token {
     _approvals[from][msg.sender] -= value;
     _balances[from] -= value;
     _balances[to] += value;
-    Transfer( from, to, value );
+    emit Transfer( from, to, value );
     return true;
   }
   function approve(address spender, uint value) public returns (bool ok) {
     // TODO: should increase instead
     _approvals[msg.sender][spender] = value;
-    Approval( msg.sender, spender, value );
+    emit Approval( msg.sender, spender, value );
     return true;
   }
   function allowance(address owner, address spender) public constant returns (uint _allowance) {
@@ -63,7 +63,7 @@ contract Token {
   function safeToAdd(uint a, uint b) internal pure returns (bool) {
     return (a + b >= a);
   }
-  function isAvailable() public constant returns (bool) {
+  function isAvailable() public pure returns (bool) {
     return false;
   }
 }
diff --git a/test_apps/test_app/extensions/embark-service/contracts/pluginSimpleStorage.sol b/test_apps/test_app/extensions/embark-service/contracts/pluginSimpleStorage.sol
index 4d01d6b32..cad3e2619 100644
--- a/test_apps/test_app/extensions/embark-service/contracts/pluginSimpleStorage.sol
+++ b/test_apps/test_app/extensions/embark-service/contracts/pluginSimpleStorage.sol
@@ -3,7 +3,7 @@ contract PluginStorage {
   address public simpleStorageAddress;
   address simpleStorageAddress2;
 
-  function PluginStorage(address addr) public {
+  constructor(address addr) public {
     simpleStorageAddress = addr;
   }
 
diff --git a/test_apps/test_app/package-lock.json b/test_apps/test_app/package-lock.json
index 8ecedc65d..dd65a50ed 100644
--- a/test_apps/test_app/package-lock.json
+++ b/test_apps/test_app/package-lock.json
@@ -19,9 +19,9 @@
       "integrity": "sha512-5PgPDV6F5s69XNznTcP0za3qH7qgBkr9DVQTXfZtpF+3iEyuIZB1Mjxu52F5CFxgzQUQJoBYHVxtH4Itdb5MgA==",
       "dev": true,
       "requires": {
-        "chalk": "^2.0.0",
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.0"
+        "chalk": "2.4.1",
+        "esutils": "2.0.2",
+        "js-tokens": "3.0.2"
       },
       "dependencies": {
         "js-tokens": {
@@ -38,7 +38,7 @@
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
       "requires": {
-        "color-convert": "^1.9.0"
+        "color-convert": "1.9.2"
       }
     },
     "asap": {
@@ -51,8 +51,8 @@
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
       "requires": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
+        "core-js": "2.5.7",
+        "regenerator-runtime": "0.11.1"
       },
       "dependencies": {
         "core-js": {
@@ -62,11 +62,6 @@
         }
       }
     },
-    "bn.js": {
-      "version": "4.11.6",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
-      "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU="
-    },
     "bootstrap": {
       "version": "3.3.7",
       "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz",
@@ -78,9 +73,9 @@
       "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
       "dev": true,
       "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "ansi-styles": "3.2.1",
+        "escape-string-regexp": "1.0.5",
+        "supports-color": "5.4.0"
       }
     },
     "classnames": {
@@ -111,17 +106,12 @@
     "dom-helpers": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.3.1.tgz",
-      "integrity": "sha1-/BpOFf/fYN3eA6SAqcD+zoId1KY="
-    },
-    "dotenv": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-4.0.0.tgz",
-      "integrity": "sha1-hk7xN5rO1Vzm+V3r7NzhefegzR0="
+      "integrity": "sha512-2Sm+JaYn74OiTM2wHvxJOo3roiq/h25Yi69Fqk269cNUwIXsCvATB6CRSFC9Am/20G2b28hGv/+7NiWydIrPvg=="
     },
     "embark-service": {
       "version": "file:extensions/embark-service",
       "requires": {
-        "haml": "^0.4.3"
+        "haml": "0.4.3"
       }
     },
     "encoding": {
@@ -129,7 +119,7 @@
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
       "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
       "requires": {
-        "iconv-lite": "~0.4.13"
+        "iconv-lite": "0.4.23"
       }
     },
     "escape-string-regexp": {
@@ -144,28 +134,18 @@
       "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
       "dev": true
     },
-    "ethjs-abi": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/ethjs-abi/-/ethjs-abi-0.2.1.tgz",
-      "integrity": "sha1-4KepOn6BFjqUR3utVu3lJKtt5TM=",
-      "requires": {
-        "bn.js": "4.11.6",
-        "js-sha3": "0.5.5",
-        "number-to-bn": "1.7.0"
-      }
-    },
     "fbjs": {
       "version": "0.8.17",
       "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz",
       "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=",
       "requires": {
-        "core-js": "^1.0.0",
-        "isomorphic-fetch": "^2.1.1",
-        "loose-envify": "^1.0.0",
-        "object-assign": "^4.1.0",
-        "promise": "^7.1.1",
-        "setimmediate": "^1.0.5",
-        "ua-parser-js": "^0.7.18"
+        "core-js": "1.2.7",
+        "isomorphic-fetch": "2.2.1",
+        "loose-envify": "1.4.0",
+        "object-assign": "4.1.1",
+        "promise": "7.3.1",
+        "setimmediate": "1.0.5",
+        "ua-parser-js": "0.7.18"
       }
     },
     "haml": {
@@ -184,7 +164,7 @@
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
       "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
       "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
+        "safer-buffer": "2.1.2"
       }
     },
     "invariant": {
@@ -192,14 +172,9 @@
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
       "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
       "requires": {
-        "loose-envify": "^1.0.0"
+        "loose-envify": "1.4.0"
       }
     },
-    "is-hex-prefixed": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz",
-      "integrity": "sha1-fY035q135dEnFIkTxXPggtd39VQ="
-    },
     "is-stream": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
@@ -210,8 +185,8 @@
       "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
       "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
       "requires": {
-        "node-fetch": "^1.0.1",
-        "whatwg-fetch": ">=0.10.0"
+        "node-fetch": "1.7.3",
+        "whatwg-fetch": "2.0.4"
       }
     },
     "jquery": {
@@ -219,11 +194,6 @@
       "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz",
       "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg=="
     },
-    "js-sha3": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.5.tgz",
-      "integrity": "sha1-uvDA6MVK1ZA0R9+Wreekobynmko="
-    },
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -239,25 +209,16 @@
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
       "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
       "requires": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
+        "js-tokens": "4.0.0"
       }
     },
     "node-fetch": {
       "version": "1.7.3",
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
-      "integrity": "sha1-mA9vcthSEaU0fGsrwYxbhMPrR+8=",
+      "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
       "requires": {
-        "encoding": "^0.1.11",
-        "is-stream": "^1.0.1"
-      }
-    },
-    "number-to-bn": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/number-to-bn/-/number-to-bn-1.7.0.tgz",
-      "integrity": "sha1-uzYjWS9+X54AMLGXe9QaDFP+HqA=",
-      "requires": {
-        "bn.js": "4.11.6",
-        "strip-hex-prefix": "1.0.0"
+        "encoding": "0.1.12",
+        "is-stream": "1.1.0"
       }
     },
     "object-assign": {
@@ -268,9 +229,9 @@
     "promise": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
-      "integrity": "sha1-BktyYCsY+Q8pGSuLG8QY/9Hr078=",
+      "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
       "requires": {
-        "asap": "~2.0.3"
+        "asap": "2.0.6"
       }
     },
     "prop-types": {
@@ -278,8 +239,8 @@
       "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz",
       "integrity": "sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==",
       "requires": {
-        "loose-envify": "^1.3.1",
-        "object-assign": "^4.1.1"
+        "loose-envify": "1.4.0",
+        "object-assign": "4.1.1"
       }
     },
     "prop-types-extra": {
@@ -287,8 +248,8 @@
       "resolved": "https://registry.npmjs.org/prop-types-extra/-/prop-types-extra-1.1.0.tgz",
       "integrity": "sha512-QFyuDxvMipmIVKD2TwxLVPzMnO4e5oOf1vr3tJIomL8E7d0lr6phTHd5nkPhFIzTD1idBLLEPeylL9g+rrTzRg==",
       "requires": {
-        "react-is": "^16.3.2",
-        "warning": "^3.0.0"
+        "react-is": "16.4.2",
+        "warning": "3.0.0"
       }
     },
     "react": {
@@ -296,29 +257,29 @@
       "resolved": "https://registry.npmjs.org/react/-/react-16.4.2.tgz",
       "integrity": "sha512-dMv7YrbxO4y2aqnvA7f/ik9ibeLSHQJTI6TrYAenPSaQ6OXfb+Oti+oJiy8WBxgRzlKatYqtCjphTgDSCEiWFg==",
       "requires": {
-        "fbjs": "^0.8.16",
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1",
-        "prop-types": "^15.6.0"
+        "fbjs": "0.8.17",
+        "loose-envify": "1.4.0",
+        "object-assign": "4.1.1",
+        "prop-types": "15.6.2"
       }
     },
     "react-bootstrap": {
       "version": "0.32.1",
       "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-0.32.1.tgz",
-      "integrity": "sha1-YGJMG0ijnXc+9szmQhpPM+zBZrs=",
+      "integrity": "sha512-RbfzKUbsukWsToWqGHfCCyMFq9QQI0TznutdyxyJw6dih2NvIne25Mrssg8LZsprqtPpyQi8bN0L0Fx3fUsL8Q==",
       "requires": {
-        "babel-runtime": "^6.11.6",
-        "classnames": "^2.2.5",
-        "dom-helpers": "^3.2.0",
-        "invariant": "^2.2.1",
-        "keycode": "^2.1.2",
-        "prop-types": "^15.5.10",
-        "prop-types-extra": "^1.0.1",
-        "react-overlays": "^0.8.0",
-        "react-prop-types": "^0.4.0",
-        "react-transition-group": "^2.0.0",
-        "uncontrollable": "^4.1.0",
-        "warning": "^3.0.0"
+        "babel-runtime": "6.26.0",
+        "classnames": "2.2.6",
+        "dom-helpers": "3.3.1",
+        "invariant": "2.2.4",
+        "keycode": "2.2.0",
+        "prop-types": "15.6.2",
+        "prop-types-extra": "1.1.0",
+        "react-overlays": "0.8.3",
+        "react-prop-types": "0.4.0",
+        "react-transition-group": "2.4.0",
+        "uncontrollable": "4.1.0",
+        "warning": "3.0.0"
       }
     },
     "react-dom": {
@@ -326,10 +287,10 @@
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.4.2.tgz",
       "integrity": "sha512-Usl73nQqzvmJN+89r97zmeUpQDKDlh58eX6Hbs/ERdDHzeBzWy+ENk7fsGQ+5KxArV1iOFPT46/VneklK9zoWw==",
       "requires": {
-        "fbjs": "^0.8.16",
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1",
-        "prop-types": "^15.6.0"
+        "fbjs": "0.8.17",
+        "loose-envify": "1.4.0",
+        "object-assign": "4.1.1",
+        "prop-types": "15.6.2"
       }
     },
     "react-is": {
@@ -345,14 +306,14 @@
     "react-overlays": {
       "version": "0.8.3",
       "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-0.8.3.tgz",
-      "integrity": "sha1-+tZe6lskMBzKGSoWn13dsLINOsU=",
+      "integrity": "sha512-h6GT3jgy90PgctleP39Yu3eK1v9vaJAW73GOA/UbN9dJ7aAN4BTZD6793eI1D5U+ukMk17qiqN/wl3diK1Z5LA==",
       "requires": {
-        "classnames": "^2.2.5",
-        "dom-helpers": "^3.2.1",
-        "prop-types": "^15.5.10",
-        "prop-types-extra": "^1.0.1",
-        "react-transition-group": "^2.2.0",
-        "warning": "^3.0.0"
+        "classnames": "2.2.6",
+        "dom-helpers": "3.3.1",
+        "prop-types": "15.6.2",
+        "prop-types-extra": "1.1.0",
+        "react-transition-group": "2.4.0",
+        "warning": "3.0.0"
       }
     },
     "react-prop-types": {
@@ -360,7 +321,7 @@
       "resolved": "https://registry.npmjs.org/react-prop-types/-/react-prop-types-0.4.0.tgz",
       "integrity": "sha1-+ZsL+0AGkpya8gUefBQUpcdbk9A=",
       "requires": {
-        "warning": "^3.0.0"
+        "warning": "3.0.0"
       }
     },
     "react-transition-group": {
@@ -368,16 +329,16 @@
       "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.4.0.tgz",
       "integrity": "sha512-Xv5d55NkJUxUzLCImGSanK8Cl/30sgpOEMGc5m86t8+kZwrPxPCPcFqyx83kkr+5Lz5gs6djuvE5By+gce+VjA==",
       "requires": {
-        "dom-helpers": "^3.3.1",
-        "loose-envify": "^1.3.1",
-        "prop-types": "^15.6.2",
-        "react-lifecycles-compat": "^3.0.4"
+        "dom-helpers": "3.3.1",
+        "loose-envify": "1.4.0",
+        "prop-types": "15.6.2",
+        "react-lifecycles-compat": "3.0.4"
       }
     },
     "regenerator-runtime": {
       "version": "0.11.1",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha1-vgWtf5v30i4Fb5cmzuUBf78Z4uk="
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
     },
     "safer-buffer": {
       "version": "2.1.2",
@@ -389,21 +350,13 @@
       "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
       "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
     },
-    "strip-hex-prefix": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-hex-prefix/-/strip-hex-prefix-1.0.0.tgz",
-      "integrity": "sha1-DF8VX+8RUTczd96du1iNoFUA428=",
-      "requires": {
-        "is-hex-prefixed": "1.0.0"
-      }
-    },
     "supports-color": {
       "version": "5.4.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
       "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
       "dev": true,
       "requires": {
-        "has-flag": "^3.0.0"
+        "has-flag": "3.0.0"
       }
     },
     "ua-parser-js": {
@@ -416,7 +369,7 @@
       "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-4.1.0.tgz",
       "integrity": "sha1-4DWCkSUuGGUiLZCTmxny9J+Bwak=",
       "requires": {
-        "invariant": "^2.1.0"
+        "invariant": "2.2.4"
       }
     },
     "warning": {
@@ -424,7 +377,7 @@
       "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz",
       "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=",
       "requires": {
-        "loose-envify": "^1.0.0"
+        "loose-envify": "1.4.0"
       }
     },
     "whatwg-fetch": {
@@ -433,13 +386,9 @@
       "integrity": "sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng=="
     },
     "zeppelin-solidity": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/zeppelin-solidity/-/zeppelin-solidity-1.8.0.tgz",
-      "integrity": "sha1-BJ/N59rqn8hSEPjG25+M0auKhTo=",
-      "requires": {
-        "dotenv": "^4.0.0",
-        "ethjs-abi": "^0.2.1"
-      }
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/zeppelin-solidity/-/zeppelin-solidity-1.12.0.tgz",
+      "integrity": "sha512-dgjPPnTmx14hAbTeOpTKemDeDCDdwglS0nquOAJG8h5o9zlb43FZafQSrMlIUUSp1EisDZfehrp5loGEYXHZBA=="
     }
   }
 }
diff --git a/test_apps/test_app/package.json b/test_apps/test_app/package.json
index 67be0ebc5..586d6be88 100644
--- a/test_apps/test_app/package.json
+++ b/test_apps/test_app/package.json
@@ -20,6 +20,6 @@
     "react": "^16.0.0",
     "react-bootstrap": "^0.32.0",
     "react-dom": "^16.2.0",
-    "zeppelin-solidity": "1.8.0"
+    "zeppelin-solidity": "1.12.0"
   }
 }
diff --git a/test_apps/test_app/test/http_contract_test.js b/test_apps/test_app/test/http_contract_test.js
index 98b2d34e3..67c350163 100644
--- a/test_apps/test_app/test/http_contract_test.js
+++ b/test_apps/test_app/test/http_contract_test.js
@@ -5,7 +5,7 @@ const assert = require('assert');
 describe('http contracts', () => {
 
   it('should have downloaded the file in .embark/contracts', (done) => {
-    const contractPath = '.embark/contracts/status-im/contracts/master/contracts/identity/Identity.sol';
+    const contractPath = '.embark/contracts/status-im/contracts/151-embark31/contracts/token/StandardToken.sol';
     fs.access(contractPath, (err) => {
       if (err) {
         assert.fail(contractPath + ' was not downloaded');
@@ -15,7 +15,7 @@ describe('http contracts', () => {
   });
 
   it('should have downloaded the file import file too', (done) => {
-    const contractImportPath = '.embark/contracts/status-im/contracts/master/contracts/identity/ERC725.sol';
+    const contractImportPath = '.embark/contracts/status-im/contracts/151-embark31/contracts/token/ERC20Token.sol';
     fs.access(contractImportPath, (err) => {
       if (err) {
         assert.fail(contractImportPath + ' was not downloaded');
diff --git a/test_apps/test_app/test/simple_storage_spec.js b/test_apps/test_app/test/simple_storage_spec.js
index eb5c46629..3ee31b10c 100644
--- a/test_apps/test_app/test/simple_storage_spec.js
+++ b/test_apps/test_app/test/simple_storage_spec.js
@@ -51,7 +51,7 @@ contract("SimpleStorage", function () {
       done(error);
     });
 
-    SimpleStorage.methods.set2(150, 100).send();
+    SimpleStorage.methods.set2(150).send();
   });
 
 });