diff --git a/simulators/ethereum/graphql/testcases/05_eth_estimateGas_noParams.json b/simulators/ethereum/graphql/testcases/05_eth_estimateGas_noParams.json
index bc72d4cf85..c36e86d557 100644
--- a/simulators/ethereum/graphql/testcases/05_eth_estimateGas_noParams.json
+++ b/simulators/ethereum/graphql/testcases/05_eth_estimateGas_noParams.json
@@ -7,6 +7,5 @@
       }
     }
   }],
-
   "statusCode": 200
 }
\ No newline at end of file
diff --git a/simulators/ethereum/graphql/testcases/08_eth_getBalance_0x19.json b/simulators/ethereum/graphql/testcases/08_eth_getBalance_0x19.json
index 0f914e57d4..6e17cfb97b 100644
--- a/simulators/ethereum/graphql/testcases/08_eth_getBalance_0x19.json
+++ b/simulators/ethereum/graphql/testcases/08_eth_getBalance_0x19.json
@@ -1,9 +1,11 @@
 {
-  "request": "{account(blockNumber:\"0x19\", address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { balance } }",
+  "request": "{block (number : 25) {account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { balance } }}",
   "responses": [{
-    "data" : {
-      "account" : {
-        "balance" : "0xfa"
+    "data": {
+      "block": {
+        "account": {
+          "balance": "0xfa"
+        }
       }
     }
   }],
diff --git a/simulators/ethereum/graphql/testcases/09_eth_getBalance_invalidAccountBlockNumber.json b/simulators/ethereum/graphql/testcases/09_eth_getBalance_invalidAccountBlockNumber.json
index 3b08d8f89b..3096a40b48 100644
--- a/simulators/ethereum/graphql/testcases/09_eth_getBalance_invalidAccountBlockNumber.json
+++ b/simulators/ethereum/graphql/testcases/09_eth_getBalance_invalidAccountBlockNumber.json
@@ -1,5 +1,5 @@
 {
-  "request": "{account(blockNumber:\"0x19\", address: \"0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef\") { balance } }",
+  "request": "{block (number: 25) {account(address: \"0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef\") { balance } }}",
   "responses": [{
     "data": {
       "account": {
@@ -9,4 +9,3 @@
   }],
   "statusCode": 200
 }
-
diff --git a/simulators/ethereum/graphql/testcases/10_eth_getBalance_invalidAccountLatest.json b/simulators/ethereum/graphql/testcases/10_eth_getBalance_invalidAccountLatest.json
index f1ac347f9b..bc80db1502 100644
--- a/simulators/ethereum/graphql/testcases/10_eth_getBalance_invalidAccountLatest.json
+++ b/simulators/ethereum/graphql/testcases/10_eth_getBalance_invalidAccountLatest.json
@@ -1,5 +1,5 @@
 {
-  "request": "{account(address: \"0xdeaff00ddeaff00ddeaff00ddeaff00ddeaff00d\") { balance } }",
+  "request": "{block{account(address: \"0xdeaff00ddeaff00ddeaff00ddeaff00ddeaff00d\") { balance } }}",
   "responses": [{
     "data": {
       "account": {
@@ -9,4 +9,3 @@
   }],
   "statusCode": 200
 }
-
diff --git a/simulators/ethereum/graphql/testcases/11_eth_getBalance_latest.json b/simulators/ethereum/graphql/testcases/11_eth_getBalance_latest.json
index 8edbd9e6cc..6dfdb27d9a 100644
--- a/simulators/ethereum/graphql/testcases/11_eth_getBalance_latest.json
+++ b/simulators/ethereum/graphql/testcases/11_eth_getBalance_latest.json
@@ -1,9 +1,11 @@
 {
-  "request": "{account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { balance } }",
+  "request": "{block{account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { balance } }}",
   "responses":[{
-    "data" : {
-      "account" : {
-        "balance" : "0x140"
+    "data": {
+      "block": {
+        "account": {
+          "balance": "0x140"
+        }
       }
     }
   }],
diff --git a/simulators/ethereum/graphql/testcases/12_eth_getBalance_toobig_bn.json b/simulators/ethereum/graphql/testcases/12_eth_getBalance_toobig_bn.json
index 93e24a71f9..39d4c98b00 100644
--- a/simulators/ethereum/graphql/testcases/12_eth_getBalance_toobig_bn.json
+++ b/simulators/ethereum/graphql/testcases/12_eth_getBalance_toobig_bn.json
@@ -1,5 +1,5 @@
 {
-  "request": "{account(blockNumber:\"0x21\", address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { balance } }",
+  "request": "{block (number: 33) {account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { balance } }}",
   "responses": [{
     "errors": [
       {
@@ -21,6 +21,11 @@
       }
     ],
     "data": null
+  },
+  {
+    "data": {
+      "block": null
+    }
   }],
   "statusCode": 400
 }
diff --git a/simulators/ethereum/graphql/testcases/13_eth_getBalance_without_addr.json b/simulators/ethereum/graphql/testcases/13_eth_getBalance_without_addr.json
index d5fb681658..54bb700d1c 100644
--- a/simulators/ethereum/graphql/testcases/13_eth_getBalance_without_addr.json
+++ b/simulators/ethereum/graphql/testcases/13_eth_getBalance_without_addr.json
@@ -1,5 +1,5 @@
 {
-  "request": "{account { balance } }",
+  "request": "{block{account { balance } }}",
   "responses": [{
     "errors": [
       {
diff --git a/simulators/ethereum/graphql/testcases/21_eth_getCode_noCode.json b/simulators/ethereum/graphql/testcases/21_eth_getCode_noCode.json
index f01b4065fb..f70d77d1d1 100644
--- a/simulators/ethereum/graphql/testcases/21_eth_getCode_noCode.json
+++ b/simulators/ethereum/graphql/testcases/21_eth_getCode_noCode.json
@@ -1,14 +1,14 @@
 {
-  "request" : "{ account(address: \"0x8888f1f195afa192cfee860698584c030f4c9db1\") { code } }",
+  "request" : "{block{ account(address: \"0x8888f1f195afa192cfee860698584c030f4c9db1\") { code } }}",
 
   "responses": [{
-    "data" : {
-      "account" :{
-          "code" :"0x"
+    "data": {
+      "block": {
+        "account": {
+          "code": "0x"
+        }
       }
     }
   }],
-
   "statusCode": 200
-  
 }
\ No newline at end of file
diff --git a/simulators/ethereum/graphql/testcases/22_eth_getCode.json b/simulators/ethereum/graphql/testcases/22_eth_getCode.json
index 45741f1cbf..e8babeb9bf 100644
--- a/simulators/ethereum/graphql/testcases/22_eth_getCode.json
+++ b/simulators/ethereum/graphql/testcases/22_eth_getCode.json
@@ -1,13 +1,14 @@
 {
-  "request" : "{ account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { code } }",
+  "request" : "{block{ account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { code } }}",
 
   "responses": [{
-    "data" : {
-      "account" :{
-          "code" :"0x6000357c010000000000000000000000000000000000000000000000000000000090048063102accc11461012c57806312a7b9141461013a5780631774e6461461014c5780631e26fd331461015d5780631f9030371461016e578063343a875d1461018057806338cc4831146101955780634e7ad367146101bd57806357cb2fc4146101cb57806365538c73146101e057806368895979146101ee57806376bc21d9146102005780639a19a9531461020e5780639dc2c8f51461021f578063a53b1c1e1461022d578063a67808571461023e578063b61c05031461024c578063c2b12a731461025a578063d2282dc51461026b578063e30081a01461027c578063e8beef5b1461028d578063f38b06001461029b578063f5b53e17146102a9578063fd408767146102bb57005b6101346104d6565b60006000f35b61014261039b565b8060005260206000f35b610157600435610326565b60006000f35b6101686004356102c9565b60006000f35b610176610442565b8060005260206000f35b6101886103d3565b8060ff1660005260206000f35b61019d610413565b8073ffffffffffffffffffffffffffffffffffffffff1660005260206000f35b6101c56104c5565b60006000f35b6101d36103b7565b8060000b60005260206000f35b6101e8610454565b60006000f35b6101f6610401565b8060005260206000f35b61020861051f565b60006000f35b6102196004356102e5565b60006000f35b610227610693565b60006000f35b610238600435610342565b60006000f35b610246610484565b60006000f35b610254610493565b60006000f35b61026560043561038d565b60006000f35b610276600435610350565b60006000f35b61028760043561035e565b60006000f35b6102956105b4565b60006000f35b6102a3610547565b60006000f35b6102b16103ef565b8060005260206000f35b6102c3610600565b60006000f35b80600060006101000a81548160ff021916908302179055505b50565b80600060016101000a81548160ff02191690837f01000000000000000000000000000000000000000000000000000000000000009081020402179055505b50565b80600060026101000a81548160ff021916908302179055505b50565b806001600050819055505b50565b806002600050819055505b50565b80600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908302179055505b50565b806004600050819055505b50565b6000600060009054906101000a900460ff1690506103b4565b90565b6000600060019054906101000a900460000b90506103d0565b90565b6000600060029054906101000a900460ff1690506103ec565b90565b600060016000505490506103fe565b90565b60006002600050549050610410565b90565b6000600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905061043f565b90565b60006004600050549050610451565b90565b7f65c9ac8011e286e89d02a269890f41d67ca2cc597b2c76c7c69321ff492be5806000602a81526020016000a15b565b6000602a81526020016000a05b565b60017f81933b308056e7e85668661dcd102b1f22795b4431f9cf4625794f381c271c6b6000602a81526020016000a25b565b60016000602a81526020016000a15b565b3373ffffffffffffffffffffffffffffffffffffffff1660017f0e216b62efbb97e751a2ce09f607048751720397ecfb9eef1e48a6644948985b6000602a81526020016000a35b565b3373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a25b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017f317b31292193c2a4f561cc40a95ea0d97a2733f14af6d6d59522473e1f3ae65f6000602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a35b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017fd5f0a30e4be0c6be577a71eceb7464245a796a7e6a55c0d971837b250de05f4e60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff16600160007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a35b56"
+    "data": {
+      "block": {
+        "account": {
+          "code": "0x6000357c010000000000000000000000000000000000000000000000000000000090048063102accc11461012c57806312a7b9141461013a5780631774e6461461014c5780631e26fd331461015d5780631f9030371461016e578063343a875d1461018057806338cc4831146101955780634e7ad367146101bd57806357cb2fc4146101cb57806365538c73146101e057806368895979146101ee57806376bc21d9146102005780639a19a9531461020e5780639dc2c8f51461021f578063a53b1c1e1461022d578063a67808571461023e578063b61c05031461024c578063c2b12a731461025a578063d2282dc51461026b578063e30081a01461027c578063e8beef5b1461028d578063f38b06001461029b578063f5b53e17146102a9578063fd408767146102bb57005b6101346104d6565b60006000f35b61014261039b565b8060005260206000f35b610157600435610326565b60006000f35b6101686004356102c9565b60006000f35b610176610442565b8060005260206000f35b6101886103d3565b8060ff1660005260206000f35b61019d610413565b8073ffffffffffffffffffffffffffffffffffffffff1660005260206000f35b6101c56104c5565b60006000f35b6101d36103b7565b8060000b60005260206000f35b6101e8610454565b60006000f35b6101f6610401565b8060005260206000f35b61020861051f565b60006000f35b6102196004356102e5565b60006000f35b610227610693565b60006000f35b610238600435610342565b60006000f35b610246610484565b60006000f35b610254610493565b60006000f35b61026560043561038d565b60006000f35b610276600435610350565b60006000f35b61028760043561035e565b60006000f35b6102956105b4565b60006000f35b6102a3610547565b60006000f35b6102b16103ef565b8060005260206000f35b6102c3610600565b60006000f35b80600060006101000a81548160ff021916908302179055505b50565b80600060016101000a81548160ff02191690837f01000000000000000000000000000000000000000000000000000000000000009081020402179055505b50565b80600060026101000a81548160ff021916908302179055505b50565b806001600050819055505b50565b806002600050819055505b50565b80600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908302179055505b50565b806004600050819055505b50565b6000600060009054906101000a900460ff1690506103b4565b90565b6000600060019054906101000a900460000b90506103d0565b90565b6000600060029054906101000a900460ff1690506103ec565b90565b600060016000505490506103fe565b90565b60006002600050549050610410565b90565b6000600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905061043f565b90565b60006004600050549050610451565b90565b7f65c9ac8011e286e89d02a269890f41d67ca2cc597b2c76c7c69321ff492be5806000602a81526020016000a15b565b6000602a81526020016000a05b565b60017f81933b308056e7e85668661dcd102b1f22795b4431f9cf4625794f381c271c6b6000602a81526020016000a25b565b60016000602a81526020016000a15b565b3373ffffffffffffffffffffffffffffffffffffffff1660017f0e216b62efbb97e751a2ce09f607048751720397ecfb9eef1e48a6644948985b6000602a81526020016000a35b565b3373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a25b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017f317b31292193c2a4f561cc40a95ea0d97a2733f14af6d6d59522473e1f3ae65f6000602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a35b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017fd5f0a30e4be0c6be577a71eceb7464245a796a7e6a55c0d971837b250de05f4e60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff16600160007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a35b56"
+        }
       }
     }
   }],
-
   "statusCode": 200
 }
\ No newline at end of file