diff --git a/simulators/ethereum/graphql/testcases/08_eth_getBalance_0x19.json b/simulators/ethereum/graphql/testcases/08_eth_getBalance_0x19.json
deleted file mode 100644
index 0f914e57d4..0000000000
--- a/simulators/ethereum/graphql/testcases/08_eth_getBalance_0x19.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "request": "{account(blockNumber:\"0x19\", address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { balance } }",
-  "responses": [{
-    "data" : {
-      "account" : {
-        "balance" : "0xfa"
-      }
-    }
-  }],
-  "statusCode": 200
-}
-
diff --git a/simulators/ethereum/graphql/testcases/14_eth_getBlock_byHash.json b/simulators/ethereum/graphql/testcases/08_eth_getBlock_byHash.json
similarity index 100%
rename from simulators/ethereum/graphql/testcases/14_eth_getBlock_byHash.json
rename to simulators/ethereum/graphql/testcases/08_eth_getBlock_byHash.json
diff --git a/simulators/ethereum/graphql/testcases/09_eth_getBalance_invalidAccountBlockNumber.json b/simulators/ethereum/graphql/testcases/09_eth_getBalance_invalidAccountBlockNumber.json
deleted file mode 100644
index 07583637e7..0000000000
--- a/simulators/ethereum/graphql/testcases/09_eth_getBalance_invalidAccountBlockNumber.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "request": "{account(blockNumber:\"0x19\", address: \"0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef\") { balance } }",
-  "responses": [{
-    "errors": [
-      {
-        "message": "Exception while fetching data (/account) : Account with address 0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef does not exist",
-        "locations": [
-          {
-            "line": 1,
-            "column": 2
-          }
-        ],
-        "path": [
-          "account"
-        ],
-        "extensions": {
-          "classification": "DataFetchingException"
-        }
-      }
-    ],
-    "data": null
-  }],
-  "statusCode": 400
-}
-
diff --git a/simulators/ethereum/graphql/testcases/15_eth_getBlock_byHashInvalid.json b/simulators/ethereum/graphql/testcases/09_eth_getBlock_byHashInvalid.json
similarity index 100%
rename from simulators/ethereum/graphql/testcases/15_eth_getBlock_byHashInvalid.json
rename to simulators/ethereum/graphql/testcases/09_eth_getBlock_byHashInvalid.json
diff --git a/simulators/ethereum/graphql/testcases/10_eth_getBalance_invalidAccountLatest.json b/simulators/ethereum/graphql/testcases/10_eth_getBalance_invalidAccountLatest.json
deleted file mode 100644
index cde5a9762e..0000000000
--- a/simulators/ethereum/graphql/testcases/10_eth_getBalance_invalidAccountLatest.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "request": "{account(address: \"0xdeaff00ddeaff00ddeaff00ddeaff00ddeaff00d\") { balance } }",
-  "responses": [{
-    "errors": [
-      {
-        "message": "Exception while fetching data (/account) : Account with address 0xdeaff00ddeaff00ddeaff00ddeaff00ddeaff00d does not exist",
-        "locations": [
-          {
-            "line": 1,
-            "column": 2
-          }
-        ],
-        "path": [
-          "account"
-        ],
-        "extensions": {
-          "classification": "DataFetchingException"
-        }
-      }
-    ],
-    "data": null
-  }],
-  "statusCode": 400
-}
-
diff --git a/simulators/ethereum/graphql/testcases/16_eth_getBlock_byNumber.json b/simulators/ethereum/graphql/testcases/10_eth_getBlock_byNumber.json
similarity index 100%
rename from simulators/ethereum/graphql/testcases/16_eth_getBlock_byNumber.json
rename to simulators/ethereum/graphql/testcases/10_eth_getBlock_byNumber.json
diff --git a/simulators/ethereum/graphql/testcases/11_eth_getBalance_latest.json b/simulators/ethereum/graphql/testcases/11_eth_getBalance_latest.json
deleted file mode 100644
index 8edbd9e6cc..0000000000
--- a/simulators/ethereum/graphql/testcases/11_eth_getBalance_latest.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "request": "{account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { balance } }",
-  "responses":[{
-    "data" : {
-      "account" : {
-        "balance" : "0x140"
-      }
-    }
-  }],
-  "statusCode": 200
-}
-
diff --git a/simulators/ethereum/graphql/testcases/17_eth_getBlock_byNumberInvalid.json b/simulators/ethereum/graphql/testcases/11_eth_getBlock_byNumberInvalid.json
similarity index 100%
rename from simulators/ethereum/graphql/testcases/17_eth_getBlock_byNumberInvalid.json
rename to simulators/ethereum/graphql/testcases/11_eth_getBlock_byNumberInvalid.json
diff --git a/simulators/ethereum/graphql/testcases/12_eth_getBalance_toobig_bn.json b/simulators/ethereum/graphql/testcases/12_eth_getBalance_toobig_bn.json
deleted file mode 100644
index 93e24a71f9..0000000000
--- a/simulators/ethereum/graphql/testcases/12_eth_getBalance_toobig_bn.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "request": "{account(blockNumber:\"0x21\", address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { balance } }",
-  "responses": [{
-    "errors": [
-      {
-        "message": "Exception while fetching data (/account) : Invalid params",
-        "locations": [
-          {
-            "line": 1,
-            "column": 2
-          }
-        ],
-        "path": [
-          "account"
-        ],
-        "extensions": {
-          "errorCode": -32602,
-          "errorMessage": "Invalid params",
-          "classification": "DataFetchingException"
-        }
-      }
-    ],
-    "data": null
-  }],
-  "statusCode": 400
-}
-
diff --git a/simulators/ethereum/graphql/testcases/18_eth_getBlock_wrongParams.json b/simulators/ethereum/graphql/testcases/12_eth_getBlock_wrongParams.json
similarity index 100%
rename from simulators/ethereum/graphql/testcases/18_eth_getBlock_wrongParams.json
rename to simulators/ethereum/graphql/testcases/12_eth_getBlock_wrongParams.json
diff --git a/simulators/ethereum/graphql/testcases/13_eth_getBalance_without_addr.json b/simulators/ethereum/graphql/testcases/13_eth_getBalance_without_addr.json
deleted file mode 100644
index d5fb681658..0000000000
--- a/simulators/ethereum/graphql/testcases/13_eth_getBalance_without_addr.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "request": "{account { balance } }",
-  "responses": [{
-    "errors": [
-      {
-        "message": "Validation error of type MissingFieldArgument: Missing field argument address @ 'account'",
-        "locations": [
-          {
-            "line": 1,
-            "column": 2
-          }
-        ],
-        "extensions": {
-          "classification": "ValidationError"
-        }
-      }
-    ]
-  }],
-  "statusCode": 400
-}
-
diff --git a/simulators/ethereum/graphql/testcases/19_eth_getBlockTransactionCount_byHash.json b/simulators/ethereum/graphql/testcases/13_eth_getBlockTransactionCount_byHash.json
similarity index 100%
rename from simulators/ethereum/graphql/testcases/19_eth_getBlockTransactionCount_byHash.json
rename to simulators/ethereum/graphql/testcases/13_eth_getBlockTransactionCount_byHash.json
diff --git a/simulators/ethereum/graphql/testcases/20_eth_getBlockTransactionCount_byNumber.json b/simulators/ethereum/graphql/testcases/14_eth_getBlockTransactionCount_byNumber.json
similarity index 100%
rename from simulators/ethereum/graphql/testcases/20_eth_getBlockTransactionCount_byNumber.json
rename to simulators/ethereum/graphql/testcases/14_eth_getBlockTransactionCount_byNumber.json
diff --git a/simulators/ethereum/graphql/testcases/23_eth_getLogs_matchTopic.json b/simulators/ethereum/graphql/testcases/15_eth_getLogs_matchTopic.json
similarity index 100%
rename from simulators/ethereum/graphql/testcases/23_eth_getLogs_matchTopic.json
rename to simulators/ethereum/graphql/testcases/15_eth_getLogs_matchTopic.json
diff --git a/simulators/ethereum/graphql/testcases/24_eth_getLogs_range.json b/simulators/ethereum/graphql/testcases/16_eth_getLogs_range.json
similarity index 100%
rename from simulators/ethereum/graphql/testcases/24_eth_getLogs_range.json
rename to simulators/ethereum/graphql/testcases/16_eth_getLogs_range.json
diff --git a/simulators/ethereum/graphql/testcases/27_eth_getTransaction_byBlockHashAndIndex.json b/simulators/ethereum/graphql/testcases/17_eth_getTransaction_byBlockHashAndIndex.json
similarity index 100%
rename from simulators/ethereum/graphql/testcases/27_eth_getTransaction_byBlockHashAndIndex.json
rename to simulators/ethereum/graphql/testcases/17_eth_getTransaction_byBlockHashAndIndex.json
diff --git a/simulators/ethereum/graphql/testcases/28_eth_getTransaction_byBlockNumberAndIndex.json b/simulators/ethereum/graphql/testcases/18_eth_getTransaction_byBlockNumberAndIndex.json
similarity index 100%
rename from simulators/ethereum/graphql/testcases/28_eth_getTransaction_byBlockNumberAndIndex.json
rename to simulators/ethereum/graphql/testcases/18_eth_getTransaction_byBlockNumberAndIndex.json
diff --git a/simulators/ethereum/graphql/testcases/29_eth_getTransaction_byBlockNumberAndInvalidIndex.json b/simulators/ethereum/graphql/testcases/19_eth_getTransaction_byBlockNumberAndInvalidIndex.json
similarity index 100%
rename from simulators/ethereum/graphql/testcases/29_eth_getTransaction_byBlockNumberAndInvalidIndex.json
rename to simulators/ethereum/graphql/testcases/19_eth_getTransaction_byBlockNumberAndInvalidIndex.json
diff --git a/simulators/ethereum/graphql/testcases/30_eth_getTransaction_byHash.json b/simulators/ethereum/graphql/testcases/20_eth_getTransaction_byHash.json
similarity index 100%
rename from simulators/ethereum/graphql/testcases/30_eth_getTransaction_byHash.json
rename to simulators/ethereum/graphql/testcases/20_eth_getTransaction_byHash.json
diff --git a/simulators/ethereum/graphql/testcases/21_eth_getCode_noCode.json b/simulators/ethereum/graphql/testcases/21_eth_getCode_noCode.json
deleted file mode 100644
index f01b4065fb..0000000000
--- a/simulators/ethereum/graphql/testcases/21_eth_getCode_noCode.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "request" : "{ account(address: \"0x8888f1f195afa192cfee860698584c030f4c9db1\") { code } }",
-
-  "responses": [{
-    "data" : {
-      "account" :{
-          "code" :"0x"
-      }
-    }
-  }],
-
-  "statusCode": 200
-  
-}
\ No newline at end of file
diff --git a/simulators/ethereum/graphql/testcases/31_eth_getTransaction_byHashNull.json b/simulators/ethereum/graphql/testcases/21_eth_getTransaction_byHashNull.json
similarity index 100%
rename from simulators/ethereum/graphql/testcases/31_eth_getTransaction_byHashNull.json
rename to simulators/ethereum/graphql/testcases/21_eth_getTransaction_byHashNull.json
diff --git a/simulators/ethereum/graphql/testcases/22_eth_getCode.json b/simulators/ethereum/graphql/testcases/22_eth_getCode.json
deleted file mode 100644
index 45741f1cbf..0000000000
--- a/simulators/ethereum/graphql/testcases/22_eth_getCode.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "request" : "{ account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { code } }",
-
-  "responses": [{
-    "data" : {
-      "account" :{
-          "code" :"0x6000357c010000000000000000000000000000000000000000000000000000000090048063102accc11461012c57806312a7b9141461013a5780631774e6461461014c5780631e26fd331461015d5780631f9030371461016e578063343a875d1461018057806338cc4831146101955780634e7ad367146101bd57806357cb2fc4146101cb57806365538c73146101e057806368895979146101ee57806376bc21d9146102005780639a19a9531461020e5780639dc2c8f51461021f578063a53b1c1e1461022d578063a67808571461023e578063b61c05031461024c578063c2b12a731461025a578063d2282dc51461026b578063e30081a01461027c578063e8beef5b1461028d578063f38b06001461029b578063f5b53e17146102a9578063fd408767146102bb57005b6101346104d6565b60006000f35b61014261039b565b8060005260206000f35b610157600435610326565b60006000f35b6101686004356102c9565b60006000f35b610176610442565b8060005260206000f35b6101886103d3565b8060ff1660005260206000f35b61019d610413565b8073ffffffffffffffffffffffffffffffffffffffff1660005260206000f35b6101c56104c5565b60006000f35b6101d36103b7565b8060000b60005260206000f35b6101e8610454565b60006000f35b6101f6610401565b8060005260206000f35b61020861051f565b60006000f35b6102196004356102e5565b60006000f35b610227610693565b60006000f35b610238600435610342565b60006000f35b610246610484565b60006000f35b610254610493565b60006000f35b61026560043561038d565b60006000f35b610276600435610350565b60006000f35b61028760043561035e565b60006000f35b6102956105b4565b60006000f35b6102a3610547565b60006000f35b6102b16103ef565b8060005260206000f35b6102c3610600565b60006000f35b80600060006101000a81548160ff021916908302179055505b50565b80600060016101000a81548160ff02191690837f01000000000000000000000000000000000000000000000000000000000000009081020402179055505b50565b80600060026101000a81548160ff021916908302179055505b50565b806001600050819055505b50565b806002600050819055505b50565b80600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908302179055505b50565b806004600050819055505b50565b6000600060009054906101000a900460ff1690506103b4565b90565b6000600060019054906101000a900460000b90506103d0565b90565b6000600060029054906101000a900460ff1690506103ec565b90565b600060016000505490506103fe565b90565b60006002600050549050610410565b90565b6000600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905061043f565b90565b60006004600050549050610451565b90565b7f65c9ac8011e286e89d02a269890f41d67ca2cc597b2c76c7c69321ff492be5806000602a81526020016000a15b565b6000602a81526020016000a05b565b60017f81933b308056e7e85668661dcd102b1f22795b4431f9cf4625794f381c271c6b6000602a81526020016000a25b565b60016000602a81526020016000a15b565b3373ffffffffffffffffffffffffffffffffffffffff1660017f0e216b62efbb97e751a2ce09f607048751720397ecfb9eef1e48a6644948985b6000602a81526020016000a35b565b3373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a25b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017f317b31292193c2a4f561cc40a95ea0d97a2733f14af6d6d59522473e1f3ae65f6000602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a35b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017fd5f0a30e4be0c6be577a71eceb7464245a796a7e6a55c0d971837b250de05f4e60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff16600160007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a35b56"
-      }
-    }
-  }],
-
-  "statusCode": 200
-}
\ No newline at end of file
diff --git a/simulators/ethereum/graphql/testcases/33_eth_getTransactionReceipt.json b/simulators/ethereum/graphql/testcases/22_eth_getTransactionReceipt.json
similarity index 100%
rename from simulators/ethereum/graphql/testcases/33_eth_getTransactionReceipt.json
rename to simulators/ethereum/graphql/testcases/22_eth_getTransactionReceipt.json
diff --git a/simulators/ethereum/graphql/testcases/34_eth_sendRawTransaction_contractCreation.json b/simulators/ethereum/graphql/testcases/23_eth_sendRawTransaction_contractCreation.json
similarity index 100%
rename from simulators/ethereum/graphql/testcases/34_eth_sendRawTransaction_contractCreation.json
rename to simulators/ethereum/graphql/testcases/23_eth_sendRawTransaction_contractCreation.json
diff --git a/simulators/ethereum/graphql/testcases/35_graphql_pending.json b/simulators/ethereum/graphql/testcases/24_graphql_pending.json
similarity index 100%
rename from simulators/ethereum/graphql/testcases/35_graphql_pending.json
rename to simulators/ethereum/graphql/testcases/24_graphql_pending.json
diff --git a/simulators/ethereum/graphql/testcases/25_eth_getStorageAt_illegalRangeGreaterThan.json b/simulators/ethereum/graphql/testcases/25_eth_getStorageAt_illegalRangeGreaterThan.json
deleted file mode 100644
index a440e32052..0000000000
--- a/simulators/ethereum/graphql/testcases/25_eth_getStorageAt_illegalRangeGreaterThan.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "request" :"{ account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { storage(slot: \"0x00000000000000000000000000000021\") } }",
-
-  "responses":[{
-    "data" : {
-      "account" : {
-        "storage" : "0x0000000000000000000000000000000000000000000000000000000000000000"
-      }
-    }
-  }],
-
-  "statusCode": 200
-}
\ No newline at end of file
diff --git a/simulators/ethereum/graphql/testcases/36_eth_sendRawTransaction_messageCall.json b/simulators/ethereum/graphql/testcases/25_eth_sendRawTransaction_messageCall.json
similarity index 100%
rename from simulators/ethereum/graphql/testcases/36_eth_sendRawTransaction_messageCall.json
rename to simulators/ethereum/graphql/testcases/25_eth_sendRawTransaction_messageCall.json
diff --git a/simulators/ethereum/graphql/testcases/26_eth_getStorageAt.json b/simulators/ethereum/graphql/testcases/26_eth_getStorageAt.json
deleted file mode 100644
index faa8f236cd..0000000000
--- a/simulators/ethereum/graphql/testcases/26_eth_getStorageAt.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "request" :"{ account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { storage(slot: \"0x00000000000000000000000000000004\") } }",
-
-  "responses": [{
-    "data" : {
-      "account" :{
-          "storage" :"0xaabbccffffffffffffffffffffffffffffffffffffffffffffffffffffffffee"
-      }
-    }
-  }],
-
-  "statusCode": 200
-}
\ No newline at end of file
diff --git a/simulators/ethereum/graphql/testcases/37_eth_sendRawTransaction_nonceTooLow.json b/simulators/ethereum/graphql/testcases/26_eth_sendRawTransaction_nonceTooLow.json
similarity index 100%
rename from simulators/ethereum/graphql/testcases/37_eth_sendRawTransaction_nonceTooLow.json
rename to simulators/ethereum/graphql/testcases/26_eth_sendRawTransaction_nonceTooLow.json
diff --git a/simulators/ethereum/graphql/testcases/38_eth_sendRawTransaction_transferEther.json b/simulators/ethereum/graphql/testcases/27_eth_sendRawTransaction_transferEther.json
similarity index 100%
rename from simulators/ethereum/graphql/testcases/38_eth_sendRawTransaction_transferEther.json
rename to simulators/ethereum/graphql/testcases/27_eth_sendRawTransaction_transferEther.json
diff --git a/simulators/ethereum/graphql/testcases/39_eth_sendRawTransaction_unsignedTransaction.json b/simulators/ethereum/graphql/testcases/28_eth_sendRawTransaction_unsignedTransaction.json
similarity index 100%
rename from simulators/ethereum/graphql/testcases/39_eth_sendRawTransaction_unsignedTransaction.json
rename to simulators/ethereum/graphql/testcases/28_eth_sendRawTransaction_unsignedTransaction.json
diff --git a/simulators/ethereum/graphql/testcases/40_eth_syncing.json b/simulators/ethereum/graphql/testcases/29_eth_syncing.json
similarity index 100%
rename from simulators/ethereum/graphql/testcases/40_eth_syncing.json
rename to simulators/ethereum/graphql/testcases/29_eth_syncing.json
diff --git a/simulators/ethereum/graphql/testcases/41_graphql_blocks_byFrom.json b/simulators/ethereum/graphql/testcases/30_graphql_blocks_byFrom.json
similarity index 100%
rename from simulators/ethereum/graphql/testcases/41_graphql_blocks_byFrom.json
rename to simulators/ethereum/graphql/testcases/30_graphql_blocks_byFrom.json
diff --git a/simulators/ethereum/graphql/testcases/42_graphql_blocks_byRange.json b/simulators/ethereum/graphql/testcases/31_graphql_blocks_byRange.json
similarity index 100%
rename from simulators/ethereum/graphql/testcases/42_graphql_blocks_byRange.json
rename to simulators/ethereum/graphql/testcases/31_graphql_blocks_byRange.json
diff --git a/simulators/ethereum/graphql/testcases/32_eth_getTransactionCount.json b/simulators/ethereum/graphql/testcases/32_eth_getTransactionCount.json
deleted file mode 100644
index 1283f72a77..0000000000
--- a/simulators/ethereum/graphql/testcases/32_eth_getTransactionCount.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "request" :"{ account(address: \"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\") { transactionCount } }",
-
-  "responses": [{
-    "data" : {
-      "account" :{
-          "transactionCount" : 32
-      }
-    }
-  }],
-
-  "statusCode": 200
-}
\ No newline at end of file
diff --git a/simulators/ethereum/graphql/testcases/43_graphql_blocks_byWrongRange.json b/simulators/ethereum/graphql/testcases/32_graphql_blocks_byWrongRange.json
similarity index 100%
rename from simulators/ethereum/graphql/testcases/43_graphql_blocks_byWrongRange.json
rename to simulators/ethereum/graphql/testcases/32_graphql_blocks_byWrongRange.json
diff --git a/simulators/ethereum/graphql/testcases/44_graphql_tooComplex.json b/simulators/ethereum/graphql/testcases/33_graphql_tooComplex.json
similarity index 100%
rename from simulators/ethereum/graphql/testcases/44_graphql_tooComplex.json
rename to simulators/ethereum/graphql/testcases/33_graphql_tooComplex.json
diff --git a/simulators/ethereum/graphql/testcases/45_graphql_tooComplexSchema.json b/simulators/ethereum/graphql/testcases/34_graphql_tooComplexSchema.json
similarity index 100%
rename from simulators/ethereum/graphql/testcases/45_graphql_tooComplexSchema.json
rename to simulators/ethereum/graphql/testcases/34_graphql_tooComplexSchema.json