diff --git a/tests/bad.rlp b/tests/bad.rlp
index a95f76f31..db4f15716 100644
Binary files a/tests/bad.rlp and b/tests/bad.rlp differ
diff --git a/tests/chain.rlp b/tests/chain.rlp
index 05c1080d7..910ada576 100644
Binary files a/tests/chain.rlp and b/tests/chain.rlp differ
diff --git a/tests/debug_getRawBlock/get-block-n.io b/tests/debug_getRawBlock/get-block-n.io
index 97c88b208..d182b0840 100644
--- a/tests/debug_getRawBlock/get-block-n.io
+++ b/tests/debug_getRawBlock/get-block-n.io
@@ -1,2 +1,2 @@
->> {"jsonrpc":"2.0","id":5,"method":"debug_getRawBlock","params":["0x3"]}
-<< {"jsonrpc":"2.0","id":5,"result":"0xf90269f901faa087a74234d5ad70c6ff8e89ffd305fa85048e6cbb4045d66b43a7bf03fe9b6171a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a09ba750cfccbb3e45e010229e805d1d854befeb2701745e93f975dbc965f737a5a0d911c25e97e27898680d242b7780b6faef30995c355a2d5de92e6b9a7212ad3aa0056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000003834c4b408252081e80a00b43d19e6220dd7b4e8018a5046283377354ab021f49cdd082dfe167c86502fe8836a52bdb03334a2d842806be9df869f86702842806be9e82520894658bdf435d810c91414ec09147daa6db624063798203e880820a95a040ce7918eeb045ebf8c8b1887ca139d076bda00fa828a07881d442a72626c42da0156576a68e456e295e4c9cf67cf9f53151f329438916e0f24fc69d6bbb7fbacfc0"}
+>> {"jsonrpc":"2.0","id":36,"method":"debug_getRawBlock","params":["0x3"]}
+<< {"jsonrpc":"2.0","id":36,"result":"0xf90269f901faa0feffbee8fafd9860e744ac88ffb4f12752de7ccd86c2fb301c82c510b2ccd32ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a09ba750cfccbb3e45e010229e805d1d854befeb2701745e93f975dbc965f737a5a0d911c25e97e27898680d242b7780b6faef30995c355a2d5de92e6b9a7212ad3aa0056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000003834c4b408252081e80a0caec67d309990cc864a25cd5f983bb9128cd7ac06704ff1be433be73b0c7ccf0887c090d4e8d3d4a6b842806be9df869f86702842806be9e82520894658bdf435d810c91414ec09147daa6db624063798203e880820a95a040ce7918eeb045ebf8c8b1887ca139d076bda00fa828a07881d442a72626c42da0156576a68e456e295e4c9cf67cf9f53151f329438916e0f24fc69d6bbb7fbacfc0"}
diff --git a/tests/debug_getRawBlock/get-genesis.io b/tests/debug_getRawBlock/get-genesis.io
index 1e1e77ddc..6845698d8 100644
--- a/tests/debug_getRawBlock/get-genesis.io
+++ b/tests/debug_getRawBlock/get-genesis.io
@@ -1,2 +1,2 @@
->> {"jsonrpc":"2.0","id":4,"method":"debug_getRawBlock","params":["0x0"]}
-<< {"jsonrpc":"2.0","id":4,"result":"0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a0078dc6061b1d8eaa8493384b59c9c65ceb917201221d08b80c4de6770b6ec7e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000180834c4b40808080a00000000000000000000000000000000000000000000000000000000000000000880000000000000000843b9aca00c0c0"}
+>> {"jsonrpc":"2.0","id":35,"method":"debug_getRawBlock","params":["0x0"]}
+<< {"jsonrpc":"2.0","id":35,"result":"0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a0078dc6061b1d8eaa8493384b59c9c65ceb917201221d08b80c4de6770b6ec7e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000180834c4b40808080a00000000000000000000000000000000000000000000000000000000000000000880000000000000000843b9aca00c0c0"}
diff --git a/tests/debug_getRawBlock/get-invalid-number.io b/tests/debug_getRawBlock/get-invalid-number.io
index 3ccc1709a..921ce7060 100644
--- a/tests/debug_getRawBlock/get-invalid-number.io
+++ b/tests/debug_getRawBlock/get-invalid-number.io
@@ -1,2 +1,2 @@
->> {"jsonrpc":"2.0","id":6,"method":"debug_getRawBlock","params":["2"]}
-<< {"jsonrpc":"2.0","id":6,"error":{"code":-32602,"message":"invalid argument 0: hex string without 0x prefix"}}
+>> {"jsonrpc":"2.0","id":37,"method":"debug_getRawBlock","params":["2"]}
+<< {"jsonrpc":"2.0","id":37,"error":{"code":-32602,"message":"invalid argument 0: hex string without 0x prefix"}}
diff --git a/tests/debug_getRawHeader/get-block-n.io b/tests/debug_getRawHeader/get-block-n.io
index 08abc4443..ede47c4ac 100644
--- a/tests/debug_getRawHeader/get-block-n.io
+++ b/tests/debug_getRawHeader/get-block-n.io
@@ -1,2 +1,2 @@
->> {"jsonrpc":"2.0","id":2,"method":"debug_getRawHeader","params":["0x3"]}
-<< {"jsonrpc":"2.0","id":2,"result":"0xf901faa087a74234d5ad70c6ff8e89ffd305fa85048e6cbb4045d66b43a7bf03fe9b6171a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a09ba750cfccbb3e45e010229e805d1d854befeb2701745e93f975dbc965f737a5a0d911c25e97e27898680d242b7780b6faef30995c355a2d5de92e6b9a7212ad3aa0056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000003834c4b408252081e80a00b43d19e6220dd7b4e8018a5046283377354ab021f49cdd082dfe167c86502fe8836a52bdb03334a2d842806be9d"}
+>> {"jsonrpc":"2.0","id":33,"method":"debug_getRawHeader","params":["0x3"]}
+<< {"jsonrpc":"2.0","id":33,"result":"0xf901faa0feffbee8fafd9860e744ac88ffb4f12752de7ccd86c2fb301c82c510b2ccd32ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a09ba750cfccbb3e45e010229e805d1d854befeb2701745e93f975dbc965f737a5a0d911c25e97e27898680d242b7780b6faef30995c355a2d5de92e6b9a7212ad3aa0056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000003834c4b408252081e80a0caec67d309990cc864a25cd5f983bb9128cd7ac06704ff1be433be73b0c7ccf0887c090d4e8d3d4a6b842806be9d"}
diff --git a/tests/debug_getRawHeader/get-genesis.io b/tests/debug_getRawHeader/get-genesis.io
index e036fe584..c9d153553 100644
--- a/tests/debug_getRawHeader/get-genesis.io
+++ b/tests/debug_getRawHeader/get-genesis.io
@@ -1,2 +1,2 @@
->> {"jsonrpc":"2.0","id":1,"method":"debug_getRawHeader","params":["0x0"]}
-<< {"jsonrpc":"2.0","id":1,"result":"0xf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a0078dc6061b1d8eaa8493384b59c9c65ceb917201221d08b80c4de6770b6ec7e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000180834c4b40808080a00000000000000000000000000000000000000000000000000000000000000000880000000000000000843b9aca00"}
+>> {"jsonrpc":"2.0","id":32,"method":"debug_getRawHeader","params":["0x0"]}
+<< {"jsonrpc":"2.0","id":32,"result":"0xf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a0078dc6061b1d8eaa8493384b59c9c65ceb917201221d08b80c4de6770b6ec7e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000180834c4b40808080a00000000000000000000000000000000000000000000000000000000000000000880000000000000000843b9aca00"}
diff --git a/tests/debug_getRawHeader/get-invalid-number.io b/tests/debug_getRawHeader/get-invalid-number.io
index 9b5efa078..ba29021ee 100644
--- a/tests/debug_getRawHeader/get-invalid-number.io
+++ b/tests/debug_getRawHeader/get-invalid-number.io
@@ -1,2 +1,2 @@
->> {"jsonrpc":"2.0","id":3,"method":"debug_getRawHeader","params":["2"]}
-<< {"jsonrpc":"2.0","id":3,"error":{"code":-32602,"message":"invalid argument 0: hex string without 0x prefix"}}
+>> {"jsonrpc":"2.0","id":34,"method":"debug_getRawHeader","params":["2"]}
+<< {"jsonrpc":"2.0","id":34,"error":{"code":-32602,"message":"invalid argument 0: hex string without 0x prefix"}}
diff --git a/tests/debug_getRawReceipts/get-block-n.io b/tests/debug_getRawReceipts/get-block-n.io
index e828aa06a..9a309a254 100644
--- a/tests/debug_getRawReceipts/get-block-n.io
+++ b/tests/debug_getRawReceipts/get-block-n.io
@@ -1,2 +1,2 @@
->> {"jsonrpc":"2.0","id":8,"method":"debug_getRawReceipts","params":["0x3"]}
-<< {"jsonrpc":"2.0","id":8,"result":["0xf9010801825208b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0"]}
+>> {"jsonrpc":"2.0","id":39,"method":"debug_getRawReceipts","params":["0x3"]}
+<< {"jsonrpc":"2.0","id":39,"result":["0xf9010801825208b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0"]}
diff --git a/tests/debug_getRawReceipts/get-genesis.io b/tests/debug_getRawReceipts/get-genesis.io
index b41282c1b..d5bc1850a 100644
--- a/tests/debug_getRawReceipts/get-genesis.io
+++ b/tests/debug_getRawReceipts/get-genesis.io
@@ -1,2 +1,2 @@
->> {"jsonrpc":"2.0","id":7,"method":"debug_getRawReceipts","params":["0x0"]}
-<< {"jsonrpc":"2.0","id":7,"result":[]}
+>> {"jsonrpc":"2.0","id":38,"method":"debug_getRawReceipts","params":["0x0"]}
+<< {"jsonrpc":"2.0","id":38,"result":[]}
diff --git a/tests/debug_getRawReceipts/get-invalid-number.io b/tests/debug_getRawReceipts/get-invalid-number.io
index a49745db5..162f60f6f 100644
--- a/tests/debug_getRawReceipts/get-invalid-number.io
+++ b/tests/debug_getRawReceipts/get-invalid-number.io
@@ -1,2 +1,2 @@
->> {"jsonrpc":"2.0","id":9,"method":"debug_getRawReceipts","params":["2"]}
-<< {"jsonrpc":"2.0","id":9,"error":{"code":-32602,"message":"invalid argument 0: hex string without 0x prefix"}}
+>> {"jsonrpc":"2.0","id":40,"method":"debug_getRawReceipts","params":["2"]}
+<< {"jsonrpc":"2.0","id":40,"error":{"code":-32602,"message":"invalid argument 0: hex string without 0x prefix"}}
diff --git a/tests/debug_getRawTransaction/get-invalid-hash.io b/tests/debug_getRawTransaction/get-invalid-hash.io
index e2c46e7ca..938d8476b 100644
--- a/tests/debug_getRawTransaction/get-invalid-hash.io
+++ b/tests/debug_getRawTransaction/get-invalid-hash.io
@@ -1,2 +1,2 @@
->> {"jsonrpc":"2.0","id":11,"method":"debug_getRawTransaction","params":["1000000000000000000000000000000000000000000000000000000000000001"]}
-<< {"jsonrpc":"2.0","id":11,"error":{"code":-32602,"message":"invalid argument 0: json: cannot unmarshal hex string without 0x prefix into Go value of type common.Hash"}}
+>> {"jsonrpc":"2.0","id":42,"method":"debug_getRawTransaction","params":["1000000000000000000000000000000000000000000000000000000000000001"]}
+<< {"jsonrpc":"2.0","id":42,"error":{"code":-32602,"message":"invalid argument 0: json: cannot unmarshal hex string without 0x prefix into Go value of type common.Hash"}}
diff --git a/tests/debug_getRawTransaction/get-tx.io b/tests/debug_getRawTransaction/get-tx.io
index a5f27d48a..5e7046c3e 100644
--- a/tests/debug_getRawTransaction/get-tx.io
+++ b/tests/debug_getRawTransaction/get-tx.io
@@ -1,2 +1,2 @@
->> {"jsonrpc":"2.0","id":10,"method":"debug_getRawTransaction","params":["0x74e41d593675913d6d5521f46523f1bd396dff1891bdb35f59be47c7e5e0b34b"]}
-<< {"jsonrpc":"2.0","id":10,"result":"0xf8678084342770c182520894658bdf435d810c91414ec09147daa6db624063798203e880820a95a0af5fc351b9e457a31f37c84e5cd99dd3c5de60af3de33c6f4160177a2c786a60a0201da7a21046af55837330a2c52fc1543cd4d9ead00ddf178dd96935b607ff9b"}
+>> {"jsonrpc":"2.0","id":41,"method":"debug_getRawTransaction","params":["0x74e41d593675913d6d5521f46523f1bd396dff1891bdb35f59be47c7e5e0b34b"]}
+<< {"jsonrpc":"2.0","id":41,"result":"0xf8678084342770c182520894658bdf435d810c91414ec09147daa6db624063798203e880820a95a0af5fc351b9e457a31f37c84e5cd99dd3c5de60af3de33c6f4160177a2c786a60a0201da7a21046af55837330a2c52fc1543cd4d9ead00ddf178dd96935b607ff9b"}
diff --git a/tests/eth_getBlockByHash/get-block-by-hash.io b/tests/eth_getBlockByHash/get-block-by-hash.io
index 809116f91..7ee9d7b0c 100644
--- a/tests/eth_getBlockByHash/get-block-by-hash.io
+++ b/tests/eth_getBlockByHash/get-block-by-hash.io
@@ -1,2 +1,2 @@
->> {"jsonrpc":"2.0","id":8,"method":"eth_getBlockByHash","params":["0x2ce0e9a8a0b33d45aeb70cf6878d2943deddcf6600e06b84546eaf0a0d2b9643",true]}
-<< {"jsonrpc":"2.0","id":8,"result":{"baseFeePerGas":"0x342770c0","difficulty":"0x20000","extraData":"0x","gasLimit":"0x4c4b40","gasUsed":"0x5208","hash":"0x2ce0e9a8a0b33d45aeb70cf6878d2943deddcf6600e06b84546eaf0a0d2b9643","logsBloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","miner":"0x0000000000000000000000000000000000000000","mixHash":"0x69622859e6e7bd03539f68f5c57e6f14dbe512bce677e7fb98714c4304311474","nonce":"0x6655e60a527a3296","number":"0x1","parentHash":"0x33ed456e4ddc943a66d74940bcb732efac73c36c5252fe7883a05099acb9b612","receiptsRoot":"0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2","sha3Uncles":"0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347","size":"0x26c","stateRoot":"0x736513536b89969cfe91e2f4bb88bc90f811547b03dd49bd852a143ac19ef403","timestamp":"0xa","totalDifficulty":"0x20001","transactions":[{"blockHash":"0x2ce0e9a8a0b33d45aeb70cf6878d2943deddcf6600e06b84546eaf0a0d2b9643","blockNumber":"0x1","from":"0x658bdf435d810c91414ec09147daa6db62406379","gas":"0x5208","gasPrice":"0x342770c1","hash":"0x74e41d593675913d6d5521f46523f1bd396dff1891bdb35f59be47c7e5e0b34b","input":"0x","nonce":"0x0","to":"0x658bdf435d810c91414ec09147daa6db62406379","transactionIndex":"0x0","value":"0x3e8","type":"0x0","chainId":"0x539","v":"0xa95","r":"0xaf5fc351b9e457a31f37c84e5cd99dd3c5de60af3de33c6f4160177a2c786a60","s":"0x201da7a21046af55837330a2c52fc1543cd4d9ead00ddf178dd96935b607ff9b"}],"transactionsRoot":"0xbf06cffa242d5b5d567567b318fc73c54364a73827ab4cdbca7a9db1c788581a","uncles":[]}}
+>> {"jsonrpc":"2.0","id":8,"method":"eth_getBlockByHash","params":["0x0c5761302ec071b5c04130bf2c8c9167fe8f2efeb756c47d0f44eff683e1203e",true]}
+<< {"jsonrpc":"2.0","id":8,"result":{"baseFeePerGas":"0x342770c0","difficulty":"0x20000","extraData":"0x","gasLimit":"0x4c4b40","gasUsed":"0x5208","hash":"0x0c5761302ec071b5c04130bf2c8c9167fe8f2efeb756c47d0f44eff683e1203e","logsBloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","miner":"0x0000000000000000000000000000000000000000","mixHash":"0xecfb7963e456e8c5adcaa1aa06505b6ba3108606e5bfdc60f6d4bc28d76ae342","nonce":"0x135e7c203367ef58","number":"0x1","parentHash":"0x33ed456e4ddc943a66d74940bcb732efac73c36c5252fe7883a05099acb9b612","receiptsRoot":"0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2","sha3Uncles":"0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347","size":"0x26c","stateRoot":"0x736513536b89969cfe91e2f4bb88bc90f811547b03dd49bd852a143ac19ef403","timestamp":"0xa","totalDifficulty":"0x20001","transactions":[{"blockHash":"0x0c5761302ec071b5c04130bf2c8c9167fe8f2efeb756c47d0f44eff683e1203e","blockNumber":"0x1","from":"0x658bdf435d810c91414ec09147daa6db62406379","gas":"0x5208","gasPrice":"0x342770c1","hash":"0x74e41d593675913d6d5521f46523f1bd396dff1891bdb35f59be47c7e5e0b34b","input":"0x","nonce":"0x0","to":"0x658bdf435d810c91414ec09147daa6db62406379","transactionIndex":"0x0","value":"0x3e8","type":"0x0","chainId":"0x539","v":"0xa95","r":"0xaf5fc351b9e457a31f37c84e5cd99dd3c5de60af3de33c6f4160177a2c786a60","s":"0x201da7a21046af55837330a2c52fc1543cd4d9ead00ddf178dd96935b607ff9b"}],"transactionsRoot":"0xbf06cffa242d5b5d567567b318fc73c54364a73827ab4cdbca7a9db1c788581a","uncles":[]}}
diff --git a/tests/eth_getBlockByNumber/get-block-n.io b/tests/eth_getBlockByNumber/get-block-n.io
index acd791240..7e51cbcd9 100644
--- a/tests/eth_getBlockByNumber/get-block-n.io
+++ b/tests/eth_getBlockByNumber/get-block-n.io
@@ -1,2 +1,2 @@
 >> {"jsonrpc":"2.0","id":3,"method":"eth_getBlockByNumber","params":["0x2",true]}
-<< {"jsonrpc":"2.0","id":3,"result":{"baseFeePerGas":"0x2db08786","difficulty":"0x20000","extraData":"0x","gasLimit":"0x4c4b40","gasUsed":"0x5208","hash":"0x87a74234d5ad70c6ff8e89ffd305fa85048e6cbb4045d66b43a7bf03fe9b6171","logsBloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","miner":"0x0000000000000000000000000000000000000000","mixHash":"0x366d9e5ab9541818b45948337ee95fd917305c71ff1302f4d2d183c1130ad4f3","nonce":"0x5169f3e55ee36f17","number":"0x2","parentHash":"0x2ce0e9a8a0b33d45aeb70cf6878d2943deddcf6600e06b84546eaf0a0d2b9643","receiptsRoot":"0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2","sha3Uncles":"0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347","size":"0x26c","stateRoot":"0x0d91e75ce2a0800eb000c3f9e3b4ccda818f9430f704ff1379070ac49890fd94","timestamp":"0x14","totalDifficulty":"0x40001","transactions":[{"blockHash":"0x87a74234d5ad70c6ff8e89ffd305fa85048e6cbb4045d66b43a7bf03fe9b6171","blockNumber":"0x2","from":"0x658bdf435d810c91414ec09147daa6db62406379","gas":"0x5208","gasPrice":"0x2db08787","hash":"0x0d9ba049a158972e7fc1066122ceb31e431483ebf84f90f845f02e326942d467","input":"0x","nonce":"0x1","to":"0x658bdf435d810c91414ec09147daa6db62406379","transactionIndex":"0x0","value":"0x3e8","type":"0x0","chainId":"0x539","v":"0xa95","r":"0x52a6f622013359249316f4c017a67bc2c659f513dac5efea43a84b6ce4e462b1","s":"0x55ba2a779eaf62efa7d641a32ea329faabf9f097d376e2e400115a5151b9470"}],"transactionsRoot":"0x14488a14ae59174bedee90344854fb9b6a308143ce4bf688c00f2e81a9aae2a3","uncles":[]}}
+<< {"jsonrpc":"2.0","id":3,"result":{"baseFeePerGas":"0x2db08786","difficulty":"0x20000","extraData":"0x","gasLimit":"0x4c4b40","gasUsed":"0x5208","hash":"0xfeffbee8fafd9860e744ac88ffb4f12752de7ccd86c2fb301c82c510b2ccd32c","logsBloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","miner":"0x0000000000000000000000000000000000000000","mixHash":"0x1dcc535b05312f58571c4f65665aed42212ad9ee4c3b7ff53df8a5c1dac00a51","nonce":"0x1fee83885de75115","number":"0x2","parentHash":"0x0c5761302ec071b5c04130bf2c8c9167fe8f2efeb756c47d0f44eff683e1203e","receiptsRoot":"0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2","sha3Uncles":"0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347","size":"0x26c","stateRoot":"0x0d91e75ce2a0800eb000c3f9e3b4ccda818f9430f704ff1379070ac49890fd94","timestamp":"0x14","totalDifficulty":"0x40001","transactions":[{"blockHash":"0xfeffbee8fafd9860e744ac88ffb4f12752de7ccd86c2fb301c82c510b2ccd32c","blockNumber":"0x2","from":"0x658bdf435d810c91414ec09147daa6db62406379","gas":"0x5208","gasPrice":"0x2db08787","hash":"0x0d9ba049a158972e7fc1066122ceb31e431483ebf84f90f845f02e326942d467","input":"0x","nonce":"0x1","to":"0x658bdf435d810c91414ec09147daa6db62406379","transactionIndex":"0x0","value":"0x3e8","type":"0x0","chainId":"0x539","v":"0xa95","r":"0x52a6f622013359249316f4c017a67bc2c659f513dac5efea43a84b6ce4e462b1","s":"0x55ba2a779eaf62efa7d641a32ea329faabf9f097d376e2e400115a5151b9470"}],"transactionsRoot":"0x14488a14ae59174bedee90344854fb9b6a308143ce4bf688c00f2e81a9aae2a3","uncles":[]}}
diff --git a/tests/eth_getBlockTransactionCountByHash/get-block-n.io b/tests/eth_getBlockTransactionCountByHash/get-block-n.io
index 78ee2844e..dcee6eb1e 100644
--- a/tests/eth_getBlockTransactionCountByHash/get-block-n.io
+++ b/tests/eth_getBlockTransactionCountByHash/get-block-n.io
@@ -1,2 +1,2 @@
->> {"jsonrpc":"2.0","id":21,"method":"eth_getBlockTransactionCountByHash","params":["0x87a74234d5ad70c6ff8e89ffd305fa85048e6cbb4045d66b43a7bf03fe9b6171"]}
+>> {"jsonrpc":"2.0","id":21,"method":"eth_getBlockTransactionCountByHash","params":["0xfeffbee8fafd9860e744ac88ffb4f12752de7ccd86c2fb301c82c510b2ccd32c"]}
 << {"jsonrpc":"2.0","id":21,"result":"0x1"}
diff --git a/tests/eth_getTransactionByBlockHashAndIndex/get-block-n.io b/tests/eth_getTransactionByBlockHashAndIndex/get-block-n.io
index 669ed2098..5964cd0c5 100644
--- a/tests/eth_getTransactionByBlockHashAndIndex/get-block-n.io
+++ b/tests/eth_getTransactionByBlockHashAndIndex/get-block-n.io
@@ -1,2 +1,2 @@
->> {"jsonrpc":"2.0","id":23,"method":"eth_getTransactionByBlockHashAndIndex","params":["0x87a74234d5ad70c6ff8e89ffd305fa85048e6cbb4045d66b43a7bf03fe9b6171","0x0"]}
-<< {"jsonrpc":"2.0","id":23,"result":{"blockHash":"0x87a74234d5ad70c6ff8e89ffd305fa85048e6cbb4045d66b43a7bf03fe9b6171","blockNumber":"0x2","from":"0x658bdf435d810c91414ec09147daa6db62406379","gas":"0x5208","gasPrice":"0x2db08787","hash":"0x0d9ba049a158972e7fc1066122ceb31e431483ebf84f90f845f02e326942d467","input":"0x","nonce":"0x1","to":"0x658bdf435d810c91414ec09147daa6db62406379","transactionIndex":"0x0","value":"0x3e8","type":"0x0","chainId":"0x539","v":"0xa95","r":"0x52a6f622013359249316f4c017a67bc2c659f513dac5efea43a84b6ce4e462b1","s":"0x55ba2a779eaf62efa7d641a32ea329faabf9f097d376e2e400115a5151b9470"}}
+>> {"jsonrpc":"2.0","id":23,"method":"eth_getTransactionByBlockHashAndIndex","params":["0xfeffbee8fafd9860e744ac88ffb4f12752de7ccd86c2fb301c82c510b2ccd32c","0x0"]}
+<< {"jsonrpc":"2.0","id":23,"result":{"blockHash":"0xfeffbee8fafd9860e744ac88ffb4f12752de7ccd86c2fb301c82c510b2ccd32c","blockNumber":"0x2","from":"0x658bdf435d810c91414ec09147daa6db62406379","gas":"0x5208","gasPrice":"0x2db08787","hash":"0x0d9ba049a158972e7fc1066122ceb31e431483ebf84f90f845f02e326942d467","input":"0x","nonce":"0x1","to":"0x658bdf435d810c91414ec09147daa6db62406379","transactionIndex":"0x0","value":"0x3e8","type":"0x0","chainId":"0x539","v":"0xa95","r":"0x52a6f622013359249316f4c017a67bc2c659f513dac5efea43a84b6ce4e462b1","s":"0x55ba2a779eaf62efa7d641a32ea329faabf9f097d376e2e400115a5151b9470"}}
diff --git a/tests/eth_getTransactionByBlockNumberAndIndex/get-block-n.io b/tests/eth_getTransactionByBlockNumberAndIndex/get-block-n.io
index a8f360408..44395532a 100644
--- a/tests/eth_getTransactionByBlockNumberAndIndex/get-block-n.io
+++ b/tests/eth_getTransactionByBlockNumberAndIndex/get-block-n.io
@@ -1,2 +1,2 @@
 >> {"jsonrpc":"2.0","id":22,"method":"eth_getTransactionByBlockNumberAndIndex","params":["0x2","0x0"]}
-<< {"jsonrpc":"2.0","id":22,"result":{"blockHash":"0x87a74234d5ad70c6ff8e89ffd305fa85048e6cbb4045d66b43a7bf03fe9b6171","blockNumber":"0x2","from":"0x658bdf435d810c91414ec09147daa6db62406379","gas":"0x5208","gasPrice":"0x2db08787","hash":"0x0d9ba049a158972e7fc1066122ceb31e431483ebf84f90f845f02e326942d467","input":"0x","nonce":"0x1","to":"0x658bdf435d810c91414ec09147daa6db62406379","transactionIndex":"0x0","value":"0x3e8","type":"0x0","chainId":"0x539","v":"0xa95","r":"0x52a6f622013359249316f4c017a67bc2c659f513dac5efea43a84b6ce4e462b1","s":"0x55ba2a779eaf62efa7d641a32ea329faabf9f097d376e2e400115a5151b9470"}}
+<< {"jsonrpc":"2.0","id":22,"result":{"blockHash":"0xfeffbee8fafd9860e744ac88ffb4f12752de7ccd86c2fb301c82c510b2ccd32c","blockNumber":"0x2","from":"0x658bdf435d810c91414ec09147daa6db62406379","gas":"0x5208","gasPrice":"0x2db08787","hash":"0x0d9ba049a158972e7fc1066122ceb31e431483ebf84f90f845f02e326942d467","input":"0x","nonce":"0x1","to":"0x658bdf435d810c91414ec09147daa6db62406379","transactionIndex":"0x0","value":"0x3e8","type":"0x0","chainId":"0x539","v":"0xa95","r":"0x52a6f622013359249316f4c017a67bc2c659f513dac5efea43a84b6ce4e462b1","s":"0x55ba2a779eaf62efa7d641a32ea329faabf9f097d376e2e400115a5151b9470"}}
diff --git a/tests/eth_getTransactionByHash/get-legacy-tx.io b/tests/eth_getTransactionByHash/get-legacy-tx.io
index 1cdae41d5..1328df93c 100644
--- a/tests/eth_getTransactionByHash/get-legacy-tx.io
+++ b/tests/eth_getTransactionByHash/get-legacy-tx.io
@@ -1,2 +1,2 @@
 >> {"jsonrpc":"2.0","id":25,"method":"eth_getTransactionByHash","params":["0x0d9ba049a158972e7fc1066122ceb31e431483ebf84f90f845f02e326942d467"]}
-<< {"jsonrpc":"2.0","id":25,"result":{"blockHash":"0x87a74234d5ad70c6ff8e89ffd305fa85048e6cbb4045d66b43a7bf03fe9b6171","blockNumber":"0x2","from":"0x658bdf435d810c91414ec09147daa6db62406379","gas":"0x5208","gasPrice":"0x2db08787","hash":"0x0d9ba049a158972e7fc1066122ceb31e431483ebf84f90f845f02e326942d467","input":"0x","nonce":"0x1","to":"0x658bdf435d810c91414ec09147daa6db62406379","transactionIndex":"0x0","value":"0x3e8","type":"0x0","chainId":"0x539","v":"0xa95","r":"0x52a6f622013359249316f4c017a67bc2c659f513dac5efea43a84b6ce4e462b1","s":"0x55ba2a779eaf62efa7d641a32ea329faabf9f097d376e2e400115a5151b9470"}}
+<< {"jsonrpc":"2.0","id":25,"result":{"blockHash":"0xfeffbee8fafd9860e744ac88ffb4f12752de7ccd86c2fb301c82c510b2ccd32c","blockNumber":"0x2","from":"0x658bdf435d810c91414ec09147daa6db62406379","gas":"0x5208","gasPrice":"0x2db08787","hash":"0x0d9ba049a158972e7fc1066122ceb31e431483ebf84f90f845f02e326942d467","input":"0x","nonce":"0x1","to":"0x658bdf435d810c91414ec09147daa6db62406379","transactionIndex":"0x0","value":"0x3e8","type":"0x0","chainId":"0x539","v":"0xa95","r":"0x52a6f622013359249316f4c017a67bc2c659f513dac5efea43a84b6ce4e462b1","s":"0x55ba2a779eaf62efa7d641a32ea329faabf9f097d376e2e400115a5151b9470"}}
diff --git a/tests/eth_getTransactionReceipt/get-legacy-receipt.io b/tests/eth_getTransactionReceipt/get-legacy-receipt.io
index c49370830..ee648c6bc 100644
--- a/tests/eth_getTransactionReceipt/get-legacy-receipt.io
+++ b/tests/eth_getTransactionReceipt/get-legacy-receipt.io
@@ -1,2 +1,2 @@
 >> {"jsonrpc":"2.0","id":26,"method":"eth_getTransactionReceipt","params":["0x0d9ba049a158972e7fc1066122ceb31e431483ebf84f90f845f02e326942d467"]}
-<< {"jsonrpc":"2.0","id":26,"result":{"blockHash":"0x87a74234d5ad70c6ff8e89ffd305fa85048e6cbb4045d66b43a7bf03fe9b6171","blockNumber":"0x2","contractAddress":null,"cumulativeGasUsed":"0x5208","effectiveGasPrice":"0x2db08787","from":"0x658bdf435d810c91414ec09147daa6db62406379","gasUsed":"0x5208","logs":[],"logsBloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","status":"0x1","to":"0x658bdf435d810c91414ec09147daa6db62406379","transactionHash":"0x0d9ba049a158972e7fc1066122ceb31e431483ebf84f90f845f02e326942d467","transactionIndex":"0x0","type":"0x0"}}
+<< {"jsonrpc":"2.0","id":26,"result":{"blockHash":"0xfeffbee8fafd9860e744ac88ffb4f12752de7ccd86c2fb301c82c510b2ccd32c","blockNumber":"0x2","contractAddress":null,"cumulativeGasUsed":"0x5208","effectiveGasPrice":"0x2db08787","from":"0x658bdf435d810c91414ec09147daa6db62406379","gasUsed":"0x5208","logs":[],"logsBloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","status":"0x1","to":"0x658bdf435d810c91414ec09147daa6db62406379","transactionHash":"0x0d9ba049a158972e7fc1066122ceb31e431483ebf84f90f845f02e326942d467","transactionIndex":"0x0","type":"0x0"}}
diff --git a/tests/eth_sendRawTransaction/send-legacy-transaction.io b/tests/eth_sendRawTransaction/send-legacy-transaction.io
index 10f1183ca..fc303bb60 100644
--- a/tests/eth_sendRawTransaction/send-legacy-transaction.io
+++ b/tests/eth_sendRawTransaction/send-legacy-transaction.io
@@ -1,2 +1,2 @@
->> {"jsonrpc":"2.0","id":27,"method":"eth_sendRawTransaction","params":["0xf86303018261a894aa000000000000000000000000000000000000000a825544820a95a0487f7382a47399a74c487b52fd4c5ff6e981d9b219ca1e8fcb086f1e0733ab92a063203b182cd7e7f45213f46e429e1f5ab2a5660a4ed54b9d6ee76be8d84d5ca8"]}
-<< {"jsonrpc":"2.0","id":27,"result":"0xd02709b29dba8e71897d1d28d57712b69221d3d6e5e0b50fd05aa097a567f30f"}
+>> {"jsonrpc":"2.0","id":27,"method":"eth_sendRawTransaction","params":["0xf86703843b9aca018261a894aa000000000000000000000000000000000000000a825544820a96a00cceac48b63ae1f26f8ce1a3286156d01a5cac7253c7089ecb8580a4123cd573a07f11686affcd108c08034c809f7856934db43e9c10808aa93043d12c073a8ace"]}
+<< {"jsonrpc":"2.0","id":27,"result":"0xdb4f3d4fa301b2d8673eb87a015e3eec26c3c3ccbdc9ff81fd11defeaff95398"}