diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 93807e1d3ba..7a6f516a814 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -138,7 +138,7 @@ Users can select any of the artifacts depending on their testing needs for their
 - ✨ [EIP-7934](https://eips.ethereum.org/EIPS/eip-7934): Add test cases for the block RLP max limit of 10MiB ([#1730](https://github.com/ethereum/execution-spec-tests/pull/1730)).
 - ✨ [EIP-7939](https://eips.ethereum.org/EIPS/eip-7939) Add count leading zeros (CLZ) opcode tests for Osaka ([#1733](https://github.com/ethereum/execution-spec-tests/pull/1733)).
 - ✨ [EIP-7934](https://eips.ethereum.org/EIPS/eip-7934): Add additional test cases for block RLP max limit with all typed transactions and for a log-creating transactions ([#1890](https://github.com/ethereum/execution-spec-tests/pull/1890)).
-- ✨ [EIP-7825](https://eips.ethereum.org/EIPS/eip-7825): Pre-Osaka tests have been updated to either (1) dynamically adapt to the transaction gas limit cap, or (2) reduce overall gas consumption to fit the new limit ([#1928](https://github.com/ethereum/EIPs/pull/1928)).
+- ✨ [EIP-7825](https://eips.ethereum.org/EIPS/eip-7825): Pre-Osaka tests have been updated to either (1) dynamically adapt to the transaction gas limit cap, or (2) reduce overall gas consumption to fit the new limit ([#1924](https://github.com/ethereum/EIPs/pull/1924), [#1928](https://github.com/ethereum/EIPs/pull/1928), [#1980](https://github.com/ethereum/EIPs/pull/1980)).
 - ✨ [EIP-7918](https://eips.ethereum.org/EIPS/eip-7918): Blob base fee bounded by execution cost test cases (initial), includes some adjustments to [EIP-4844](https://eips.ethereum.org/EIPS/eip-4844) tests ([#1685](https://github.com/ethereum/execution-spec-tests/pull/1685)).
 - 🔀 Adds the max blob transaction limit to the tests including updates to [EIP-4844](https://eips.ethereum.org/EIPS/eip-4844) for Osaka ([#1884](https://github.com/ethereum/execution-spec-tests/pull/1884)).
 
diff --git a/tests/static/state_tests/VMTests/vmIOandFlowOperations/gasFiller.yml b/tests/static/state_tests/VMTests/vmIOandFlowOperations/gasFiller.yml
index 5d53e909afb..7ac87d47a7c 100644
--- a/tests/static/state_tests/VMTests/vmIOandFlowOperations/gasFiller.yml
+++ b/tests/static/state_tests/VMTests/vmIOandFlowOperations/gasFiller.yml
@@ -89,7 +89,7 @@ gas:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         cccccccccccccccccccccccccccccccccccccccc:
           storage:
@@ -103,7 +103,7 @@ gas:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         cccccccccccccccccccccccccccccccccccccccc:
           storage:
diff --git a/tests/static/state_tests/VMTests/vmIOandFlowOperations/msizeFiller.yml b/tests/static/state_tests/VMTests/vmIOandFlowOperations/msizeFiller.yml
index 146c2b32bfb..9e49076b769 100644
--- a/tests/static/state_tests/VMTests/vmIOandFlowOperations/msizeFiller.yml
+++ b/tests/static/state_tests/VMTests/vmIOandFlowOperations/msizeFiller.yml
@@ -158,7 +158,7 @@ msize:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         cccccccccccccccccccccccccccccccccccccccc:
           storage:
@@ -173,7 +173,7 @@ msize:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         cccccccccccccccccccccccccccccccccccccccc:
           storage:
@@ -187,7 +187,7 @@ msize:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         cccccccccccccccccccccccccccccccccccccccc:
           storage:
@@ -201,7 +201,7 @@ msize:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         cccccccccccccccccccccccccccccccccccccccc:
           storage:
@@ -218,7 +218,7 @@ msize:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         cccccccccccccccccccccccccccccccccccccccc:
           storage:
diff --git a/tests/static/state_tests/stCallCodes/callcallcall_ABCB_RECURSIVEFiller.json b/tests/static/state_tests/stCallCodes/callcallcall_ABCB_RECURSIVEFiller.json
index c2e19727574..441f5216afb 100644
--- a/tests/static/state_tests/stCallCodes/callcallcall_ABCB_RECURSIVEFiller.json
+++ b/tests/static/state_tests/stCallCodes/callcallcall_ABCB_RECURSIVEFiller.json
@@ -71,7 +71,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCallCodes/callcallcallcode_ABCB_RECURSIVEFiller.json b/tests/static/state_tests/stCallCodes/callcallcallcode_ABCB_RECURSIVEFiller.json
index 8b1097bc1cb..3980543e4f9 100644
--- a/tests/static/state_tests/stCallCodes/callcallcallcode_ABCB_RECURSIVEFiller.json
+++ b/tests/static/state_tests/stCallCodes/callcallcallcode_ABCB_RECURSIVEFiller.json
@@ -71,7 +71,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCallCodes/callcallcodecall_ABCB_RECURSIVEFiller.json b/tests/static/state_tests/stCallCodes/callcallcodecall_ABCB_RECURSIVEFiller.json
index cca2a031e10..e5285d9eb12 100644
--- a/tests/static/state_tests/stCallCodes/callcallcodecall_ABCB_RECURSIVEFiller.json
+++ b/tests/static/state_tests/stCallCodes/callcallcodecall_ABCB_RECURSIVEFiller.json
@@ -71,7 +71,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVEFiller.json b/tests/static/state_tests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVEFiller.json
index a6ca1d1e332..7dd87ec6e47 100644
--- a/tests/static/state_tests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVEFiller.json
+++ b/tests/static/state_tests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVEFiller.json
@@ -71,7 +71,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCallCodes/callcode_checkPCFiller.json b/tests/static/state_tests/stCallCodes/callcode_checkPCFiller.json
index 142fc52614e..3c7a1a43db4 100644
--- a/tests/static/state_tests/stCallCodes/callcode_checkPCFiller.json
+++ b/tests/static/state_tests/stCallCodes/callcode_checkPCFiller.json
@@ -49,7 +49,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "1100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCallCodes/callcodecallcall_ABCB_RECURSIVEFiller.json b/tests/static/state_tests/stCallCodes/callcodecallcall_ABCB_RECURSIVEFiller.json
index 71c54d6ee5d..21a116321f5 100644
--- a/tests/static/state_tests/stCallCodes/callcodecallcall_ABCB_RECURSIVEFiller.json
+++ b/tests/static/state_tests/stCallCodes/callcodecallcall_ABCB_RECURSIVEFiller.json
@@ -71,7 +71,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVEFiller.json b/tests/static/state_tests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVEFiller.json
index 98a9338e061..39f1e165192 100644
--- a/tests/static/state_tests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVEFiller.json
+++ b/tests/static/state_tests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVEFiller.json
@@ -71,7 +71,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVEFiller.json b/tests/static/state_tests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVEFiller.json
index b6d53556ced..07126cb3836 100644
--- a/tests/static/state_tests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVEFiller.json
+++ b/tests/static/state_tests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVEFiller.json
@@ -71,7 +71,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json b/tests/static/state_tests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json
index 9f216ba6790..15566111969 100644
--- a/tests/static/state_tests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json
+++ b/tests/static/state_tests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json
@@ -71,7 +71,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCallCreateCallCodeTest/Call1024BalanceTooLowFiller.json b/tests/static/state_tests/stCallCreateCallCodeTest/Call1024BalanceTooLowFiller.json
index ab08a9244e5..2d934e2e978 100644
--- a/tests/static/state_tests/stCallCreateCallCodeTest/Call1024BalanceTooLowFiller.json
+++ b/tests/static/state_tests/stCallCreateCallCodeTest/Call1024BalanceTooLowFiller.json
@@ -13,7 +13,7 @@
         "expect" : [
     	    {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : [ ">=Cancun" ],
+                "network" : [ ">=Cancun<Osaka" ],
                 "result" : {
                     "<contract:target:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stCallCreateCallCodeTest/Call1024PreCallsFiller.json b/tests/static/state_tests/stCallCreateCallCodeTest/Call1024PreCallsFiller.json
index ee1b08cb6a5..d067287f761 100644
--- a/tests/static/state_tests/stCallCreateCallCodeTest/Call1024PreCallsFiller.json
+++ b/tests/static/state_tests/stCallCreateCallCodeTest/Call1024PreCallsFiller.json
@@ -13,7 +13,7 @@
         "expect" : [
     	    {
                 "indexes" : { "data" : -1, "gas" : 0, "value" : -1 },
-                "network" : [ ">=Cancun" ],
+                "network" : [ ">=Cancun<Osaka" ],
                 "result" : {
                     "<contract:target:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "storage" : {
@@ -26,7 +26,7 @@
             },
 			{
                 "indexes" : { "data" : -1, "gas" : 1, "value" : -1 },
-                "network" : [ ">=Cancun" ],
+                "network" : [ ">=Cancun<Osaka" ],
                 "result" : {
                     "<contract:target:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stCallCreateCallCodeTest/CallLoseGasOOGFiller.json b/tests/static/state_tests/stCallCreateCallCodeTest/CallLoseGasOOGFiller.json
index 38b4aabbf2c..d92c3d4dd00 100644
--- a/tests/static/state_tests/stCallCreateCallCodeTest/CallLoseGasOOGFiller.json
+++ b/tests/static/state_tests/stCallCreateCallCodeTest/CallLoseGasOOGFiller.json
@@ -52,7 +52,7 @@
                 ""
             ],
             "gasLimit" : [
-                "9214364837600034817"
+                "200000"
             ],
             "gasPrice" : "10",
             "nonce" : "",
diff --git a/tests/static/state_tests/stCallCreateCallCodeTest/CallRecursiveBombPreCallFiller.json b/tests/static/state_tests/stCallCreateCallCodeTest/CallRecursiveBombPreCallFiller.json
index 6d7904076cd..9c54a7f8372 100644
--- a/tests/static/state_tests/stCallCreateCallCodeTest/CallRecursiveBombPreCallFiller.json
+++ b/tests/static/state_tests/stCallCreateCallCodeTest/CallRecursiveBombPreCallFiller.json
@@ -13,7 +13,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : [ ">=Cancun" ],
+                "network" : [ ">=Cancun<Osaka" ],
                 "result" : {
                     "<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stCallCreateCallCodeTest/Callcode1024BalanceTooLowFiller.json b/tests/static/state_tests/stCallCreateCallCodeTest/Callcode1024BalanceTooLowFiller.json
index 8a7647e190c..dff17bef842 100644
--- a/tests/static/state_tests/stCallCreateCallCodeTest/Callcode1024BalanceTooLowFiller.json
+++ b/tests/static/state_tests/stCallCreateCallCodeTest/Callcode1024BalanceTooLowFiller.json
@@ -13,7 +13,7 @@
         "expect" : [
     	    {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : [">=Cancun" ],
+                "network" : [">=Cancun<Osaka" ],
                 "result" : {
                     "<contract:target:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stCallCreateCallCodeTest/createInitFailBadJumpDestination2Filler.json b/tests/static/state_tests/stCallCreateCallCodeTest/createInitFailBadJumpDestination2Filler.json
index fc65ec67d02..2493fd93b59 100644
--- a/tests/static/state_tests/stCallCreateCallCodeTest/createInitFailBadJumpDestination2Filler.json
+++ b/tests/static/state_tests/stCallCreateCallCodeTest/createInitFailBadJumpDestination2Filler.json
@@ -42,7 +42,7 @@
                 ""
             ],
             "gasLimit" : [
-                "100000000"
+                "2200000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCallCreateCallCodeTest/createInitFailBadJumpDestinationFiller.json b/tests/static/state_tests/stCallCreateCallCodeTest/createInitFailBadJumpDestinationFiller.json
index 5c1e99ca570..fc2229a644e 100644
--- a/tests/static/state_tests/stCallCreateCallCodeTest/createInitFailBadJumpDestinationFiller.json
+++ b/tests/static/state_tests/stCallCreateCallCodeTest/createInitFailBadJumpDestinationFiller.json
@@ -42,7 +42,7 @@
                 ""
             ],
             "gasLimit" : [
-                "100000000"
+                "2200000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024Filler.json b/tests/static/state_tests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024Filler.json
index ecb9dff9f4c..3c4efb75b33 100644
--- a/tests/static/state_tests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024Filler.json
+++ b/tests/static/state_tests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024Filler.json
@@ -42,7 +42,7 @@
                 ""
             ],
             "gasLimit" : [
-                "100000000"
+                "2200000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCallCreateCallCodeTest/createInitFailStackUnderflowFiller.json b/tests/static/state_tests/stCallCreateCallCodeTest/createInitFailStackUnderflowFiller.json
index e8f5fc1ca65..7b3973a3c6e 100644
--- a/tests/static/state_tests/stCallCreateCallCodeTest/createInitFailStackUnderflowFiller.json
+++ b/tests/static/state_tests/stCallCreateCallCodeTest/createInitFailStackUnderflowFiller.json
@@ -42,7 +42,7 @@
                 ""
             ],
             "gasLimit" : [
-                "100000000"
+                "2200000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction2Filler.json b/tests/static/state_tests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction2Filler.json
index 159a28bcd50..4c2a55708c2 100644
--- a/tests/static/state_tests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction2Filler.json
+++ b/tests/static/state_tests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction2Filler.json
@@ -42,7 +42,7 @@
                 ""
             ],
             "gasLimit" : [
-                "100000000"
+                "2200000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCallCreateCallCodeTest/createInitFailUndefinedInstructionFiller.json b/tests/static/state_tests/stCallCreateCallCodeTest/createInitFailUndefinedInstructionFiller.json
index b62310acc2d..8c604e6cda1 100644
--- a/tests/static/state_tests/stCallCreateCallCodeTest/createInitFailUndefinedInstructionFiller.json
+++ b/tests/static/state_tests/stCallCreateCallCodeTest/createInitFailUndefinedInstructionFiller.json
@@ -58,7 +58,7 @@
                 ""
             ],
             "gasLimit" : [
-                "100000000"
+                "900000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json b/tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json
index b19c925e2f4..a4a74cc973c 100644
--- a/tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json
+++ b/tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json
@@ -75,7 +75,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json b/tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json
index 5b129f1247a..6bffd780c44 100644
--- a/tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json
+++ b/tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json
@@ -75,7 +75,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json b/tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json
index c3f04b987df..3bca27b0a25 100644
--- a/tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json
+++ b/tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json
@@ -75,7 +75,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json b/tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json
index 7de9138b9e3..1a122528db4 100644
--- a/tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json
+++ b/tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json
@@ -81,7 +81,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json b/tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json
index bae191c1b3b..0ef3cd8c762 100644
--- a/tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json
+++ b/tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json
@@ -80,7 +80,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json b/tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json
index 075126cccdc..73634c152e7 100644
--- a/tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json
+++ b/tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json
@@ -80,7 +80,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json b/tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json
index 40047f1264b..4a8d464348c 100644
--- a/tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json
+++ b/tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json
@@ -80,7 +80,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json b/tests/static/state_tests/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json
index e1c47a3fceb..66a4c5e8e99 100644
--- a/tests/static/state_tests/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json
+++ b/tests/static/state_tests/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json
@@ -75,7 +75,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json b/tests/static/state_tests/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json
index 0c91ab0a2b3..5677cc3ef1e 100644
--- a/tests/static/state_tests/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json
+++ b/tests/static/state_tests/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json
@@ -75,7 +75,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json b/tests/static/state_tests/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json
index b3809cd7305..cffe9d9e150 100644
--- a/tests/static/state_tests/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json
+++ b/tests/static/state_tests/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json
@@ -75,7 +75,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json b/tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json
index 88a12c8f23b..dfa9ec203bf 100644
--- a/tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json
+++ b/tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json
@@ -80,7 +80,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json b/tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json
index ce24d23598c..847ba4cad6c 100644
--- a/tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json
+++ b/tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json
@@ -80,7 +80,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json b/tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json
index 3fa434b9167..b2103250fef 100644
--- a/tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json
+++ b/tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json
@@ -80,7 +80,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json b/tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json
index cf1a342f91e..345b70c2340 100644
--- a/tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json
+++ b/tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json
@@ -80,7 +80,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stChainId/chainIdFiller.json b/tests/static/state_tests/stChainId/chainIdFiller.json
index 7d75ed60f0e..1876280e99b 100644
--- a/tests/static/state_tests/stChainId/chainIdFiller.json
+++ b/tests/static/state_tests/stChainId/chainIdFiller.json
@@ -40,7 +40,7 @@
     },
     "transaction": {
       "data": ["0x"],
-      "gasLimit": ["100000000"],
+      "gasLimit": ["100000"],
       "gasPrice": "10",
       "nonce": "0",
       "secretKey": "<eoa:sender:0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8>",
diff --git a/tests/static/state_tests/stChainId/chainIdGasCostFiller.json b/tests/static/state_tests/stChainId/chainIdGasCostFiller.json
index 3d3e6f9421c..b98df1423cb 100644
--- a/tests/static/state_tests/stChainId/chainIdGasCostFiller.json
+++ b/tests/static/state_tests/stChainId/chainIdGasCostFiller.json
@@ -41,7 +41,7 @@
       },
       "transaction": {
         "data": ["0x"],
-        "gasLimit": ["100000000"],
+        "gasLimit": ["100000"],
         "gasPrice": "10",
         "nonce": "0",
         "secretKey": "<eoa:sender:0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8>",
diff --git a/tests/static/state_tests/stCreate2/CREATE2_Bounds2Filler.json b/tests/static/state_tests/stCreate2/CREATE2_Bounds2Filler.json
index 65a74567a46..b3288e8897b 100644
--- a/tests/static/state_tests/stCreate2/CREATE2_Bounds2Filler.json
+++ b/tests/static/state_tests/stCreate2/CREATE2_Bounds2Filler.json
@@ -48,7 +48,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCreate2/CREATE2_Bounds3Filler.json b/tests/static/state_tests/stCreate2/CREATE2_Bounds3Filler.json
index a4ea7d88f45..db8a703b5af 100644
--- a/tests/static/state_tests/stCreate2/CREATE2_Bounds3Filler.json
+++ b/tests/static/state_tests/stCreate2/CREATE2_Bounds3Filler.json
@@ -46,7 +46,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "1000000", "250000000"
+                "150000", "1000000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCreate2/CREATE2_BoundsFiller.json b/tests/static/state_tests/stCreate2/CREATE2_BoundsFiller.json
index ed8cb8a6841..244ccc0d2be 100644
--- a/tests/static/state_tests/stCreate2/CREATE2_BoundsFiller.json
+++ b/tests/static/state_tests/stCreate2/CREATE2_BoundsFiller.json
@@ -51,7 +51,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stCreate2/Create2OnDepth1023Filler.json b/tests/static/state_tests/stCreate2/Create2OnDepth1023Filler.json
index 3359ed90fcc..29c9401e9c5 100644
--- a/tests/static/state_tests/stCreate2/Create2OnDepth1023Filler.json
+++ b/tests/static/state_tests/stCreate2/Create2OnDepth1023Filler.json
@@ -17,7 +17,7 @@
                    "gas" : -1,
                    "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                   "0x4f05179f0987710f94f2cbde67c5357bc1815af3" : {
                      "nonce" : "1"
diff --git a/tests/static/state_tests/stCreate2/Create2OnDepth1024Filler.json b/tests/static/state_tests/stCreate2/Create2OnDepth1024Filler.json
index 06fd79d30ac..4bc9eb5afbe 100644
--- a/tests/static/state_tests/stCreate2/Create2OnDepth1024Filler.json
+++ b/tests/static/state_tests/stCreate2/Create2OnDepth1024Filler.json
@@ -17,7 +17,7 @@
                    "gas" : -1,
                    "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                   "0x436b8f99e8d953cdaf8f9472116add83ccd82a65" : {
         		     "//comment" : "this nonce would have been equal to 2 if create worked",
diff --git a/tests/static/state_tests/stCreate2/Create2RecursiveFiller.json b/tests/static/state_tests/stCreate2/Create2RecursiveFiller.json
index 832b56b49c1..20aa1ab4311 100644
--- a/tests/static/state_tests/stCreate2/Create2RecursiveFiller.json
+++ b/tests/static/state_tests/stCreate2/Create2RecursiveFiller.json
@@ -17,7 +17,7 @@
                    "gas" : 0,
                    "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                   "0x4b17a07e119e86a0ff1fd21cdc9b4aba196ed3f8" : {
         		     "//comment" : "1024's address",
@@ -31,7 +31,7 @@
                    "gas" : 1,
                    "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                   "0x4b17a07e119e86a0ff1fd21cdc9b4aba196ed3f8" : {
         		     "shouldnotexist" : "1"
@@ -44,7 +44,7 @@
                    "gas" : 2,
                    "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                   "0x471a0e624a2ac11c82cf1ff843127f1c6aa98351" : {
         		     "//comment" : "1023's address",
diff --git a/tests/static/state_tests/stCreate2/RevertInCreateInInitCreate2ParisFiller.json b/tests/static/state_tests/stCreate2/RevertInCreateInInitCreate2ParisFiller.json
index ef4c3a37162..b83a17e9de3 100644
--- a/tests/static/state_tests/stCreate2/RevertInCreateInInitCreate2ParisFiller.json
+++ b/tests/static/state_tests/stCreate2/RevertInCreateInInitCreate2ParisFiller.json
@@ -12,7 +12,7 @@
         },
         "expect" : [
             {
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                   "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                      "balance" : "10",
diff --git a/tests/static/state_tests/stCreate2/RevertOpcodeInCreateReturnsCreate2Filler.json b/tests/static/state_tests/stCreate2/RevertOpcodeInCreateReturnsCreate2Filler.json
index 15dc34d7f8e..0fd04b35ff8 100644
--- a/tests/static/state_tests/stCreate2/RevertOpcodeInCreateReturnsCreate2Filler.json
+++ b/tests/static/state_tests/stCreate2/RevertOpcodeInCreateReturnsCreate2Filler.json
@@ -48,7 +48,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stCreate2/call_outsize_then_create2_successful_then_returndatasizeFiller.json b/tests/static/state_tests/stCreate2/call_outsize_then_create2_successful_then_returndatasizeFiller.json
index fa3cee56cd5..5225e210fa1 100644
--- a/tests/static/state_tests/stCreate2/call_outsize_then_create2_successful_then_returndatasizeFiller.json
+++ b/tests/static/state_tests/stCreate2/call_outsize_then_create2_successful_then_returndatasizeFiller.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stCreate2/call_then_create2_successful_then_returndatasizeFiller.json b/tests/static/state_tests/stCreate2/call_then_create2_successful_then_returndatasizeFiller.json
index 1717ce8ca1c..1c4e7c27d7d 100644
--- a/tests/static/state_tests/stCreate2/call_then_create2_successful_then_returndatasizeFiller.json
+++ b/tests/static/state_tests/stCreate2/call_then_create2_successful_then_returndatasizeFiller.json
@@ -56,7 +56,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stCreate2/create2SmartInitCodeFiller.json b/tests/static/state_tests/stCreate2/create2SmartInitCodeFiller.json
index 6dafce93695..230e643ad0d 100644
--- a/tests/static/state_tests/stCreate2/create2SmartInitCodeFiller.json
+++ b/tests/static/state_tests/stCreate2/create2SmartInitCodeFiller.json
@@ -91,7 +91,7 @@
         		":raw 0x0000000000000000000000001f572e5295c57f15886f9b263e2f6d2d6c7b5ec6"
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x061a80"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stCreate2/returndatacopy_0_0_following_successful_createFiller.json b/tests/static/state_tests/stCreate2/returndatacopy_0_0_following_successful_createFiller.json
index 9a5403c3b20..2d6b87b838e 100644
--- a/tests/static/state_tests/stCreate2/returndatacopy_0_0_following_successful_createFiller.json
+++ b/tests/static/state_tests/stCreate2/returndatacopy_0_0_following_successful_createFiller.json
@@ -51,7 +51,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stCreate2/returndatacopy_afterFailing_createFiller.json b/tests/static/state_tests/stCreate2/returndatacopy_afterFailing_createFiller.json
index 284ff434e69..383161faa15 100644
--- a/tests/static/state_tests/stCreate2/returndatacopy_afterFailing_createFiller.json
+++ b/tests/static/state_tests/stCreate2/returndatacopy_afterFailing_createFiller.json
@@ -49,7 +49,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stCreate2/returndatacopy_following_createFiller.json b/tests/static/state_tests/stCreate2/returndatacopy_following_createFiller.json
index 7c1f8db0afd..5588ed476c6 100644
--- a/tests/static/state_tests/stCreate2/returndatacopy_following_createFiller.json
+++ b/tests/static/state_tests/stCreate2/returndatacopy_following_createFiller.json
@@ -80,7 +80,7 @@
         		":raw 0x0000000000000000000000001f572e5295c57f15886f9b263e2f6d2d6c7b5ec6"
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stCreate2/returndatacopy_following_revert_in_createFiller.json b/tests/static/state_tests/stCreate2/returndatacopy_following_revert_in_createFiller.json
index d8f9d78ad2f..ed471549d13 100644
--- a/tests/static/state_tests/stCreate2/returndatacopy_following_revert_in_createFiller.json
+++ b/tests/static/state_tests/stCreate2/returndatacopy_following_revert_in_createFiller.json
@@ -48,7 +48,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stCreate2/returndatacopy_following_successful_createFiller.json b/tests/static/state_tests/stCreate2/returndatacopy_following_successful_createFiller.json
index dc72cae6a60..d08bc3689db 100644
--- a/tests/static/state_tests/stCreate2/returndatacopy_following_successful_createFiller.json
+++ b/tests/static/state_tests/stCreate2/returndatacopy_following_successful_createFiller.json
@@ -48,7 +48,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stCreate2/returndatasize_following_successful_createFiller.json b/tests/static/state_tests/stCreate2/returndatasize_following_successful_createFiller.json
index 25878d0369e..792536ce215 100644
--- a/tests/static/state_tests/stCreate2/returndatasize_following_successful_createFiller.json
+++ b/tests/static/state_tests/stCreate2/returndatasize_following_successful_createFiller.json
@@ -49,7 +49,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stCreateTest/CreateOOGafterMaxCodesizeFiller.yml b/tests/static/state_tests/stCreateTest/CreateOOGafterMaxCodesizeFiller.yml
index adfce1da39e..f8aba59cee4 100644
--- a/tests/static/state_tests/stCreateTest/CreateOOGafterMaxCodesizeFiller.yml
+++ b/tests/static/state_tests/stCreateTest/CreateOOGafterMaxCodesizeFiller.yml
@@ -165,7 +165,7 @@ CreateOOGafterMaxCodesize:
     # - High number of contracts (250): Create 250 contracts at 0xc0dea, 250 contracts at 0xc0deb, don't OOG on 0xc0deb, call 494 out of 500 contracts to self-destruct.
     - :label HighContractCount_DelegateCreate_CallCreate_SelfDestruct :abi f(uint,uint,bool,uint) 0xfa 0xfa 0x00 0x01ee
     gasLimit:
-    - 0x1000000
+    - 0x100000000
     gasPrice: '10'
     nonce: '0'
     to: 00000000000000000000000000000000000c0dea
@@ -181,7 +181,7 @@ CreateOOGafterMaxCodesize:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
 
         00000000000000000000000000000000000c0dea:
@@ -207,7 +207,7 @@ CreateOOGafterMaxCodesize:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
 
         00000000000000000000000000000000000c0dea:
@@ -245,7 +245,7 @@ CreateOOGafterMaxCodesize:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
 
         00000000000000000000000000000000000c0dea:
@@ -312,7 +312,7 @@ CreateOOGafterMaxCodesize:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
 
         00000000000000000000000000000000000c0dea:
@@ -338,7 +338,7 @@ CreateOOGafterMaxCodesize:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
 
         00000000000000000000000000000000000c0dea:
@@ -376,7 +376,7 @@ CreateOOGafterMaxCodesize:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
 
         00000000000000000000000000000000000c0dea:
diff --git a/tests/static/state_tests/stCreateTest/createLargeResultFiller.yml b/tests/static/state_tests/stCreateTest/createLargeResultFiller.yml
index 5bb1c8e2fea..d28bf75e0a0 100644
--- a/tests/static/state_tests/stCreateTest/createLargeResultFiller.yml
+++ b/tests/static/state_tests/stCreateTest/createLargeResultFiller.yml
@@ -138,7 +138,7 @@ createLargeResult:
         data: 
         - :label CREATE-RETURN
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         cccccccccccccccccccccccccccccccccccccccc:
           storage:
@@ -154,7 +154,7 @@ createLargeResult:
         data: 
         - :label CREATE2-RETURN
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         cccccccccccccccccccccccccccccccccccccccc:
           storage:
@@ -170,7 +170,7 @@ createLargeResult:
         data: 
         - :label CREATE-REVERT
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         cccccccccccccccccccccccccccccccccccccccc:
           storage:
@@ -186,7 +186,7 @@ createLargeResult:
         data: 
         - :label CREATE2-REVERT
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         cccccccccccccccccccccccccccccccccccccccc:
           storage:
@@ -204,7 +204,7 @@ createLargeResult:
         data: 
         - :label CREATE-RETURN-MAX
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         cccccccccccccccccccccccccccccccccccccccc:
           storage:
@@ -220,7 +220,7 @@ createLargeResult:
         data: 
         - :label CREATE2-RETURN-MAX
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         cccccccccccccccccccccccccccccccccccccccc:
           storage:
@@ -236,7 +236,7 @@ createLargeResult:
         data: 
         - :label CREATE-REVERT-MAX
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         cccccccccccccccccccccccccccccccccccccccc:
           storage:
@@ -252,7 +252,7 @@ createLargeResult:
         data: 
         - :label CREATE2-REVERT-MAX
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         cccccccccccccccccccccccccccccccccccccccc:
           storage:
@@ -269,7 +269,7 @@ createLargeResult:
         data: 
         - :label CREATE-RETURN-TOOBIG
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         cccccccccccccccccccccccccccccccccccccccc:
           storage:
@@ -286,7 +286,7 @@ createLargeResult:
         data: 
         - :label CREATE2-RETURN-TOOBIG
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         cccccccccccccccccccccccccccccccccccccccc:
           storage:
@@ -302,7 +302,7 @@ createLargeResult:
         data: 
         - :label CREATE-REVERT-TOOBIG
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         cccccccccccccccccccccccccccccccccccccccc:
           storage:
@@ -319,7 +319,7 @@ createLargeResult:
         data: 
         - :label CREATE2-REVERT-TOOBIG
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         cccccccccccccccccccccccccccccccccccccccc:
           storage:
@@ -336,7 +336,7 @@ createLargeResult:
         data: 
         - :label CREATE-RETURN-HUGE
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         cccccccccccccccccccccccccccccccccccccccc:
           storage:
@@ -353,7 +353,7 @@ createLargeResult:
         data: 
         - :label CREATE2-RETURN-HUGE
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         cccccccccccccccccccccccccccccccccccccccc:
           storage:
@@ -371,7 +371,7 @@ createLargeResult:
         data: 
         - :label CREATE-REVERT-HUGE
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         cccccccccccccccccccccccccccccccccccccccc:
           storage:
@@ -388,7 +388,7 @@ createLargeResult:
         data: 
         - :label CREATE2-REVERT-HUGE
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         cccccccccccccccccccccccccccccccccccccccc:
           storage:
diff --git a/tests/static/state_tests/stDelegatecallTestHomestead/Call1024BalanceTooLowFiller.json b/tests/static/state_tests/stDelegatecallTestHomestead/Call1024BalanceTooLowFiller.json
index c2387ceeef4..fd2ca5dbd02 100644
--- a/tests/static/state_tests/stDelegatecallTestHomestead/Call1024BalanceTooLowFiller.json
+++ b/tests/static/state_tests/stDelegatecallTestHomestead/Call1024BalanceTooLowFiller.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stDelegatecallTestHomestead/Call1024PreCallsFiller.json b/tests/static/state_tests/stDelegatecallTestHomestead/Call1024PreCallsFiller.json
index 1301f74116f..84e370ef751 100644
--- a/tests/static/state_tests/stDelegatecallTestHomestead/Call1024PreCallsFiller.json
+++ b/tests/static/state_tests/stDelegatecallTestHomestead/Call1024PreCallsFiller.json
@@ -14,7 +14,7 @@
                     "gas" : 0,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "storage" : {
@@ -32,7 +32,7 @@
                     "gas" : 2,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "storage" : {
@@ -50,7 +50,7 @@
                     "gas" : 1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stDelegatecallTestHomestead/CallLoseGasOOGFiller.json b/tests/static/state_tests/stDelegatecallTestHomestead/CallLoseGasOOGFiller.json
index 6fff5bd43ce..40a054b2d5f 100644
--- a/tests/static/state_tests/stDelegatecallTestHomestead/CallLoseGasOOGFiller.json
+++ b/tests/static/state_tests/stDelegatecallTestHomestead/CallLoseGasOOGFiller.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "9214364837600034817"
+                "200000"
             ],
             "gasPrice" : "10",
             "nonce" : "",
diff --git a/tests/static/state_tests/stDelegatecallTestHomestead/CallRecursiveBombPreCallFiller.json b/tests/static/state_tests/stDelegatecallTestHomestead/CallRecursiveBombPreCallFiller.json
index ffb83bd9a47..7655cc37aba 100644
--- a/tests/static/state_tests/stDelegatecallTestHomestead/CallRecursiveBombPreCallFiller.json
+++ b/tests/static/state_tests/stDelegatecallTestHomestead/CallRecursiveBombPreCallFiller.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stDelegatecallTestHomestead/Delegatecall1024Filler.json b/tests/static/state_tests/stDelegatecallTestHomestead/Delegatecall1024Filler.json
index f09f4f55572..258ca42fbf1 100644
--- a/tests/static/state_tests/stDelegatecallTestHomestead/Delegatecall1024Filler.json
+++ b/tests/static/state_tests/stDelegatecallTestHomestead/Delegatecall1024Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stEIP1559/baseFeeDiffPlacesFiller.yml b/tests/static/state_tests/stEIP1559/baseFeeDiffPlacesFiller.yml
index a9f5af75420..5f800b189ab 100644
--- a/tests/static/state_tests/stEIP1559/baseFeeDiffPlacesFiller.yml
+++ b/tests/static/state_tests/stEIP1559/baseFeeDiffPlacesFiller.yml
@@ -691,7 +691,7 @@ baseFeeDiffPlaces:
         value: !!int -1
 
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
 
       result:
         cccccccccccccccccccccccccccccccccccccccc:
diff --git a/tests/static/state_tests/stEIP1559/baseFeeDiffPlacesOsakaFiller.yml b/tests/static/state_tests/stEIP1559/baseFeeDiffPlacesOsakaFiller.yml
new file mode 100644
index 00000000000..cd45d5aefd9
--- /dev/null
+++ b/tests/static/state_tests/stEIP1559/baseFeeDiffPlacesOsakaFiller.yml
@@ -0,0 +1,708 @@
+
+# Created by tests/src/Templates/DiffPlaces/templateGen.js
+#
+# With the template code:
+# // basefee is still not supported in Yul 0.8.5
+#            
+#            
+#            mstore(0, verbatim_0i_1o(hex"48"))
+#            
+#            
+#
+# Expected result: 10
+#
+baseFeeDiffPlaces:
+  _info:
+    comment: Ori Pomerantz   qbzzt1@gmail.com
+
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: 0x20000
+    currentNumber: 1
+    currentTimestamp: 1000
+    currentGasLimit: 0x10000000000000
+    currentBaseFee: 10
+
+  pre:
+
+    # It is not trivial to use the Yul compiler to get the
+    # binary code for the code we're checking, so we'll use EXTCODECOPY
+    # from this contract
+    000000000000000000000000000000000000C0DE:
+      balance: 1000000000000000000
+      code: |
+        :yul berlin {
+           // basefee is still not supported in Yul 0.8.5
+            
+            
+            mstore(0, verbatim_0i_1o(hex"48"))
+            
+            
+
+           // Here the result is is mload(0). We want to run it, but
+           // prefix it with a zero so we'll be safe from being considered
+           // an invalid program.
+           //
+           // If we use this as a constructor the result will be
+           // the code of the created contract, but we can live
+           // with that. We won't call it.
+           mstore(0x40, mload(0x00))
+           return(0x3F, 0x21)
+        }
+      nonce: 1
+      storage: {}
+
+    # When we create a contract and then call it, we don't want the
+    # zero prefix in the return value
+    000000000000000000000000000000000020C0DE:
+      balance: 1000000000000000000
+      code: |
+        :yul berlin {
+           // basefee is still not supported in Yul 0.8.5
+            
+            
+            mstore(0, verbatim_0i_1o(hex"48"))
+            
+            
+
+           // Here the result is is mload(0).
+           return(0x00, 0x20)
+        }
+      nonce: 1
+      storage: {}
+
+
+
+    # Code for a construct to create a contract with the template code
+    00000000000000000000000000000000C0DEC0DE:
+      balance: 1000000000000000000
+      code: |
+        :yul berlin {
+           let addr := 0x20C0DE
+           let length := extcodesize(addr)
+
+           // Read the code from 0x20C0DE
+           extcodecopy(addr, 0, 0, length)
+
+           // Return this memory as the code for the contract
+           return(0, length)
+        }
+      nonce: 1
+      storage: {}
+
+
+    # Perform the action (directly or indirectly). Either way,
+    # store the result in sload(0).
+    cccccccccccccccccccccccccccccccccccccccc:
+      balance: 1000000000000000000
+      code: |
+          :yul berlin {
+             let action := calldataload(4)
+             let res := 1   // If the result of a call is revert, revert here too
+             let addr := 1  // If the result of CREATE[2] is zero, it reverted
+
+             // For when we need code in our memory
+             let codeBuffer := 0x20
+             // When running the template in the constructor
+             let codeLength := extcodesize(0xC0DE)
+             // When running the template in the created code
+             let codeLength2 := extcodesize(0xC0DEC0DE)
+
+             // Goat should be overwritten
+             mstore(0, 0x60A7)
+
+             switch action
+             case 0 {  // run the code snippet as normal code
+                // basefee is still not supported in Yul 0.8.5
+            
+            
+            mstore(0, verbatim_0i_1o(hex"48"))
+            
+            
+             }
+
+             // One level of call stack
+             case 0xF1 {  // call a contract to run this code
+                res := call(gas(), 0xca11, 0, 0, 0, 0, 0x20) // call template code
+             }
+             case 0xF2 {  // callcode a contract to run this code
+                res := callcode(gas(), 0xca11, 0, 0, 0, 0, 0x20)
+             }
+             case 0xF4 {  // delegate call a contract to run this code
+                res := delegatecall(gas(), 0xca11, 0, 0, 0, 0x20)
+             }
+             case 0xFA {  // static call a contract to run this code
+                res := staticcall(gas(), 0xca11, 0, 0, 0, 0x20)
+             }
+
+             // Two levels of call stack
+             case 0xF1F1 {  // call, call
+                res := call(gas(), 0xca1100f1, 0, 0, 0, 0, 0x20)
+             }
+             case 0xF2F1 {  // callcode, call
+                res := callcode(gas(), 0xca1100f1, 0, 0, 0, 0, 0x20)
+             }
+             case 0xF4F1 {  // delegatecall, call
+                res := delegatecall(gas(), 0xca1100f1, 0, 0, 0, 0x20)
+             }
+             case 0xFAF1 {  // staticcall, call
+                res := staticcall(gas(), 0xca1100f1, 0, 0, 0, 0x20)
+             }
+             case 0xF1F2 {  // call, callcode
+                res := call(gas(), 0xca1100f2, 0, 0, 0, 0, 0x20)
+             }
+             case 0xF2F2 {  // callcode, callcode
+                res := callcode(gas(), 0xca1100f2, 0, 0, 0, 0, 0x20)
+             }
+             case 0xF4F2 {  // delegatecall, callcode
+                res := delegatecall(gas(), 0xca1100f2, 0, 0, 0, 0x20)
+             }
+             case 0xFAF2 {  // staticcall, callcode
+                res := staticcall(gas(), 0xca1100f2, 0, 0, 0, 0x20)
+             }
+             case 0xF1F4 {  // call, delegatecall
+                res := call(gas(), 0xca1100f4, 0, 0, 0, 0, 0x20)
+             }
+             case 0xF2F4 {  // callcode, delegatecall
+                res := callcode(gas(), 0xca1100f4, 0, 0, 0, 0, 0x20)
+             }
+             case 0xF4F4 {  // delegatecall, delegatecall
+                res := delegatecall(gas(), 0xca1100f4, 0, 0, 0, 0x20)
+             }
+             case 0xFAF4 {  // staticcall, delegatecall
+                res := staticcall(gas(), 0xca1100f4, 0, 0, 0, 0x20)
+             }
+             case 0xF1FA {  // call, staticcall
+                res := call(gas(), 0xca1100fa, 0, 0, 0, 0, 0x20)
+             }
+             case 0xF2FA {  // callcode, staticcall
+                res := callcode(gas(), 0xca1100fa, 0, 0, 0, 0, 0x20)
+             }
+             case 0xF4FA {  // delegatecall, staticcall
+                res := delegatecall(gas(), 0xca1100fa, 0, 0, 0, 0x20)
+             }
+             case 0xFAFA {  // staticcall, staticcall
+                res := staticcall(gas(), 0xca1100fa, 0, 0, 0, 0x20)
+             }
+             case 0xFD {   // Rerun the code after a REVERT
+                // basefee is still not supported in Yul 0.8.5
+            
+            
+            mstore(0, verbatim_0i_1o(hex"48"))
+            
+            
+                sstore(0, mload(0))
+
+                pop(call(gas(), 0x60BACC, 0, 0, 0, 0, 0))
+                // basefee is still not supported in Yul 0.8.5
+            
+            
+            mstore(0, verbatim_0i_1o(hex"48"))
+            
+            
+
+                // The two results should be equal
+                if iszero(eq(sload(0), mload(0))) {mstore(0, 0xBADBADBAD)}
+             }
+             case 0xFE {   // Rerun the code after an out of gas
+                // basefee is still not supported in Yul 0.8.5
+            
+            
+            mstore(0, verbatim_0i_1o(hex"48"))
+            
+            
+                sstore(0, mload(0))
+
+                pop(call(25000, 0x60006, 0, 0, 0, 0, 0))
+                // basefee is still not supported in Yul 0.8.5
+            
+            
+            mstore(0, verbatim_0i_1o(hex"48"))
+            
+            
+
+                // The two results should be equal
+                if iszero(eq(sload(0), mload(0))) {mstore(0, 0xBADBADBAD)}
+             }
+             case 0xFF {   // Rerun the code after a SELFDESTRUCT
+                // basefee is still not supported in Yul 0.8.5
+            
+            
+            mstore(0, verbatim_0i_1o(hex"48"))
+            
+            
+                sstore(0, mload(0))
+
+                pop(call(gas(), 0xDEADDEAD, 0, 0, 0, 0, 0))
+                // basefee is still not supported in Yul 0.8.5
+            
+            
+            mstore(0, verbatim_0i_1o(hex"48"))
+            
+            
+
+                // The two results should be equal
+                if iszero(eq(sload(0), mload(0))) {mstore(0, 0xBADBADBAD)}
+             }
+
+
+
+             case 0xF0 {  // CREATE, run the code in the constructor
+                // Read the code from 0xC0DE and create a contract based on it
+                extcodecopy(0xC0DE, codeBuffer, 0, codeLength)
+                addr := create(1000000000000000000, codeBuffer, codeLength)
+
+                // Read the created contract, that is the result
+                // We start it from the second byte so the first byte of
+                // code will be STOP (0x00). Otherwise we might run into
+                // invalid program issues (because the result isn't a valid
+                // program
+                extcodecopy(addr, 0, 1, 0x20)
+             }
+
+
+             case 0xF5 {  // CREATE2, run the code in the constructor
+                // Read the code from 0xC0DE and create a contract based on it
+                extcodecopy(0xC0DE, codeBuffer, 0, codeLength)
+                addr := create2(1000000000000000000, codeBuffer, codeLength, 0x5a17)
+
+                // Read the created contract, that is the result
+                // We start it from the second byte so the first byte of
+                // code will be STOP (0x00). Otherwise we might run into
+                // invalid program issues (because the result isn't a valid
+                // program
+                extcodecopy(addr, 0, 1, 0x20)
+             }
+
+             case 0xF0F1 { // CREATE, then CALL the created code for the result
+
+                // Read the code from 0xC0DEC0DE and create a
+                // contract based on it
+                extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2)
+                addr := create(1000000000000000000, codeBuffer, codeLength2)
+
+                // Call the contract
+                res := call(gas(), addr, 0, 0, 0, 0, 0x20)
+
+             }
+
+             case 0xF5F1 { // CREATE2, then CALL the created code for the result
+
+                // Read the code from 0xC0DEC0DE and create a
+                // contract based on it
+                extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2)
+                addr := create2(1000000000000000000, codeBuffer, codeLength2, 0x5a17)
+
+                // Call the contract
+                res := call(gas(), addr, 0, 0, 0, 0, 0x20)
+
+             }
+
+
+             case 0xF0F2 { // CREATE, then CALLCODE the created code
+                           // for the result
+
+                // Read the code from 0xC0DEC0DE and create a
+                // contract based on it
+                extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2)
+
+                // Here we don't transfer cc..cc's ETH to the new contract
+                // because if we run SELFBALANCE it will run in the context
+                // of CC....CC and therefore return 0
+                addr := create(0, codeBuffer, codeLength2)
+
+                // Call the contract
+                res := callcode(gas(), addr, 0, 0, 0, 0, 0x20)
+
+             }
+
+             case 0xF5F2 { // CREATE2, then CALLCODE the created code for
+                           // the result
+
+                // Read the code from 0xC0DEC0DE and create a
+                // contract based on it
+                extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2)
+
+                // Here we don't transfer cc..cc's ETH to the new contract
+                // because if we run SELFBALANCE it will run in the context
+                // of CC....CC and therefore return 0
+                addr := create2(0, codeBuffer, codeLength2, 0x5a17)
+
+                // Call the contract
+                res := callcode(gas(), addr, 0, 0, 0, 0, 0x20)
+
+             }
+
+
+             case 0xF0F4 { // CREATE, then DELEGATECALL the created code
+                           // for the result
+
+                // Read the code from 0xC0DEC0DE and create a
+                // contract based on it
+                extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2)
+
+                // Here we don't transfer cc..cc's ETH to the new contract
+                // because if we run SELFBALANCE it will run in the context
+                // of CC....CC and therefore return 0
+                addr := create(0, codeBuffer, codeLength2)
+
+                // Call the contract
+                res := delegatecall(gas(), addr, 0, 0, 0, 0x20)
+
+             }
+
+             case 0xF5F4 { // CREATE2, then DELEGATECALL the created code
+                           // for the result
+
+                // Read the code from 0xC0DEC0DE and create a
+                // contract based on it
+                extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2)
+
+                // Here we don't transfer cc..cc's ETH to the new contract
+                // because if we run SELFBALANCE it will run in the context
+                // of CC....CC and therefore return 0
+                addr := create2(0, codeBuffer, codeLength2, 0x5a17)
+
+                // Call the contract
+                res := delegatecall(gas(), addr, 0, 0, 0, 0x20)
+
+             }
+
+
+             case 0xF0FA { // CREATE, then CALLSTATIC the created code
+                           // for the result
+
+                // Read the code from 0xC0DEC0DE and create a
+                // contract based on it
+                extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2)
+                addr := create(1000000000000000000, codeBuffer, codeLength2)
+
+                // Call the contract
+                res := staticcall(gas(), addr, 0, 0, 0, 0x20)
+
+             }
+
+             case 0xF5FA { // CREATE2, then STATICCALL the created code
+                           // for the result
+
+                // Read the code from 0xC0DEC0DE and create a
+                // contract based on it
+                extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2)
+                addr := create2(1000000000000000000, codeBuffer, codeLength2, 0x5a17)
+
+                // Call the contract
+                res := staticcall(gas(), addr, 0, 0, 0, 0x20)
+
+             }
+
+              // Recurse (= run backwards)
+              case 0x60BACCFA57 {
+                 mstore(0, 1023)
+                 res := call(gas(), 0x60BACCFA57, 0, 0, 0x20, 0, 0x20)
+              }
+
+
+             default {    // Fail, we should never get here
+               mstore(0, 0xBAD0BAD0BAD0)
+             }
+
+             // If res is zero, that means a call failed, so fail too
+             if iszero(res) { revert(0,0x20) }
+
+             // If addr is zero, that means a create failed, so fail too
+             if iszero(addr) { revert(0,0x20) }
+
+             // Here the result is is mload(0), store it so
+             // the test can check it
+             sstore(0, mload(0))
+          }
+      nonce: 1
+      storage:
+        0: 0x60A7   # To be overwritten by the code snippet
+
+
+
+    # Called to perform the code snippet and return the result
+    000000000000000000000000000000000000ca11:
+      balance: '1000000000000000000'
+      code: |
+          :yul berlin {
+            // basefee is still not supported in Yul 0.8.5
+            
+            
+            mstore(0, verbatim_0i_1o(hex"48"))
+            
+            
+            return(0, 0x20)     // return the result as our return value
+          }
+      nonce: 1
+      storage: {}
+
+
+    # Called to CALL the code (two level call stack)
+    00000000000000000000000000000000ca1100f1:
+      balance: '1000000000000000000'
+      code: |
+          :yul berlin {
+            if iszero(call(gas(), 0xca11, 0, 0, 0, 0, 0x20))
+               { revert(0,0x20) }
+
+            return(0, 0x20)     // return the result as our return value
+          }
+      nonce: 1
+      storage: {}
+
+
+    # Called to CALLCODE the code (two level call stack)
+    00000000000000000000000000000000ca1100f2:
+      balance: '1000000000000000000'
+      code: |
+          :yul berlin {
+            if iszero(callcode(gas(), 0xca11, 0, 0, 0, 0, 0x20))
+               { revert(0,0x20) }
+
+            return(0, 0x20)     // return the result as our return value
+          }
+      nonce: 1
+      storage: {}
+
+
+    # Called to DELEGATECALL the code (two level call stack)
+    00000000000000000000000000000000ca1100f4:
+      balance: '1000000000000000000'
+      code: |
+          :yul berlin {
+            if iszero(delegatecall(gas(), 0xca11, 0, 0, 0, 0x20))
+               { revert(0,0x20) }
+
+            return(0, 0x20)     // return the result as our return value
+          }
+      nonce: 1
+      storage: {}
+
+
+    # Called to STATICCALL the code (two level call stack)
+    00000000000000000000000000000000ca1100fa:
+      balance: '1000000000000000000'
+      code: |
+          :yul berlin {
+            if iszero(staticcall(gas(), 0xca11, 0, 0, 0, 0x20))
+               { revert(0,0x20) }
+
+            return(0, 0x20)     // return the result as our return value
+          }
+      nonce: 1
+      storage: {}
+
+
+    # Failures (to run the code after a failure, see it works)
+
+    # Out of gas
+    0000000000000000000000000000000000060006:
+      balance: '1000000000000000000'
+      code: |
+        :yul berlin {
+           // basefee is still not supported in Yul 0.8.5
+            
+            
+            mstore(0, verbatim_0i_1o(hex"48"))
+            
+            
+           sstore(0,mload(0))
+           invalid()
+        }
+      nonce: 1
+      storage:
+        0: 0x60A7   # If it changes, we have a problem
+
+
+    # REVERT
+    000000000000000000000000000000000060BACC:
+      balance: '1000000000000000000'
+      code: |
+        :yul berlin {
+           // basefee is still not supported in Yul 0.8.5
+            
+            
+            mstore(0, verbatim_0i_1o(hex"48"))
+            
+            
+           sstore(0,mload(0))
+           revert(0,0x20)
+        }
+      nonce: 1
+      storage:
+        0: 0x60A7   # If it changes, we have a problem
+
+
+    # SELFDESTRUCT
+    00000000000000000000000000000000DEADDEAD:
+      balance: '1000000000000000000'
+      code: |
+        :yul berlin {
+           selfdestruct(0)
+        }
+      nonce: 1
+      storage: {}
+
+
+
+
+    # Recursively call until reaching the stack depth, then run the template
+    00000000000000000000000000000060BACCFA57:
+      balance: 1000000000000000000
+      code: |
+        :yul berlin {
+           let depth := calldataload(0)
+
+           if eq(depth,0) {
+               // basefee is still not supported in Yul 0.8.5
+            
+            
+            mstore(0, verbatim_0i_1o(hex"48"))
+            
+            
+               return(0, 0x20)
+           }
+
+           // Dig deeper
+           mstore(0, sub(depth,1))
+
+           // Call yourself with depth-1
+           if iszero(call(gas(), 0x60BACCFA57, 0, 0, 0x20, 0, 0x20)) {
+              // Propagate failure if we failed
+              revert(0, 0x20)
+           }
+
+           // Propagate success
+           return (0, 0x20)
+        }
+      nonce: 1
+      storage: {}
+
+
+
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: 1000000000000000000000
+      code: '0x'
+      nonce: 1
+      storage: {}
+
+
+  transaction:
+    data:
+    # Run the code snippet normally
+    - :label normal :abi f(uint) 0x00
+
+    # Single level call stack
+    # CALL
+    - :label normal :abi f(uint) 0xf1
+    # CALLCODE
+    - :label normal :abi f(uint) 0xf2
+    # DELEGATECALL
+    - :abi f(uint) 0xf4
+    # STATICCALL
+    - :abi f(uint) 0xfa
+
+    # Two level call stack
+    # CALL CALL
+    - :abi f(uint) 0xf1f1
+    # CALLCODE CALL
+    - :abi f(uint) 0xf2f1
+    # DELEGATECALL CALL
+    - :abi f(uint) 0xf4f1
+    # STATICCALL CALL
+    - :abi f(uint) 0xfaf1
+    # CALL CALLCODE
+    - :abi f(uint) 0xf1f2
+    # CALLCODE CALLCODE
+    - :abi f(uint) 0xf2f2
+    # DELEGATECALL CALLCODE
+    - :abi f(uint) 0xf4f2
+    # STATICCALL CALLCODE
+    - :abi f(uint) 0xfaf2
+    # CALL DELEGATECALL
+    - :abi f(uint) 0xf1f4
+    # CALLCODE DELEGATECALL
+    - :abi f(uint) 0xf2f4
+    # DELEGATECALL DELEGATECALL
+    - :abi f(uint) 0xf4f4
+    # STATICCALL DELEGATECALL
+    - :abi f(uint) 0xfaf4
+    # CALL STATICCALL
+    - :abi f(uint) 0xf1fa
+    # CALLCODE STATICCALL
+    - :abi f(uint) 0xf2fa
+    # DELEGATECALL STATICCALL
+    - :abi f(uint) 0xf4fa
+    # STATICCALL STATICCALL
+    - :abi f(uint) 0xfafa
+
+    # Call after something fails
+    # REVERT
+    - :abi f(uint) 0xfd
+    # Out of gas
+    - :abi f(uint) 0xfe
+    # SELFDESTRUCT
+    - :abi f(uint) 0xff
+
+
+    # Combined with creation of contracts
+    # CREATE (run code in the constructor)
+    - :abi f(uint) 0xf0
+    # CREATE2 (run code in the constructor)
+    - :abi f(uint) 0xf5
+    # CREATE and then CALL
+    - :abi f(uint) 0xf0f1
+    # CREATE2 and then CALL
+    - :abi f(uint) 0xf5f1
+    # CREATE and then CALLCODE
+    - :abi f(uint) 0xf0f2
+    # CREATE2 and then CALLCODE
+    - :abi f(uint) 0xf5f2
+    # CREATE and then DELEGATECALL
+    - :abi f(uint) 0xf0f4
+    # CREATE2 and then DELEGATECALL
+    - :abi f(uint) 0xf5f4
+    # CREATE and then STATICCALL
+    - :abi f(uint) 0xf0fa
+    # CREATE2 and then STATICCALL
+    - :abi f(uint) 0xf5fa
+
+
+    gasLimit:
+    - 0xf4240
+    nonce: 1
+    to: cccccccccccccccccccccccccccccccccccccccc
+    value:
+    - 0
+    secretKey: "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"
+    gasPrice: 2000
+
+
+  expect:
+    - indexes:
+        data: !!int -1
+        gas:  !!int -1
+        value: !!int -1
+
+      network:
+        - '>=Osaka'
+
+      result:
+        cccccccccccccccccccccccccccccccccccccccc:
+          storage:
+            # The result we expect
+            0x00: 10
+
+        000000000000000000000000000000000060BACC:
+          storage:
+            0x00: 0x60A7  # Anything that happens should be reverted out of
+
+        0000000000000000000000000000000000060006:
+          storage:
+            0x00: 0x60A7  # Anything that happens should be reverted out of
+
+
+
+
diff --git a/tests/static/state_tests/stEIP1559/gasPriceDiffPlacesFiller.yml b/tests/static/state_tests/stEIP1559/gasPriceDiffPlacesFiller.yml
index 980df08355d..4fe3a135b6a 100644
--- a/tests/static/state_tests/stEIP1559/gasPriceDiffPlacesFiller.yml
+++ b/tests/static/state_tests/stEIP1559/gasPriceDiffPlacesFiller.yml
@@ -649,7 +649,7 @@ gasPriceDiffPlaces:
         value: !!int -1
 
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
 
       result:
         cccccccccccccccccccccccccccccccccccccccc:
diff --git a/tests/static/state_tests/stEIP1559/gasPriceDiffPlacesOsakaFiller.yml b/tests/static/state_tests/stEIP1559/gasPriceDiffPlacesOsakaFiller.yml
new file mode 100644
index 00000000000..61e11075e64
--- /dev/null
+++ b/tests/static/state_tests/stEIP1559/gasPriceDiffPlacesOsakaFiller.yml
@@ -0,0 +1,666 @@
+
+# Created by tests/src/Templates/DiffPlaces/templateGen.js
+#
+# With the template code:
+# mstore(0, gasprice())
+#            
+#            
+#
+# Expected result: 2000
+#
+gasPriceDiffPlaces:
+  _info:
+    comment: Ori Pomerantz   qbzzt1@gmail.com
+
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: 0x20000
+    currentNumber: 1
+    currentTimestamp: 1000
+    currentGasLimit: 0x10000000000000
+    currentBaseFee: 10
+
+  pre:
+
+    # It is not trivial to use the Yul compiler to get the
+    # binary code for the code we're checking, so we'll use EXTCODECOPY
+    # from this contract
+    000000000000000000000000000000000000C0DE:
+      balance: 1000000000000000000
+      code: |
+        :yul berlin {
+           mstore(0, gasprice())
+            
+            
+
+           // Here the result is is mload(0). We want to run it, but
+           // prefix it with a zero so we'll be safe from being considered
+           // an invalid program.
+           //
+           // If we use this as a constructor the result will be
+           // the code of the created contract, but we can live
+           // with that. We won't call it.
+           mstore(0x40, mload(0x00))
+           return(0x3F, 0x21)
+        }
+      nonce: 1
+      storage: {}
+
+    # When we create a contract and then call it, we don't want the
+    # zero prefix in the return value
+    000000000000000000000000000000000020C0DE:
+      balance: 1000000000000000000
+      code: |
+        :yul berlin {
+           mstore(0, gasprice())
+            
+            
+
+           // Here the result is is mload(0).
+           return(0x00, 0x20)
+        }
+      nonce: 1
+      storage: {}
+
+
+
+    # Code for a construct to create a contract with the template code
+    00000000000000000000000000000000C0DEC0DE:
+      balance: 1000000000000000000
+      code: |
+        :yul berlin {
+           let addr := 0x20C0DE
+           let length := extcodesize(addr)
+
+           // Read the code from 0x20C0DE
+           extcodecopy(addr, 0, 0, length)
+
+           // Return this memory as the code for the contract
+           return(0, length)
+        }
+      nonce: 1
+      storage: {}
+
+
+    # Perform the action (directly or indirectly). Either way,
+    # store the result in sload(0).
+    cccccccccccccccccccccccccccccccccccccccc:
+      balance: 1000000000000000000
+      code: |
+          :yul berlin {
+             let action := calldataload(4)
+             let res := 1   // If the result of a call is revert, revert here too
+             let addr := 1  // If the result of CREATE[2] is zero, it reverted
+
+             // For when we need code in our memory
+             let codeBuffer := 0x20
+             // When running the template in the constructor
+             let codeLength := extcodesize(0xC0DE)
+             // When running the template in the created code
+             let codeLength2 := extcodesize(0xC0DEC0DE)
+
+             // Goat should be overwritten
+             mstore(0, 0x60A7)
+
+             switch action
+             case 0 {  // run the code snippet as normal code
+                mstore(0, gasprice())
+            
+            
+             }
+
+             // One level of call stack
+             case 0xF1 {  // call a contract to run this code
+                res := call(gas(), 0xca11, 0, 0, 0, 0, 0x20) // call template code
+             }
+             case 0xF2 {  // callcode a contract to run this code
+                res := callcode(gas(), 0xca11, 0, 0, 0, 0, 0x20)
+             }
+             case 0xF4 {  // delegate call a contract to run this code
+                res := delegatecall(gas(), 0xca11, 0, 0, 0, 0x20)
+             }
+             case 0xFA {  // static call a contract to run this code
+                res := staticcall(gas(), 0xca11, 0, 0, 0, 0x20)
+             }
+
+             // Two levels of call stack
+             case 0xF1F1 {  // call, call
+                res := call(gas(), 0xca1100f1, 0, 0, 0, 0, 0x20)
+             }
+             case 0xF2F1 {  // callcode, call
+                res := callcode(gas(), 0xca1100f1, 0, 0, 0, 0, 0x20)
+             }
+             case 0xF4F1 {  // delegatecall, call
+                res := delegatecall(gas(), 0xca1100f1, 0, 0, 0, 0x20)
+             }
+             case 0xFAF1 {  // staticcall, call
+                res := staticcall(gas(), 0xca1100f1, 0, 0, 0, 0x20)
+             }
+             case 0xF1F2 {  // call, callcode
+                res := call(gas(), 0xca1100f2, 0, 0, 0, 0, 0x20)
+             }
+             case 0xF2F2 {  // callcode, callcode
+                res := callcode(gas(), 0xca1100f2, 0, 0, 0, 0, 0x20)
+             }
+             case 0xF4F2 {  // delegatecall, callcode
+                res := delegatecall(gas(), 0xca1100f2, 0, 0, 0, 0x20)
+             }
+             case 0xFAF2 {  // staticcall, callcode
+                res := staticcall(gas(), 0xca1100f2, 0, 0, 0, 0x20)
+             }
+             case 0xF1F4 {  // call, delegatecall
+                res := call(gas(), 0xca1100f4, 0, 0, 0, 0, 0x20)
+             }
+             case 0xF2F4 {  // callcode, delegatecall
+                res := callcode(gas(), 0xca1100f4, 0, 0, 0, 0, 0x20)
+             }
+             case 0xF4F4 {  // delegatecall, delegatecall
+                res := delegatecall(gas(), 0xca1100f4, 0, 0, 0, 0x20)
+             }
+             case 0xFAF4 {  // staticcall, delegatecall
+                res := staticcall(gas(), 0xca1100f4, 0, 0, 0, 0x20)
+             }
+             case 0xF1FA {  // call, staticcall
+                res := call(gas(), 0xca1100fa, 0, 0, 0, 0, 0x20)
+             }
+             case 0xF2FA {  // callcode, staticcall
+                res := callcode(gas(), 0xca1100fa, 0, 0, 0, 0, 0x20)
+             }
+             case 0xF4FA {  // delegatecall, staticcall
+                res := delegatecall(gas(), 0xca1100fa, 0, 0, 0, 0x20)
+             }
+             case 0xFAFA {  // staticcall, staticcall
+                res := staticcall(gas(), 0xca1100fa, 0, 0, 0, 0x20)
+             }
+             case 0xFD {   // Rerun the code after a REVERT
+                mstore(0, gasprice())
+            
+            
+                sstore(0, mload(0))
+
+                pop(call(gas(), 0x60BACC, 0, 0, 0, 0, 0))
+                mstore(0, gasprice())
+            
+            
+
+                // The two results should be equal
+                if iszero(eq(sload(0), mload(0))) {mstore(0, 0xBADBADBAD)}
+             }
+             case 0xFE {   // Rerun the code after an out of gas
+                mstore(0, gasprice())
+            
+            
+                sstore(0, mload(0))
+
+                pop(call(25000, 0x60006, 0, 0, 0, 0, 0))
+                mstore(0, gasprice())
+            
+            
+
+                // The two results should be equal
+                if iszero(eq(sload(0), mload(0))) {mstore(0, 0xBADBADBAD)}
+             }
+             case 0xFF {   // Rerun the code after a SELFDESTRUCT
+                mstore(0, gasprice())
+            
+            
+                sstore(0, mload(0))
+
+                pop(call(gas(), 0xDEADDEAD, 0, 0, 0, 0, 0))
+                mstore(0, gasprice())
+            
+            
+
+                // The two results should be equal
+                if iszero(eq(sload(0), mload(0))) {mstore(0, 0xBADBADBAD)}
+             }
+
+
+
+             case 0xF0 {  // CREATE, run the code in the constructor
+                // Read the code from 0xC0DE and create a contract based on it
+                extcodecopy(0xC0DE, codeBuffer, 0, codeLength)
+                addr := create(1000000000000000000, codeBuffer, codeLength)
+
+                // Read the created contract, that is the result
+                // We start it from the second byte so the first byte of
+                // code will be STOP (0x00). Otherwise we might run into
+                // invalid program issues (because the result isn't a valid
+                // program
+                extcodecopy(addr, 0, 1, 0x20)
+             }
+
+
+             case 0xF5 {  // CREATE2, run the code in the constructor
+                // Read the code from 0xC0DE and create a contract based on it
+                extcodecopy(0xC0DE, codeBuffer, 0, codeLength)
+                addr := create2(1000000000000000000, codeBuffer, codeLength, 0x5a17)
+
+                // Read the created contract, that is the result
+                // We start it from the second byte so the first byte of
+                // code will be STOP (0x00). Otherwise we might run into
+                // invalid program issues (because the result isn't a valid
+                // program
+                extcodecopy(addr, 0, 1, 0x20)
+             }
+
+             case 0xF0F1 { // CREATE, then CALL the created code for the result
+
+                // Read the code from 0xC0DEC0DE and create a
+                // contract based on it
+                extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2)
+                addr := create(1000000000000000000, codeBuffer, codeLength2)
+
+                // Call the contract
+                res := call(gas(), addr, 0, 0, 0, 0, 0x20)
+
+             }
+
+             case 0xF5F1 { // CREATE2, then CALL the created code for the result
+
+                // Read the code from 0xC0DEC0DE and create a
+                // contract based on it
+                extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2)
+                addr := create2(1000000000000000000, codeBuffer, codeLength2, 0x5a17)
+
+                // Call the contract
+                res := call(gas(), addr, 0, 0, 0, 0, 0x20)
+
+             }
+
+
+             case 0xF0F2 { // CREATE, then CALLCODE the created code
+                           // for the result
+
+                // Read the code from 0xC0DEC0DE and create a
+                // contract based on it
+                extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2)
+
+                // Here we don't transfer cc..cc's ETH to the new contract
+                // because if we run SELFBALANCE it will run in the context
+                // of CC....CC and therefore return 0
+                addr := create(0, codeBuffer, codeLength2)
+
+                // Call the contract
+                res := callcode(gas(), addr, 0, 0, 0, 0, 0x20)
+
+             }
+
+             case 0xF5F2 { // CREATE2, then CALLCODE the created code for
+                           // the result
+
+                // Read the code from 0xC0DEC0DE and create a
+                // contract based on it
+                extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2)
+
+                // Here we don't transfer cc..cc's ETH to the new contract
+                // because if we run SELFBALANCE it will run in the context
+                // of CC....CC and therefore return 0
+                addr := create2(0, codeBuffer, codeLength2, 0x5a17)
+
+                // Call the contract
+                res := callcode(gas(), addr, 0, 0, 0, 0, 0x20)
+
+             }
+
+
+             case 0xF0F4 { // CREATE, then DELEGATECALL the created code
+                           // for the result
+
+                // Read the code from 0xC0DEC0DE and create a
+                // contract based on it
+                extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2)
+
+                // Here we don't transfer cc..cc's ETH to the new contract
+                // because if we run SELFBALANCE it will run in the context
+                // of CC....CC and therefore return 0
+                addr := create(0, codeBuffer, codeLength2)
+
+                // Call the contract
+                res := delegatecall(gas(), addr, 0, 0, 0, 0x20)
+
+             }
+
+             case 0xF5F4 { // CREATE2, then DELEGATECALL the created code
+                           // for the result
+
+                // Read the code from 0xC0DEC0DE and create a
+                // contract based on it
+                extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2)
+
+                // Here we don't transfer cc..cc's ETH to the new contract
+                // because if we run SELFBALANCE it will run in the context
+                // of CC....CC and therefore return 0
+                addr := create2(0, codeBuffer, codeLength2, 0x5a17)
+
+                // Call the contract
+                res := delegatecall(gas(), addr, 0, 0, 0, 0x20)
+
+             }
+
+
+             case 0xF0FA { // CREATE, then CALLSTATIC the created code
+                           // for the result
+
+                // Read the code from 0xC0DEC0DE and create a
+                // contract based on it
+                extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2)
+                addr := create(1000000000000000000, codeBuffer, codeLength2)
+
+                // Call the contract
+                res := staticcall(gas(), addr, 0, 0, 0, 0x20)
+
+             }
+
+             case 0xF5FA { // CREATE2, then STATICCALL the created code
+                           // for the result
+
+                // Read the code from 0xC0DEC0DE and create a
+                // contract based on it
+                extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2)
+                addr := create2(1000000000000000000, codeBuffer, codeLength2, 0x5a17)
+
+                // Call the contract
+                res := staticcall(gas(), addr, 0, 0, 0, 0x20)
+
+             }
+
+              // Recurse (= run backwards)
+              case 0x60BACCFA57 {
+                 mstore(0, 1023)
+                 res := call(gas(), 0x60BACCFA57, 0, 0, 0x20, 0, 0x20)
+              }
+
+
+             default {    // Fail, we should never get here
+               mstore(0, 0xBAD0BAD0BAD0)
+             }
+
+             // If res is zero, that means a call failed, so fail too
+             if iszero(res) { revert(0,0x20) }
+
+             // If addr is zero, that means a create failed, so fail too
+             if iszero(addr) { revert(0,0x20) }
+
+             // Here the result is is mload(0), store it so
+             // the test can check it
+             sstore(0, mload(0))
+          }
+      nonce: 1
+      storage:
+        0: 0x60A7   # To be overwritten by the code snippet
+
+
+
+    # Called to perform the code snippet and return the result
+    000000000000000000000000000000000000ca11:
+      balance: '1000000000000000000'
+      code: |
+          :yul berlin {
+            mstore(0, gasprice())
+            
+            
+            return(0, 0x20)     // return the result as our return value
+          }
+      nonce: 1
+      storage: {}
+
+
+    # Called to CALL the code (two level call stack)
+    00000000000000000000000000000000ca1100f1:
+      balance: '1000000000000000000'
+      code: |
+          :yul berlin {
+            if iszero(call(gas(), 0xca11, 0, 0, 0, 0, 0x20))
+               { revert(0,0x20) }
+
+            return(0, 0x20)     // return the result as our return value
+          }
+      nonce: 1
+      storage: {}
+
+
+    # Called to CALLCODE the code (two level call stack)
+    00000000000000000000000000000000ca1100f2:
+      balance: '1000000000000000000'
+      code: |
+          :yul berlin {
+            if iszero(callcode(gas(), 0xca11, 0, 0, 0, 0, 0x20))
+               { revert(0,0x20) }
+
+            return(0, 0x20)     // return the result as our return value
+          }
+      nonce: 1
+      storage: {}
+
+
+    # Called to DELEGATECALL the code (two level call stack)
+    00000000000000000000000000000000ca1100f4:
+      balance: '1000000000000000000'
+      code: |
+          :yul berlin {
+            if iszero(delegatecall(gas(), 0xca11, 0, 0, 0, 0x20))
+               { revert(0,0x20) }
+
+            return(0, 0x20)     // return the result as our return value
+          }
+      nonce: 1
+      storage: {}
+
+
+    # Called to STATICCALL the code (two level call stack)
+    00000000000000000000000000000000ca1100fa:
+      balance: '1000000000000000000'
+      code: |
+          :yul berlin {
+            if iszero(staticcall(gas(), 0xca11, 0, 0, 0, 0x20))
+               { revert(0,0x20) }
+
+            return(0, 0x20)     // return the result as our return value
+          }
+      nonce: 1
+      storage: {}
+
+
+    # Failures (to run the code after a failure, see it works)
+
+    # Out of gas
+    0000000000000000000000000000000000060006:
+      balance: '1000000000000000000'
+      code: |
+        :yul berlin {
+           mstore(0, gasprice())
+            
+            
+           sstore(0,mload(0))
+           invalid()
+        }
+      nonce: 1
+      storage:
+        0: 0x60A7   # If it changes, we have a problem
+
+
+    # REVERT
+    000000000000000000000000000000000060BACC:
+      balance: '1000000000000000000'
+      code: |
+        :yul berlin {
+           mstore(0, gasprice())
+            
+            
+           sstore(0,mload(0))
+           revert(0,0x20)
+        }
+      nonce: 1
+      storage:
+        0: 0x60A7   # If it changes, we have a problem
+
+
+    # SELFDESTRUCT
+    00000000000000000000000000000000DEADDEAD:
+      balance: '1000000000000000000'
+      code: |
+        :yul berlin {
+           selfdestruct(0)
+        }
+      nonce: 1
+      storage: {}
+
+
+
+
+    # Recursively call until reaching the stack depth, then run the template
+    00000000000000000000000000000060BACCFA57:
+      balance: 1000000000000000000
+      code: |
+        :yul berlin {
+           let depth := calldataload(0)
+
+           if eq(depth,0) {
+               mstore(0, gasprice())
+            
+            
+               return(0, 0x20)
+           }
+
+           // Dig deeper
+           mstore(0, sub(depth,1))
+
+           // Call yourself with depth-1
+           if iszero(call(gas(), 0x60BACCFA57, 0, 0, 0x20, 0, 0x20)) {
+              // Propagate failure if we failed
+              revert(0, 0x20)
+           }
+
+           // Propagate success
+           return (0, 0x20)
+        }
+      nonce: 1
+      storage: {}
+
+
+
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: 1000000000000000000000
+      code: '0x'
+      nonce: 1
+      storage: {}
+
+
+  transaction:
+    data:
+    # Run the code snippet normally
+    - :label normal :abi f(uint) 0x00
+
+    # Single level call stack
+    # CALL
+    - :label normal :abi f(uint) 0xf1
+    # CALLCODE
+    - :label normal :abi f(uint) 0xf2
+    # DELEGATECALL
+    - :abi f(uint) 0xf4
+    # STATICCALL
+    - :abi f(uint) 0xfa
+
+    # Two level call stack
+    # CALL CALL
+    - :abi f(uint) 0xf1f1
+    # CALLCODE CALL
+    - :abi f(uint) 0xf2f1
+    # DELEGATECALL CALL
+    - :abi f(uint) 0xf4f1
+    # STATICCALL CALL
+    - :abi f(uint) 0xfaf1
+    # CALL CALLCODE
+    - :abi f(uint) 0xf1f2
+    # CALLCODE CALLCODE
+    - :abi f(uint) 0xf2f2
+    # DELEGATECALL CALLCODE
+    - :abi f(uint) 0xf4f2
+    # STATICCALL CALLCODE
+    - :abi f(uint) 0xfaf2
+    # CALL DELEGATECALL
+    - :abi f(uint) 0xf1f4
+    # CALLCODE DELEGATECALL
+    - :abi f(uint) 0xf2f4
+    # DELEGATECALL DELEGATECALL
+    - :abi f(uint) 0xf4f4
+    # STATICCALL DELEGATECALL
+    - :abi f(uint) 0xfaf4
+    # CALL STATICCALL
+    - :abi f(uint) 0xf1fa
+    # CALLCODE STATICCALL
+    - :abi f(uint) 0xf2fa
+    # DELEGATECALL STATICCALL
+    - :abi f(uint) 0xf4fa
+    # STATICCALL STATICCALL
+    - :abi f(uint) 0xfafa
+
+    # Call after something fails
+    # REVERT
+    - :abi f(uint) 0xfd
+    # Out of gas
+    - :abi f(uint) 0xfe
+    # SELFDESTRUCT
+    - :abi f(uint) 0xff
+
+
+    # Combined with creation of contracts
+    # CREATE (run code in the constructor)
+    - :abi f(uint) 0xf0
+    # CREATE2 (run code in the constructor)
+    - :abi f(uint) 0xf5
+    # CREATE and then CALL
+    - :abi f(uint) 0xf0f1
+    # CREATE2 and then CALL
+    - :abi f(uint) 0xf5f1
+    # CREATE and then CALLCODE
+    - :abi f(uint) 0xf0f2
+    # CREATE2 and then CALLCODE
+    - :abi f(uint) 0xf5f2
+    # CREATE and then DELEGATECALL
+    - :abi f(uint) 0xf0f4
+    # CREATE2 and then DELEGATECALL
+    - :abi f(uint) 0xf5f4
+    # CREATE and then STATICCALL
+    - :abi f(uint) 0xf0fa
+    # CREATE2 and then STATICCALL
+    - :abi f(uint) 0xf5fa
+
+
+    gasLimit:
+    - 0xf4240
+    nonce: 1
+    to: cccccccccccccccccccccccccccccccccccccccc
+    value:
+    - 0
+    secretKey: "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"
+    gasPrice: 2000
+
+
+  expect:
+    - indexes:
+        data: !!int -1
+        gas:  !!int -1
+        value: !!int -1
+
+      network:
+        - '>=Osaka'
+
+      result:
+        cccccccccccccccccccccccccccccccccccccccc:
+          storage:
+            # The result we expect
+            0x00: 2000
+
+        000000000000000000000000000000000060BACC:
+          storage:
+            0x00: 0x60A7  # Anything that happens should be reverted out of
+
+        0000000000000000000000000000000000060006:
+          storage:
+            0x00: 0x60A7  # Anything that happens should be reverted out of
+
+
+
+
diff --git a/tests/static/state_tests/stEIP1559/outOfFundsFiller.yml b/tests/static/state_tests/stEIP1559/outOfFundsFiller.yml
index 00ea02062b3..e43e0f71815 100644
--- a/tests/static/state_tests/stEIP1559/outOfFundsFiller.yml
+++ b/tests/static/state_tests/stEIP1559/outOfFundsFiller.yml
@@ -33,10 +33,10 @@ outOfFunds:
     data:
         - data: :label declaredKeyWrite :raw 0x00
           accessList: []
-    maxFeePerGas: 10000000000
-    maxPriorityFeePerGas:  10000000000
+    maxFeePerGas: 100000000000
+    maxPriorityFeePerGas:  100000000000
     gasLimit:
-    - 40000000000000
+    - 16777216
     - 40000
     nonce: 1
     to: <contract:target:0xcccccccccccccccccccccccccccccccccccccccc>
diff --git a/tests/static/state_tests/stEIP1559/outOfFundsOldTypesFiller.yml b/tests/static/state_tests/stEIP1559/outOfFundsOldTypesFiller.yml
index 42dc58c77e2..7d242d20913 100644
--- a/tests/static/state_tests/stEIP1559/outOfFundsOldTypesFiller.yml
+++ b/tests/static/state_tests/stEIP1559/outOfFundsOldTypesFiller.yml
@@ -34,9 +34,9 @@ outOfFundsOldTypes:
         - :raw 0x00
         - data: :raw 0x01
           accessList: []
-    gasPrice: 10000000000
+    gasPrice: 100000000000
     gasLimit:
-    - 40000000000000
+    - 16777216
     - 40000
     nonce: 1
     to: <contract:target:0xcccccccccccccccccccccccccccccccccccccccc>
diff --git a/tests/static/state_tests/stInitCodeTest/CallContractToCreateContractNoCashFiller.json b/tests/static/state_tests/stInitCodeTest/CallContractToCreateContractNoCashFiller.json
index 48a1cd91751..50458e5d131 100644
--- a/tests/static/state_tests/stInitCodeTest/CallContractToCreateContractNoCashFiller.json
+++ b/tests/static/state_tests/stInitCodeTest/CallContractToCreateContractNoCashFiller.json
@@ -47,7 +47,7 @@
                 ":raw 0x00"
             ],
             "gasLimit" : [
-                "20000000"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stInitCodeTest/CallContractToCreateContractOOGBonusGasFiller.json b/tests/static/state_tests/stInitCodeTest/CallContractToCreateContractOOGBonusGasFiller.json
index dcd50287d17..7e2cc3d16c4 100644
--- a/tests/static/state_tests/stInitCodeTest/CallContractToCreateContractOOGBonusGasFiller.json
+++ b/tests/static/state_tests/stInitCodeTest/CallContractToCreateContractOOGBonusGasFiller.json
@@ -57,7 +57,7 @@
                 ":raw 0x00"
             ],
             "gasLimit" : [
-                "20000000"
+                "200000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stInitCodeTest/CallContractToCreateContractOOGFiller.json b/tests/static/state_tests/stInitCodeTest/CallContractToCreateContractOOGFiller.json
index fbe2339ba1e..5d363463c8e 100644
--- a/tests/static/state_tests/stInitCodeTest/CallContractToCreateContractOOGFiller.json
+++ b/tests/static/state_tests/stInitCodeTest/CallContractToCreateContractOOGFiller.json
@@ -47,7 +47,7 @@
                 ":raw 0x00"
             ],
             "gasLimit" : [
-                "20000000"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json b/tests/static/state_tests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json
index dbf9ad198f9..8e438fed842 100644
--- a/tests/static/state_tests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json
+++ b/tests/static/state_tests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json
@@ -60,7 +60,7 @@
                 ":raw 0x00"
             ],
             "gasLimit" : [
-                "20000000"
+                "200000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCodeFiller.json b/tests/static/state_tests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCodeFiller.json
index 2a08591e945..f43b68b7d05 100644
--- a/tests/static/state_tests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCodeFiller.json
+++ b/tests/static/state_tests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCodeFiller.json
@@ -57,7 +57,7 @@
                 ":raw 0x00"
             ],
             "gasLimit" : [
-                "20000000"
+                "200000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/CALLCODE_Bounds2Filler.json b/tests/static/state_tests/stMemoryStressTest/CALLCODE_Bounds2Filler.json
index 2f862c035e2..84928ed0f42 100644
--- a/tests/static/state_tests/stMemoryStressTest/CALLCODE_Bounds2Filler.json
+++ b/tests/static/state_tests/stMemoryStressTest/CALLCODE_Bounds2Filler.json
@@ -58,7 +58,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/CALLCODE_Bounds3Filler.json b/tests/static/state_tests/stMemoryStressTest/CALLCODE_Bounds3Filler.json
index 29eeccdd991..3986ec4b95f 100644
--- a/tests/static/state_tests/stMemoryStressTest/CALLCODE_Bounds3Filler.json
+++ b/tests/static/state_tests/stMemoryStressTest/CALLCODE_Bounds3Filler.json
@@ -58,7 +58,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/CALLCODE_Bounds4Filler.json b/tests/static/state_tests/stMemoryStressTest/CALLCODE_Bounds4Filler.json
index f6197d669cf..91fd87de085 100644
--- a/tests/static/state_tests/stMemoryStressTest/CALLCODE_Bounds4Filler.json
+++ b/tests/static/state_tests/stMemoryStressTest/CALLCODE_Bounds4Filler.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "1000000", "250000000"
+                "150000", "1000000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/CALLCODE_BoundsFiller.json b/tests/static/state_tests/stMemoryStressTest/CALLCODE_BoundsFiller.json
index 6a17133f6fe..eb4df102fc2 100644
--- a/tests/static/state_tests/stMemoryStressTest/CALLCODE_BoundsFiller.json
+++ b/tests/static/state_tests/stMemoryStressTest/CALLCODE_BoundsFiller.json
@@ -57,7 +57,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/CALL_Bounds2Filler.json b/tests/static/state_tests/stMemoryStressTest/CALL_Bounds2Filler.json
index 7b1647f898a..d2c0998dade 100644
--- a/tests/static/state_tests/stMemoryStressTest/CALL_Bounds2Filler.json
+++ b/tests/static/state_tests/stMemoryStressTest/CALL_Bounds2Filler.json
@@ -59,7 +59,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/CALL_Bounds2aFiller.json b/tests/static/state_tests/stMemoryStressTest/CALL_Bounds2aFiller.json
index dbc3f840960..cb637afdbe4 100644
--- a/tests/static/state_tests/stMemoryStressTest/CALL_Bounds2aFiller.json
+++ b/tests/static/state_tests/stMemoryStressTest/CALL_Bounds2aFiller.json
@@ -59,7 +59,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/CALL_Bounds3Filler.json b/tests/static/state_tests/stMemoryStressTest/CALL_Bounds3Filler.json
index 23b2158e9c9..fdb22d28f11 100644
--- a/tests/static/state_tests/stMemoryStressTest/CALL_Bounds3Filler.json
+++ b/tests/static/state_tests/stMemoryStressTest/CALL_Bounds3Filler.json
@@ -55,7 +55,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "1000000", "250000000"
+                "150000", "1000000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/CALL_BoundsFiller.json b/tests/static/state_tests/stMemoryStressTest/CALL_BoundsFiller.json
index 8e761183160..f7090d8a0f1 100644
--- a/tests/static/state_tests/stMemoryStressTest/CALL_BoundsFiller.json
+++ b/tests/static/state_tests/stMemoryStressTest/CALL_BoundsFiller.json
@@ -59,7 +59,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/CREATE_Bounds2Filler.json b/tests/static/state_tests/stMemoryStressTest/CREATE_Bounds2Filler.json
index 6d6703f15db..80f1cd3958f 100644
--- a/tests/static/state_tests/stMemoryStressTest/CREATE_Bounds2Filler.json
+++ b/tests/static/state_tests/stMemoryStressTest/CREATE_Bounds2Filler.json
@@ -48,7 +48,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/CREATE_Bounds3Filler.json b/tests/static/state_tests/stMemoryStressTest/CREATE_Bounds3Filler.json
index 8260587076e..ea1b83b81af 100644
--- a/tests/static/state_tests/stMemoryStressTest/CREATE_Bounds3Filler.json
+++ b/tests/static/state_tests/stMemoryStressTest/CREATE_Bounds3Filler.json
@@ -46,7 +46,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "1000000", "250000000"
+                "150000", "1000000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/CREATE_BoundsFiller.json b/tests/static/state_tests/stMemoryStressTest/CREATE_BoundsFiller.json
index 09fc1741b1f..23883d61eff 100644
--- a/tests/static/state_tests/stMemoryStressTest/CREATE_BoundsFiller.json
+++ b/tests/static/state_tests/stMemoryStressTest/CREATE_BoundsFiller.json
@@ -51,7 +51,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/DELEGATECALL_Bounds2Filler.json b/tests/static/state_tests/stMemoryStressTest/DELEGATECALL_Bounds2Filler.json
index a254652d137..e3afeb18ebf 100644
--- a/tests/static/state_tests/stMemoryStressTest/DELEGATECALL_Bounds2Filler.json
+++ b/tests/static/state_tests/stMemoryStressTest/DELEGATECALL_Bounds2Filler.json
@@ -56,7 +56,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/DELEGATECALL_Bounds3Filler.json b/tests/static/state_tests/stMemoryStressTest/DELEGATECALL_Bounds3Filler.json
index 212f772602a..2a0e9b485f3 100644
--- a/tests/static/state_tests/stMemoryStressTest/DELEGATECALL_Bounds3Filler.json
+++ b/tests/static/state_tests/stMemoryStressTest/DELEGATECALL_Bounds3Filler.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "1000000", "250000000"
+                "150000", "1000000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/DELEGATECALL_BoundsFiller.json b/tests/static/state_tests/stMemoryStressTest/DELEGATECALL_BoundsFiller.json
index 58b87668c5a..9ef38f1a65a 100644
--- a/tests/static/state_tests/stMemoryStressTest/DELEGATECALL_BoundsFiller.json
+++ b/tests/static/state_tests/stMemoryStressTest/DELEGATECALL_BoundsFiller.json
@@ -57,7 +57,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/DUP_BoundsFiller.json b/tests/static/state_tests/stMemoryStressTest/DUP_BoundsFiller.json
index cb2d297d373..ca07126efb5 100644
--- a/tests/static/state_tests/stMemoryStressTest/DUP_BoundsFiller.json
+++ b/tests/static/state_tests/stMemoryStressTest/DUP_BoundsFiller.json
@@ -44,7 +44,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "1000000", "250000000"
+                "150000", "1000000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/FillStackFiller.json b/tests/static/state_tests/stMemoryStressTest/FillStackFiller.json
index 7178ab9fb4a..6d9c616c037 100644
--- a/tests/static/state_tests/stMemoryStressTest/FillStackFiller.json
+++ b/tests/static/state_tests/stMemoryStressTest/FillStackFiller.json
@@ -98,7 +98,7 @@
                 ":raw 0x5b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3504357155320803a97"
             ],
             "gasLimit" : [
-                "3141592", "250000000"
+                "3141592", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/JUMPI_BoundsFiller.json b/tests/static/state_tests/stMemoryStressTest/JUMPI_BoundsFiller.json
index d6bd279a114..c62ed8c088d 100644
--- a/tests/static/state_tests/stMemoryStressTest/JUMPI_BoundsFiller.json
+++ b/tests/static/state_tests/stMemoryStressTest/JUMPI_BoundsFiller.json
@@ -44,7 +44,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/JUMP_Bounds2Filler.json b/tests/static/state_tests/stMemoryStressTest/JUMP_Bounds2Filler.json
index 6d8adfd7f0f..ff3b113e016 100644
--- a/tests/static/state_tests/stMemoryStressTest/JUMP_Bounds2Filler.json
+++ b/tests/static/state_tests/stMemoryStressTest/JUMP_Bounds2Filler.json
@@ -45,7 +45,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/JUMP_BoundsFiller.json b/tests/static/state_tests/stMemoryStressTest/JUMP_BoundsFiller.json
index 39ed17c9ee2..77832f6b3d8 100644
--- a/tests/static/state_tests/stMemoryStressTest/JUMP_BoundsFiller.json
+++ b/tests/static/state_tests/stMemoryStressTest/JUMP_BoundsFiller.json
@@ -43,7 +43,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/MLOAD_Bounds2Filler.json b/tests/static/state_tests/stMemoryStressTest/MLOAD_Bounds2Filler.json
index f9b8bd74fa3..c67d90db4b1 100644
--- a/tests/static/state_tests/stMemoryStressTest/MLOAD_Bounds2Filler.json
+++ b/tests/static/state_tests/stMemoryStressTest/MLOAD_Bounds2Filler.json
@@ -43,7 +43,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/MLOAD_Bounds3Filler.json b/tests/static/state_tests/stMemoryStressTest/MLOAD_Bounds3Filler.json
index 410957674c3..9a5767a5ad5 100644
--- a/tests/static/state_tests/stMemoryStressTest/MLOAD_Bounds3Filler.json
+++ b/tests/static/state_tests/stMemoryStressTest/MLOAD_Bounds3Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
 	    	    "<contract:target:0x1000000000000000000000000000000000000000>" : {
                 	"balance" : "1"
diff --git a/tests/static/state_tests/stMemoryStressTest/MLOAD_BoundsFiller.json b/tests/static/state_tests/stMemoryStressTest/MLOAD_BoundsFiller.json
index c9558e0e433..6895908ce8e 100644
--- a/tests/static/state_tests/stMemoryStressTest/MLOAD_BoundsFiller.json
+++ b/tests/static/state_tests/stMemoryStressTest/MLOAD_BoundsFiller.json
@@ -45,7 +45,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/MSTORE_Bounds2Filler.json b/tests/static/state_tests/stMemoryStressTest/MSTORE_Bounds2Filler.json
index 806c2e3c346..28299e1bea3 100644
--- a/tests/static/state_tests/stMemoryStressTest/MSTORE_Bounds2Filler.json
+++ b/tests/static/state_tests/stMemoryStressTest/MSTORE_Bounds2Filler.json
@@ -44,7 +44,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/MSTORE_Bounds2aFiller.json b/tests/static/state_tests/stMemoryStressTest/MSTORE_Bounds2aFiller.json
index b8da083dbde..6953e140e66 100644
--- a/tests/static/state_tests/stMemoryStressTest/MSTORE_Bounds2aFiller.json
+++ b/tests/static/state_tests/stMemoryStressTest/MSTORE_Bounds2aFiller.json
@@ -15,7 +15,7 @@
                     "gas" : 1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
 	    	    "<contract:target:0x1000000000000000000000000000000000000000>" : {
                 	"balance" : "1"
@@ -28,7 +28,7 @@
                     "gas" : 0,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
 	    	    "<contract:target:0x1000000000000000000000000000000000000000>" : {
                 	"balance" : "0"
diff --git a/tests/static/state_tests/stMemoryStressTest/MSTORE_BoundsFiller.json b/tests/static/state_tests/stMemoryStressTest/MSTORE_BoundsFiller.json
index 08dec607629..e58b5d99cfd 100644
--- a/tests/static/state_tests/stMemoryStressTest/MSTORE_BoundsFiller.json
+++ b/tests/static/state_tests/stMemoryStressTest/MSTORE_BoundsFiller.json
@@ -43,7 +43,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/POP_BoundsFiller.json b/tests/static/state_tests/stMemoryStressTest/POP_BoundsFiller.json
index b47d07f0588..bbab3e2c80f 100644
--- a/tests/static/state_tests/stMemoryStressTest/POP_BoundsFiller.json
+++ b/tests/static/state_tests/stMemoryStressTest/POP_BoundsFiller.json
@@ -43,7 +43,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/SLOAD_BoundsFiller.json b/tests/static/state_tests/stMemoryStressTest/SLOAD_BoundsFiller.json
index 7a07a02035b..1e2d9f987ee 100644
--- a/tests/static/state_tests/stMemoryStressTest/SLOAD_BoundsFiller.json
+++ b/tests/static/state_tests/stMemoryStressTest/SLOAD_BoundsFiller.json
@@ -43,7 +43,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/SSTORE_BoundsFiller.json b/tests/static/state_tests/stMemoryStressTest/SSTORE_BoundsFiller.json
index 76919af4f74..25352b8ef7f 100644
--- a/tests/static/state_tests/stMemoryStressTest/SSTORE_BoundsFiller.json
+++ b/tests/static/state_tests/stMemoryStressTest/SSTORE_BoundsFiller.json
@@ -68,7 +68,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/mload32bitBound2Filler.json b/tests/static/state_tests/stMemoryStressTest/mload32bitBound2Filler.json
index ac29c7735cf..0605cbcca5f 100644
--- a/tests/static/state_tests/stMemoryStressTest/mload32bitBound2Filler.json
+++ b/tests/static/state_tests/stMemoryStressTest/mload32bitBound2Filler.json
@@ -78,7 +78,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/mload32bitBoundFiller.json b/tests/static/state_tests/stMemoryStressTest/mload32bitBoundFiller.json
index 33870b5ebbb..b44056df9ce 100644
--- a/tests/static/state_tests/stMemoryStressTest/mload32bitBoundFiller.json
+++ b/tests/static/state_tests/stMemoryStressTest/mload32bitBoundFiller.json
@@ -76,7 +76,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/mload32bitBound_MsizeFiller.json b/tests/static/state_tests/stMemoryStressTest/mload32bitBound_MsizeFiller.json
index 61742f23de9..bba6af234db 100644
--- a/tests/static/state_tests/stMemoryStressTest/mload32bitBound_MsizeFiller.json
+++ b/tests/static/state_tests/stMemoryStressTest/mload32bitBound_MsizeFiller.json
@@ -78,7 +78,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/mload32bitBound_return2Filler.json b/tests/static/state_tests/stMemoryStressTest/mload32bitBound_return2Filler.json
index 45a0ce70796..a2925325fc1 100644
--- a/tests/static/state_tests/stMemoryStressTest/mload32bitBound_return2Filler.json
+++ b/tests/static/state_tests/stMemoryStressTest/mload32bitBound_return2Filler.json
@@ -42,7 +42,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/mload32bitBound_returnFiller.json b/tests/static/state_tests/stMemoryStressTest/mload32bitBound_returnFiller.json
index 04c50ea1a87..44eceec77de 100644
--- a/tests/static/state_tests/stMemoryStressTest/mload32bitBound_returnFiller.json
+++ b/tests/static/state_tests/stMemoryStressTest/mload32bitBound_returnFiller.json
@@ -42,7 +42,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/static_CALL_Bounds2Filler.json b/tests/static/state_tests/stMemoryStressTest/static_CALL_Bounds2Filler.json
index a22a94c4266..917148fb6fd 100644
--- a/tests/static/state_tests/stMemoryStressTest/static_CALL_Bounds2Filler.json
+++ b/tests/static/state_tests/stMemoryStressTest/static_CALL_Bounds2Filler.json
@@ -59,7 +59,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/static_CALL_Bounds2aFiller.json b/tests/static/state_tests/stMemoryStressTest/static_CALL_Bounds2aFiller.json
index a0bfbca9c94..92253c71ec0 100644
--- a/tests/static/state_tests/stMemoryStressTest/static_CALL_Bounds2aFiller.json
+++ b/tests/static/state_tests/stMemoryStressTest/static_CALL_Bounds2aFiller.json
@@ -58,7 +58,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/static_CALL_Bounds3Filler.json b/tests/static/state_tests/stMemoryStressTest/static_CALL_Bounds3Filler.json
index 409ec39c01e..43356805e16 100644
--- a/tests/static/state_tests/stMemoryStressTest/static_CALL_Bounds3Filler.json
+++ b/tests/static/state_tests/stMemoryStressTest/static_CALL_Bounds3Filler.json
@@ -55,7 +55,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryStressTest/static_CALL_BoundsFiller.json b/tests/static/state_tests/stMemoryStressTest/static_CALL_BoundsFiller.json
index 3dc40956ba8..fd623b12777 100644
--- a/tests/static/state_tests/stMemoryStressTest/static_CALL_BoundsFiller.json
+++ b/tests/static/state_tests/stMemoryStressTest/static_CALL_BoundsFiller.json
@@ -59,7 +59,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16777216"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/calldatacopy_dejavu2Filler.json b/tests/static/state_tests/stMemoryTest/calldatacopy_dejavu2Filler.json
index c7d56a026b7..23a8683e14e 100644
--- a/tests/static/state_tests/stMemoryTest/calldatacopy_dejavu2Filler.json
+++ b/tests/static/state_tests/stMemoryTest/calldatacopy_dejavu2Filler.json
@@ -54,7 +54,7 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/calldatacopy_dejavuFiller.json b/tests/static/state_tests/stMemoryTest/calldatacopy_dejavuFiller.json
index 9d8de36d866..1f3a40bfa92 100644
--- a/tests/static/state_tests/stMemoryTest/calldatacopy_dejavuFiller.json
+++ b/tests/static/state_tests/stMemoryTest/calldatacopy_dejavuFiller.json
@@ -52,7 +52,7 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/codecopy_dejavu2Filler.json b/tests/static/state_tests/stMemoryTest/codecopy_dejavu2Filler.json
index 6f5fd0cbed6..e57d43cf117 100644
--- a/tests/static/state_tests/stMemoryTest/codecopy_dejavu2Filler.json
+++ b/tests/static/state_tests/stMemoryTest/codecopy_dejavu2Filler.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/codecopy_dejavuFiller.json b/tests/static/state_tests/stMemoryTest/codecopy_dejavuFiller.json
index a279adf33d9..bad72b1fdc9 100644
--- a/tests/static/state_tests/stMemoryTest/codecopy_dejavuFiller.json
+++ b/tests/static/state_tests/stMemoryTest/codecopy_dejavuFiller.json
@@ -52,7 +52,7 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/extcodecopy_dejavuFiller.json b/tests/static/state_tests/stMemoryTest/extcodecopy_dejavuFiller.json
index 612eed69da9..80302e9b650 100644
--- a/tests/static/state_tests/stMemoryTest/extcodecopy_dejavuFiller.json
+++ b/tests/static/state_tests/stMemoryTest/extcodecopy_dejavuFiller.json
@@ -52,7 +52,7 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/log1_dejavuFiller.json b/tests/static/state_tests/stMemoryTest/log1_dejavuFiller.json
index 34cdd4f0c77..38c36f737b6 100644
--- a/tests/static/state_tests/stMemoryTest/log1_dejavuFiller.json
+++ b/tests/static/state_tests/stMemoryTest/log1_dejavuFiller.json
@@ -52,7 +52,7 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/log2_dejavuFiller.json b/tests/static/state_tests/stMemoryTest/log2_dejavuFiller.json
index 8d3636212e9..052908bcf0d 100644
--- a/tests/static/state_tests/stMemoryTest/log2_dejavuFiller.json
+++ b/tests/static/state_tests/stMemoryTest/log2_dejavuFiller.json
@@ -52,7 +52,7 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/log3_dejavuFiller.json b/tests/static/state_tests/stMemoryTest/log3_dejavuFiller.json
index 9556515e8c0..9a07ef53d40 100644
--- a/tests/static/state_tests/stMemoryTest/log3_dejavuFiller.json
+++ b/tests/static/state_tests/stMemoryTest/log3_dejavuFiller.json
@@ -52,7 +52,7 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/log4_dejavuFiller.json b/tests/static/state_tests/stMemoryTest/log4_dejavuFiller.json
index c6281fce970..eb0aa5bc9ca 100644
--- a/tests/static/state_tests/stMemoryTest/log4_dejavuFiller.json
+++ b/tests/static/state_tests/stMemoryTest/log4_dejavuFiller.json
@@ -52,7 +52,7 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem0b_singleByteFiller.json b/tests/static/state_tests/stMemoryTest/mem0b_singleByteFiller.json
index 1be2341de0f..48ea53e15f9 100644
--- a/tests/static/state_tests/stMemoryTest/mem0b_singleByteFiller.json
+++ b/tests/static/state_tests/stMemoryTest/mem0b_singleByteFiller.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem31b_singleByteFiller.json b/tests/static/state_tests/stMemoryTest/mem31b_singleByteFiller.json
index b6c0aa6a6a4..7df349892c7 100644
--- a/tests/static/state_tests/stMemoryTest/mem31b_singleByteFiller.json
+++ b/tests/static/state_tests/stMemoryTest/mem31b_singleByteFiller.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem32b_singleByteFiller.json b/tests/static/state_tests/stMemoryTest/mem32b_singleByteFiller.json
index 310ff1ca934..3f91e6a9e27 100644
--- a/tests/static/state_tests/stMemoryTest/mem32b_singleByteFiller.json
+++ b/tests/static/state_tests/stMemoryTest/mem32b_singleByteFiller.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem32kb+1Filler.json b/tests/static/state_tests/stMemoryTest/mem32kb+1Filler.json
index 021bc926391..0f6bc79628e 100644
--- a/tests/static/state_tests/stMemoryTest/mem32kb+1Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem32kb+1Filler.json
@@ -54,7 +54,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem32kb+31Filler.json b/tests/static/state_tests/stMemoryTest/mem32kb+31Filler.json
index c24f7ac60c3..d5d6fc5f236 100644
--- a/tests/static/state_tests/stMemoryTest/mem32kb+31Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem32kb+31Filler.json
@@ -54,7 +54,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem32kb+32Filler.json b/tests/static/state_tests/stMemoryTest/mem32kb+32Filler.json
index 5723c82ee6f..3249206f066 100644
--- a/tests/static/state_tests/stMemoryTest/mem32kb+32Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem32kb+32Filler.json
@@ -54,7 +54,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem32kb+33Filler.json b/tests/static/state_tests/stMemoryTest/mem32kb+33Filler.json
index c13d6f7f4b3..9a9326d074e 100644
--- a/tests/static/state_tests/stMemoryTest/mem32kb+33Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem32kb+33Filler.json
@@ -54,7 +54,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem32kb-1Filler.json b/tests/static/state_tests/stMemoryTest/mem32kb-1Filler.json
index d068d9ff359..8a1f35a43aa 100644
--- a/tests/static/state_tests/stMemoryTest/mem32kb-1Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem32kb-1Filler.json
@@ -54,7 +54,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem32kb-31Filler.json b/tests/static/state_tests/stMemoryTest/mem32kb-31Filler.json
index 454d196cd46..f881a948171 100644
--- a/tests/static/state_tests/stMemoryTest/mem32kb-31Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem32kb-31Filler.json
@@ -54,7 +54,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem32kb-32Filler.json b/tests/static/state_tests/stMemoryTest/mem32kb-32Filler.json
index 8dd6e0a78ee..79ffae293ae 100644
--- a/tests/static/state_tests/stMemoryTest/mem32kb-32Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem32kb-32Filler.json
@@ -54,7 +54,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem32kb-33Filler.json b/tests/static/state_tests/stMemoryTest/mem32kb-33Filler.json
index acce1bc66bd..e94ba04b056 100644
--- a/tests/static/state_tests/stMemoryTest/mem32kb-33Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem32kb-33Filler.json
@@ -54,7 +54,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem32kbFiller.json b/tests/static/state_tests/stMemoryTest/mem32kbFiller.json
index aae159a040f..6d6d1792153 100644
--- a/tests/static/state_tests/stMemoryTest/mem32kbFiller.json
+++ b/tests/static/state_tests/stMemoryTest/mem32kbFiller.json
@@ -54,7 +54,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem32kb_singleByte+1Filler.json b/tests/static/state_tests/stMemoryTest/mem32kb_singleByte+1Filler.json
index 7fc87335890..16b884733e2 100644
--- a/tests/static/state_tests/stMemoryTest/mem32kb_singleByte+1Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem32kb_singleByte+1Filler.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem32kb_singleByte+31Filler.json b/tests/static/state_tests/stMemoryTest/mem32kb_singleByte+31Filler.json
index cdff058c369..8b44993c563 100644
--- a/tests/static/state_tests/stMemoryTest/mem32kb_singleByte+31Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem32kb_singleByte+31Filler.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem32kb_singleByte+32Filler.json b/tests/static/state_tests/stMemoryTest/mem32kb_singleByte+32Filler.json
index 94fc46b1ef9..ac53c4c5515 100644
--- a/tests/static/state_tests/stMemoryTest/mem32kb_singleByte+32Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem32kb_singleByte+32Filler.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem32kb_singleByte+33Filler.json b/tests/static/state_tests/stMemoryTest/mem32kb_singleByte+33Filler.json
index 5a8e6ef5c9c..e09cd37c743 100644
--- a/tests/static/state_tests/stMemoryTest/mem32kb_singleByte+33Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem32kb_singleByte+33Filler.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem32kb_singleByte-1Filler.json b/tests/static/state_tests/stMemoryTest/mem32kb_singleByte-1Filler.json
index 0723da2df0d..2355e97514c 100644
--- a/tests/static/state_tests/stMemoryTest/mem32kb_singleByte-1Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem32kb_singleByte-1Filler.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem32kb_singleByte-31Filler.json b/tests/static/state_tests/stMemoryTest/mem32kb_singleByte-31Filler.json
index 98ff764da99..14c8d2b536c 100644
--- a/tests/static/state_tests/stMemoryTest/mem32kb_singleByte-31Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem32kb_singleByte-31Filler.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem32kb_singleByte-32Filler.json b/tests/static/state_tests/stMemoryTest/mem32kb_singleByte-32Filler.json
index 4e3a0b7df12..9c4528c4d8d 100644
--- a/tests/static/state_tests/stMemoryTest/mem32kb_singleByte-32Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem32kb_singleByte-32Filler.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem32kb_singleByte-33Filler.json b/tests/static/state_tests/stMemoryTest/mem32kb_singleByte-33Filler.json
index fa1d345b54a..6d59eb10f48 100644
--- a/tests/static/state_tests/stMemoryTest/mem32kb_singleByte-33Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem32kb_singleByte-33Filler.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem32kb_singleByteFiller.json b/tests/static/state_tests/stMemoryTest/mem32kb_singleByteFiller.json
index 9b310cb051e..9de322f3285 100644
--- a/tests/static/state_tests/stMemoryTest/mem32kb_singleByteFiller.json
+++ b/tests/static/state_tests/stMemoryTest/mem32kb_singleByteFiller.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem33b_singleByteFiller.json b/tests/static/state_tests/stMemoryTest/mem33b_singleByteFiller.json
index 8b1804c4680..149d0856375 100644
--- a/tests/static/state_tests/stMemoryTest/mem33b_singleByteFiller.json
+++ b/tests/static/state_tests/stMemoryTest/mem33b_singleByteFiller.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem64kb+1Filler.json b/tests/static/state_tests/stMemoryTest/mem64kb+1Filler.json
index 14682aa2c5b..b0f4214b22f 100644
--- a/tests/static/state_tests/stMemoryTest/mem64kb+1Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem64kb+1Filler.json
@@ -54,7 +54,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem64kb+31Filler.json b/tests/static/state_tests/stMemoryTest/mem64kb+31Filler.json
index 820b9702619..9742bc65b73 100644
--- a/tests/static/state_tests/stMemoryTest/mem64kb+31Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem64kb+31Filler.json
@@ -54,7 +54,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem64kb+32Filler.json b/tests/static/state_tests/stMemoryTest/mem64kb+32Filler.json
index dbcdd656357..a4c9a89240e 100644
--- a/tests/static/state_tests/stMemoryTest/mem64kb+32Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem64kb+32Filler.json
@@ -54,7 +54,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem64kb+33Filler.json b/tests/static/state_tests/stMemoryTest/mem64kb+33Filler.json
index 79882bcbbd1..5d71a39b63e 100644
--- a/tests/static/state_tests/stMemoryTest/mem64kb+33Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem64kb+33Filler.json
@@ -54,7 +54,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem64kb-1Filler.json b/tests/static/state_tests/stMemoryTest/mem64kb-1Filler.json
index 1aa06d829cf..03af6593f49 100644
--- a/tests/static/state_tests/stMemoryTest/mem64kb-1Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem64kb-1Filler.json
@@ -54,7 +54,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183640"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem64kb-31Filler.json b/tests/static/state_tests/stMemoryTest/mem64kb-31Filler.json
index e8849971036..dec8f0a9bdb 100644
--- a/tests/static/state_tests/stMemoryTest/mem64kb-31Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem64kb-31Filler.json
@@ -54,7 +54,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183640"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem64kb-32Filler.json b/tests/static/state_tests/stMemoryTest/mem64kb-32Filler.json
index abceaed2074..ac3e3dee4b9 100644
--- a/tests/static/state_tests/stMemoryTest/mem64kb-32Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem64kb-32Filler.json
@@ -54,7 +54,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183640"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem64kb-33Filler.json b/tests/static/state_tests/stMemoryTest/mem64kb-33Filler.json
index d89109f4704..b937800dbac 100644
--- a/tests/static/state_tests/stMemoryTest/mem64kb-33Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem64kb-33Filler.json
@@ -54,7 +54,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem64kbFiller.json b/tests/static/state_tests/stMemoryTest/mem64kbFiller.json
index 8550a5f6ee3..0a290619093 100644
--- a/tests/static/state_tests/stMemoryTest/mem64kbFiller.json
+++ b/tests/static/state_tests/stMemoryTest/mem64kbFiller.json
@@ -54,7 +54,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183640"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem64kb_singleByte+1Filler.json b/tests/static/state_tests/stMemoryTest/mem64kb_singleByte+1Filler.json
index bffda8b9073..bca8ba84e05 100644
--- a/tests/static/state_tests/stMemoryTest/mem64kb_singleByte+1Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem64kb_singleByte+1Filler.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem64kb_singleByte+31Filler.json b/tests/static/state_tests/stMemoryTest/mem64kb_singleByte+31Filler.json
index 516fd89369b..4cf7a8dfa79 100644
--- a/tests/static/state_tests/stMemoryTest/mem64kb_singleByte+31Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem64kb_singleByte+31Filler.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem64kb_singleByte+32Filler.json b/tests/static/state_tests/stMemoryTest/mem64kb_singleByte+32Filler.json
index c8733afc8b3..c4a4021e51d 100644
--- a/tests/static/state_tests/stMemoryTest/mem64kb_singleByte+32Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem64kb_singleByte+32Filler.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem64kb_singleByte+33Filler.json b/tests/static/state_tests/stMemoryTest/mem64kb_singleByte+33Filler.json
index d27c559527b..6915eb31cb2 100644
--- a/tests/static/state_tests/stMemoryTest/mem64kb_singleByte+33Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem64kb_singleByte+33Filler.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem64kb_singleByte-1Filler.json b/tests/static/state_tests/stMemoryTest/mem64kb_singleByte-1Filler.json
index 537598c23c1..4c73ebc3cd3 100644
--- a/tests/static/state_tests/stMemoryTest/mem64kb_singleByte-1Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem64kb_singleByte-1Filler.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem64kb_singleByte-31Filler.json b/tests/static/state_tests/stMemoryTest/mem64kb_singleByte-31Filler.json
index 64908c1b4f2..cb895fb4251 100644
--- a/tests/static/state_tests/stMemoryTest/mem64kb_singleByte-31Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem64kb_singleByte-31Filler.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem64kb_singleByte-32Filler.json b/tests/static/state_tests/stMemoryTest/mem64kb_singleByte-32Filler.json
index 84c97afe107..012bd96b243 100644
--- a/tests/static/state_tests/stMemoryTest/mem64kb_singleByte-32Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem64kb_singleByte-32Filler.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem64kb_singleByte-33Filler.json b/tests/static/state_tests/stMemoryTest/mem64kb_singleByte-33Filler.json
index 8e110c56228..d8083548de9 100644
--- a/tests/static/state_tests/stMemoryTest/mem64kb_singleByte-33Filler.json
+++ b/tests/static/state_tests/stMemoryTest/mem64kb_singleByte-33Filler.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mem64kb_singleByteFiller.json b/tests/static/state_tests/stMemoryTest/mem64kb_singleByteFiller.json
index b99fc5d9615..28a4176525c 100644
--- a/tests/static/state_tests/stMemoryTest/mem64kb_singleByteFiller.json
+++ b/tests/static/state_tests/stMemoryTest/mem64kb_singleByteFiller.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/memReturnFiller.json b/tests/static/state_tests/stMemoryTest/memReturnFiller.json
index d011f71e225..9a6adcf3d5b 100644
--- a/tests/static/state_tests/stMemoryTest/memReturnFiller.json
+++ b/tests/static/state_tests/stMemoryTest/memReturnFiller.json
@@ -52,7 +52,7 @@
                 "0xff55883355001144bbccddffeeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
             ],
             "gasLimit" : [
-                "1342183320"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mload16bitBoundFiller.json b/tests/static/state_tests/stMemoryTest/mload16bitBoundFiller.json
index 2ed89e32395..73b0e426533 100644
--- a/tests/static/state_tests/stMemoryTest/mload16bitBoundFiller.json
+++ b/tests/static/state_tests/stMemoryTest/mload16bitBoundFiller.json
@@ -52,7 +52,7 @@
                 ""
             ],
             "gasLimit" : [
-                "17575140524381"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mload_dejavuFiller.json b/tests/static/state_tests/stMemoryTest/mload_dejavuFiller.json
index c83aba94eb4..534a95fee5c 100644
--- a/tests/static/state_tests/stMemoryTest/mload_dejavuFiller.json
+++ b/tests/static/state_tests/stMemoryTest/mload_dejavuFiller.json
@@ -52,7 +52,7 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mstore_dejavuFiller.json b/tests/static/state_tests/stMemoryTest/mstore_dejavuFiller.json
index e325774804b..56347615c9e 100644
--- a/tests/static/state_tests/stMemoryTest/mstore_dejavuFiller.json
+++ b/tests/static/state_tests/stMemoryTest/mstore_dejavuFiller.json
@@ -52,7 +52,7 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/mstroe8_dejavuFiller.json b/tests/static/state_tests/stMemoryTest/mstroe8_dejavuFiller.json
index 8d2760e60ac..2be206c35dd 100644
--- a/tests/static/state_tests/stMemoryTest/mstroe8_dejavuFiller.json
+++ b/tests/static/state_tests/stMemoryTest/mstroe8_dejavuFiller.json
@@ -52,7 +52,7 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stMemoryTest/sha3_dejavuFiller.json b/tests/static/state_tests/stMemoryTest/sha3_dejavuFiller.json
index ffae130514a..4f49317e129 100644
--- a/tests/static/state_tests/stMemoryTest/sha3_dejavuFiller.json
+++ b/tests/static/state_tests/stMemoryTest/sha3_dejavuFiller.json
@@ -52,7 +52,7 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stPreCompiledContracts/modexpFiller.json b/tests/static/state_tests/stPreCompiledContracts/modexpFiller.json
index d0dc26f7379..df6c84e30af 100644
--- a/tests/static/state_tests/stPreCompiledContracts/modexpFiller.json
+++ b/tests/static/state_tests/stPreCompiledContracts/modexpFiller.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x1000000000000000000000000000000000000000>" : {
                         "storage" : {
@@ -30,7 +30,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x1000000000000000000000000000000000000000>" : {
                         "storage" : {
@@ -46,7 +46,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x1000000000000000000000000000000000000000>" : {
                         "storage" : {
@@ -62,7 +62,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x1000000000000000000000000000000000000000>" : {
                         "storage" : {
@@ -78,7 +78,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x1000000000000000000000000000000000000000>" : {
                         "storage" : {
@@ -94,7 +94,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x1000000000000000000000000000000000000000>" : {
                         "storage" : {
@@ -110,7 +110,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x1000000000000000000000000000000000000000>" : {
                         "storage" : {
@@ -126,7 +126,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x1000000000000000000000000000000000000000>" : {
                         "storage" : {
@@ -142,7 +142,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x1000000000000000000000000000000000000000>" : {
                         "storage" : {
@@ -158,7 +158,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x1000000000000000000000000000000000000000>" : {
                         "storage" : {
@@ -174,7 +174,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x1000000000000000000000000000000000000000>" : {
                         "storage" : {
@@ -190,7 +190,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x1000000000000000000000000000000000000000>" : {
                         "storage" : {
@@ -206,7 +206,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x1000000000000000000000000000000000000000>" : {
                         "storage" : {
@@ -222,7 +222,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x1000000000000000000000000000000000000000>" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stPreCompiledContracts/modexpTestsFiller.yml b/tests/static/state_tests/stPreCompiledContracts/modexpTestsFiller.yml
index 715fc4bb504..7a99239b265 100644
--- a/tests/static/state_tests/stPreCompiledContracts/modexpTestsFiller.yml
+++ b/tests/static/state_tests/stPreCompiledContracts/modexpTestsFiller.yml
@@ -204,7 +204,7 @@ modexpTests:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         <contract:target:0xcccccccccccccccccccccccccccccccccccccccc>:
           storage:
@@ -221,7 +221,7 @@ modexpTests:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         <contract:target:0xcccccccccccccccccccccccccccccccccccccccc>:
           storage:
@@ -236,7 +236,7 @@ modexpTests:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         <contract:target:0xcccccccccccccccccccccccccccccccccccccccc>:
           storage:
@@ -252,7 +252,7 @@ modexpTests:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         <contract:target:0xcccccccccccccccccccccccccccccccccccccccc>:
           storage:
@@ -269,7 +269,7 @@ modexpTests:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         <contract:target:0xcccccccccccccccccccccccccccccccccccccccc>:
           storage:
@@ -284,7 +284,7 @@ modexpTests:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         <contract:target:0xcccccccccccccccccccccccccccccccccccccccc>:
           storage:
@@ -299,7 +299,7 @@ modexpTests:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         <contract:target:0xcccccccccccccccccccccccccccccccccccccccc>:
           storage:
@@ -313,7 +313,7 @@ modexpTests:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         <contract:target:0xcccccccccccccccccccccccccccccccccccccccc>:
           storage:
@@ -327,7 +327,7 @@ modexpTests:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         <contract:target:0xcccccccccccccccccccccccccccccccccccccccc>:
           storage:
@@ -342,7 +342,7 @@ modexpTests:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         <contract:target:0xcccccccccccccccccccccccccccccccccccccccc>:
           storage:
@@ -357,7 +357,7 @@ modexpTests:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         <contract:target:0xcccccccccccccccccccccccccccccccccccccccc>:
           storage:
@@ -371,7 +371,7 @@ modexpTests:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         <contract:target:0xcccccccccccccccccccccccccccccccccccccccc>:
           storage:
@@ -385,7 +385,7 @@ modexpTests:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         <contract:target:0xcccccccccccccccccccccccccccccccccccccccc>:
           storage:
@@ -399,7 +399,7 @@ modexpTests:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         <contract:target:0xcccccccccccccccccccccccccccccccccccccccc>:
           storage:
@@ -413,7 +413,7 @@ modexpTests:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         <contract:target:0xcccccccccccccccccccccccccccccccccccccccc>:
           storage:
diff --git a/tests/static/state_tests/stPreCompiledContracts2/CallEcrecover_OverflowFiller.yml b/tests/static/state_tests/stPreCompiledContracts2/CallEcrecover_OverflowFiller.yml
index 5c5e6732b67..7e60438a67d 100644
--- a/tests/static/state_tests/stPreCompiledContracts2/CallEcrecover_OverflowFiller.yml
+++ b/tests/static/state_tests/stPreCompiledContracts2/CallEcrecover_OverflowFiller.yml
@@ -57,7 +57,7 @@ CallEcrecover_Overflow:
     - :label pass03   :abi f(uint,uint,uint,uint) 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c 0x1c 0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353 0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd036413f
 
     gasLimit:
-    - 'F000000000'
+    - '0x186a0'
     gasPrice: '10'
     nonce: '0'
     secretKey: "<eoa:sender:0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8>"
diff --git a/tests/static/state_tests/stPreCompiledContracts2/ecrecoverShortBuffFiller.yml b/tests/static/state_tests/stPreCompiledContracts2/ecrecoverShortBuffFiller.yml
index 3ddeb1821ad..a1a58960250 100644
--- a/tests/static/state_tests/stPreCompiledContracts2/ecrecoverShortBuffFiller.yml
+++ b/tests/static/state_tests/stPreCompiledContracts2/ecrecoverShortBuffFiller.yml
@@ -126,7 +126,7 @@ ecrecoverShortBuff:
     data:
     - :raw 0x00
     gasLimit:
-    - 'F000000000'
+    - '0x70ea40'
     gasPrice: '10'
     nonce: 1
     secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
diff --git a/tests/static/state_tests/stQuadraticComplexityTest/Call1MB1024CalldepthFiller.json b/tests/static/state_tests/stQuadraticComplexityTest/Call1MB1024CalldepthFiller.json
index 4b59d526ec1..9b6dcaf3ce5 100644
--- a/tests/static/state_tests/stQuadraticComplexityTest/Call1MB1024CalldepthFiller.json
+++ b/tests/static/state_tests/stQuadraticComplexityTest/Call1MB1024CalldepthFiller.json
@@ -14,7 +14,7 @@
                     "gas" : 1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "code" : "0x",
@@ -44,7 +44,7 @@
                     "gas" : 0,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "code" : "0x",
diff --git a/tests/static/state_tests/stQuadraticComplexityTest/Call20KbytesContract50_1Filler.json b/tests/static/state_tests/stQuadraticComplexityTest/Call20KbytesContract50_1Filler.json
index 7896e20cfae..a9ea75e5b30 100644
--- a/tests/static/state_tests/stQuadraticComplexityTest/Call20KbytesContract50_1Filler.json
+++ b/tests/static/state_tests/stQuadraticComplexityTest/Call20KbytesContract50_1Filler.json
@@ -93,7 +93,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "12500000"
             ],
             "gasPrice" : "10",
             "nonce" : "",
diff --git a/tests/static/state_tests/stQuadraticComplexityTest/Call20KbytesContract50_2Filler.json b/tests/static/state_tests/stQuadraticComplexityTest/Call20KbytesContract50_2Filler.json
index b56e95e197e..193bbdbdd61 100644
--- a/tests/static/state_tests/stQuadraticComplexityTest/Call20KbytesContract50_2Filler.json
+++ b/tests/static/state_tests/stQuadraticComplexityTest/Call20KbytesContract50_2Filler.json
@@ -14,7 +14,7 @@
                     "gas" : 1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "code" : "0x",
@@ -43,7 +43,7 @@
                     "gas" : 0,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "code" : "0x",
diff --git a/tests/static/state_tests/stQuadraticComplexityTest/Call20KbytesContract50_3Filler.json b/tests/static/state_tests/stQuadraticComplexityTest/Call20KbytesContract50_3Filler.json
index 66f0ec1a90f..bfd049432e5 100644
--- a/tests/static/state_tests/stQuadraticComplexityTest/Call20KbytesContract50_3Filler.json
+++ b/tests/static/state_tests/stQuadraticComplexityTest/Call20KbytesContract50_3Filler.json
@@ -1,5 +1,8 @@
 {
     "Call20KbytesContract50_3" : {
+        "_info" : {
+            "comment": "Potentially broken test: gas optimization shows that we can go as low as 212,154 gas limit and it would still have the same traces as with 250 million."
+        },
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
@@ -14,7 +17,7 @@
                     "gas" : 1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "code" : "0x",
@@ -43,7 +46,7 @@
                     "gas" : 0,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "code" : "0x",
diff --git a/tests/static/state_tests/stQuadraticComplexityTest/Call50000Filler.json b/tests/static/state_tests/stQuadraticComplexityTest/Call50000Filler.json
index 2d7474a6bea..c18b471e783 100644
--- a/tests/static/state_tests/stQuadraticComplexityTest/Call50000Filler.json
+++ b/tests/static/state_tests/stQuadraticComplexityTest/Call50000Filler.json
@@ -14,7 +14,7 @@
                     "gas" : 1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "code" : "0x",
@@ -42,7 +42,7 @@
                     "gas" : 0,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "code" : "0x",
diff --git a/tests/static/state_tests/stQuadraticComplexityTest/Call50000_ecrecFiller.json b/tests/static/state_tests/stQuadraticComplexityTest/Call50000_ecrecFiller.json
index cf662b13388..bb8e78e28cc 100644
--- a/tests/static/state_tests/stQuadraticComplexityTest/Call50000_ecrecFiller.json
+++ b/tests/static/state_tests/stQuadraticComplexityTest/Call50000_ecrecFiller.json
@@ -14,7 +14,7 @@
                     "gas" : 1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "code" : "0x",
@@ -36,7 +36,7 @@
                     "gas" : 0,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "code" : "0x",
diff --git a/tests/static/state_tests/stQuadraticComplexityTest/Call50000_identity2Filler.json b/tests/static/state_tests/stQuadraticComplexityTest/Call50000_identity2Filler.json
index f01a0834632..438565ee0c0 100644
--- a/tests/static/state_tests/stQuadraticComplexityTest/Call50000_identity2Filler.json
+++ b/tests/static/state_tests/stQuadraticComplexityTest/Call50000_identity2Filler.json
@@ -14,7 +14,7 @@
                     "gas" : 1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "code" : "0x",
@@ -36,7 +36,7 @@
                     "gas" : 0,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "code" : "0x",
diff --git a/tests/static/state_tests/stQuadraticComplexityTest/Call50000_identityFiller.json b/tests/static/state_tests/stQuadraticComplexityTest/Call50000_identityFiller.json
index 7b2fa2b1402..380d8f8795a 100644
--- a/tests/static/state_tests/stQuadraticComplexityTest/Call50000_identityFiller.json
+++ b/tests/static/state_tests/stQuadraticComplexityTest/Call50000_identityFiller.json
@@ -14,7 +14,7 @@
                     "gas" : 1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "code" : "0x",
@@ -36,7 +36,7 @@
                     "gas" : 0,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "code" : "0x",
diff --git a/tests/static/state_tests/stQuadraticComplexityTest/Call50000_rip160Filler.json b/tests/static/state_tests/stQuadraticComplexityTest/Call50000_rip160Filler.json
index 691f4002179..6440b73e3de 100644
--- a/tests/static/state_tests/stQuadraticComplexityTest/Call50000_rip160Filler.json
+++ b/tests/static/state_tests/stQuadraticComplexityTest/Call50000_rip160Filler.json
@@ -14,7 +14,7 @@
                     "gas" : 1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "code" : "0x",
@@ -36,7 +36,7 @@
                     "gas" : 0,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "code" : "0x",
diff --git a/tests/static/state_tests/stQuadraticComplexityTest/Call50000_sha256Filler.json b/tests/static/state_tests/stQuadraticComplexityTest/Call50000_sha256Filler.json
index 03a21d2995e..0d58211f35c 100644
--- a/tests/static/state_tests/stQuadraticComplexityTest/Call50000_sha256Filler.json
+++ b/tests/static/state_tests/stQuadraticComplexityTest/Call50000_sha256Filler.json
@@ -14,7 +14,7 @@
                     "gas" : 1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "0000000000000000000000000000000000000002" : {
                         "shouldnotexist" : "1"
@@ -41,7 +41,7 @@
                     "gas" : 0,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "0000000000000000000000000000000000000002" : {
                         "shouldnotexist" : "1"
diff --git a/tests/static/state_tests/stQuadraticComplexityTest/Callcode50000Filler.json b/tests/static/state_tests/stQuadraticComplexityTest/Callcode50000Filler.json
index 88187c0ddcc..8c34ceb96de 100644
--- a/tests/static/state_tests/stQuadraticComplexityTest/Callcode50000Filler.json
+++ b/tests/static/state_tests/stQuadraticComplexityTest/Callcode50000Filler.json
@@ -14,7 +14,7 @@
                     "gas" : 1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "code" : "0x",
@@ -42,7 +42,7 @@
                     "gas" : 0,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "code" : "0x",
diff --git a/tests/static/state_tests/stQuadraticComplexityTest/Create1000ByzantiumFiller.json b/tests/static/state_tests/stQuadraticComplexityTest/Create1000ByzantiumFiller.json
index f6bcd702419..6d4edb64c26 100644
--- a/tests/static/state_tests/stQuadraticComplexityTest/Create1000ByzantiumFiller.json
+++ b/tests/static/state_tests/stQuadraticComplexityTest/Create1000ByzantiumFiller.json
@@ -1,5 +1,8 @@
 {
     "Create1000Byzantium" : {
+        "_info" : {
+            "comment": "Gas analysis showed this test's gas can go as low as 21053, and still yield the same traces, which implies the test is broken"
+        },
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
@@ -14,7 +17,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "010d8b0816e30ff51ba07678c64b272cdeddb807" : {
                         "shouldnotexist" : "1"
diff --git a/tests/static/state_tests/stQuadraticComplexityTest/Create1000Filler.json b/tests/static/state_tests/stQuadraticComplexityTest/Create1000Filler.json
index 0f7ca71e0a8..37fa82123e1 100644
--- a/tests/static/state_tests/stQuadraticComplexityTest/Create1000Filler.json
+++ b/tests/static/state_tests/stQuadraticComplexityTest/Create1000Filler.json
@@ -1,5 +1,8 @@
 {
     "Create1000" : {
+        "_info" : {
+            "comment": "Gas analysis showed this test's gas can go as low as 21053, and still yield the same traces, which implies the test is broken"
+        },
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
@@ -14,7 +17,7 @@
                     "gas" : 0,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "010d8b0816e30ff51ba07678c64b272cdeddb807" : {
                         "shouldnotexist" : "1"
@@ -53,7 +56,7 @@
                     "gas" : 1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "010d8b0816e30ff51ba07678c64b272cdeddb807" : {
                         "shouldnotexist" : "1"
diff --git a/tests/static/state_tests/stQuadraticComplexityTest/Create1000ShnghaiFiller.json b/tests/static/state_tests/stQuadraticComplexityTest/Create1000ShnghaiFiller.json
index 1c307b66310..07e567b4636 100644
--- a/tests/static/state_tests/stQuadraticComplexityTest/Create1000ShnghaiFiller.json
+++ b/tests/static/state_tests/stQuadraticComplexityTest/Create1000ShnghaiFiller.json
@@ -14,7 +14,7 @@
                     "gas" : 0,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "010d8b0816e30ff51ba07678c64b272cdeddb807" : {
                         "shouldnotexist" : "1"
@@ -53,7 +53,7 @@
                     "gas" : 1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "010d8b0816e30ff51ba07678c64b272cdeddb807" : {
                         "balance" : "0x01",
diff --git a/tests/static/state_tests/stQuadraticComplexityTest/QuadraticComplexitySolidity_CallDataCopyFiller.json b/tests/static/state_tests/stQuadraticComplexityTest/QuadraticComplexitySolidity_CallDataCopyFiller.json
index bc0fef71bbf..aac24c5a488 100644
--- a/tests/static/state_tests/stQuadraticComplexityTest/QuadraticComplexitySolidity_CallDataCopyFiller.json
+++ b/tests/static/state_tests/stQuadraticComplexityTest/QuadraticComplexitySolidity_CallDataCopyFiller.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "code" : "0x60003560e060020a9004806361a4770614601557005b601e6004356024565b60006000f35b60008160008190555073b94f5374fce5edbc8e2a8697c15331677e6ebf0b90505b600082131560bf5780600160a060020a03166000600060007f6a7573740000000000000000000000000000000000000000000000000000000081526004017f63616c6c000000000000000000000000000000000000000000000000000000008152602001600060008560155a03f150506001820391506045565b505056",
diff --git a/tests/static/state_tests/stQuadraticComplexityTest/Return50000Filler.json b/tests/static/state_tests/stQuadraticComplexityTest/Return50000Filler.json
index 4f17f13591c..47595531e1b 100644
--- a/tests/static/state_tests/stQuadraticComplexityTest/Return50000Filler.json
+++ b/tests/static/state_tests/stQuadraticComplexityTest/Return50000Filler.json
@@ -94,7 +94,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16000000"
             ],
             "gasPrice" : "10",
             "nonce" : "",
diff --git a/tests/static/state_tests/stQuadraticComplexityTest/Return50000_2Filler.json b/tests/static/state_tests/stQuadraticComplexityTest/Return50000_2Filler.json
index 59ab9d26696..486b49cbe71 100644
--- a/tests/static/state_tests/stQuadraticComplexityTest/Return50000_2Filler.json
+++ b/tests/static/state_tests/stQuadraticComplexityTest/Return50000_2Filler.json
@@ -95,7 +95,7 @@
                 ""
             ],
             "gasLimit" : [
-                "150000", "250000000"
+                "150000", "16000000"
             ],
             "gasPrice" : "10",
             "nonce" : "",
diff --git a/tests/static/state_tests/stRandom/randomStatetest0Filler.json b/tests/static/state_tests/stRandom/randomStatetest0Filler.json
index 67fe010dffc..8cae9fc7ca7 100644
--- a/tests/static/state_tests/stRandom/randomStatetest0Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest0Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff857ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1302056f"
             ],
             "gasLimit" : [
-                "0x24c93d75"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest102Filler.json b/tests/static/state_tests/stRandom/randomStatetest102Filler.json
index bc4d43330df..08edd6ee2cc 100644
--- a/tests/static/state_tests/stRandom/randomStatetest102Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest102Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x457f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>44447f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f157094ffff1a04893a9cf3858b8576"
             ],
             "gasLimit" : [
-                "0x2d785b3a"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest103Filler.json b/tests/static/state_tests/stRandom/randomStatetest103Filler.json
index 53a4d863b13..fecf56023e8 100644
--- a/tests/static/state_tests/stRandom/randomStatetest103Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest103Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe92357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff597f00000000000000000000000000000000000000000000000000000000000000019385a39988160a205a93196d336428"
             ],
             "gasLimit" : [
-                "0x0623e53b"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest104Filler.json b/tests/static/state_tests/stRandom/randomStatetest104Filler.json
index fa7ed17716f..d844e732791 100644
--- a/tests/static/state_tests/stRandom/randomStatetest104Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest104Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f147d6b978c780a82619772417d5b6a"
             ],
             "gasLimit" : [
-                "0x6cd94ea9"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest105Filler.json b/tests/static/state_tests/stRandom/randomStatetest105Filler.json
index 475adc1f4da..37f7be06dc5 100644
--- a/tests/static/state_tests/stRandom/randomStatetest105Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest105Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f9914639111156d1759ff65039a02926c"
             ],
             "gasLimit" : [
-                "0x58200c22"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest106Filler.json b/tests/static/state_tests/stRandom/randomStatetest106Filler.json
index d8f3ecc1ed7..f2c5c9c2008 100644
--- a/tests/static/state_tests/stRandom/randomStatetest106Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest106Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f327043726481f25094828e21155779"
             ],
             "gasLimit" : [
-                "0x7d538fa3"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest107Filler.json b/tests/static/state_tests/stRandom/randomStatetest107Filler.json
index 12b9e470692..5603df8451f 100644
--- a/tests/static/state_tests/stRandom/randomStatetest107Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest107Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b509"
             ],
             "gasLimit" : [
-                "0x436e5016"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest10Filler.json b/tests/static/state_tests/stRandom/randomStatetest10Filler.json
index 64fe5384128..3a593edca85 100644
--- a/tests/static/state_tests/stRandom/randomStatetest10Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest10Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000000120417f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3508859a1740a0528f26a635216cd980a9a92"
             ],
             "gasLimit" : [
-                "0x1cdacd68"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest110Filler.json b/tests/static/state_tests/stRandom/randomStatetest110Filler.json
index a3b7c6a3e36..b5fa9e0f5e1 100644
--- a/tests/static/state_tests/stRandom/randomStatetest110Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest110Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417f00000000000000000000000000000000000000000000000000000000000000016f97543c343476cb7c8c84066217f102"
             ],
             "gasLimit" : [
-                "0x3114ea7b"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest111Filler.json b/tests/static/state_tests/stRandom/randomStatetest111Filler.json
index 41c8199a5ef..d2f1bda3d82 100644
--- a/tests/static/state_tests/stRandom/randomStatetest111Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest111Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c35059a17f0000000000000000000000000000000000000000000000000000000000000001f38f07bf"
             ],
             "gasLimit" : [
-                "0x5a11064f"
+                "0x7a120"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest112Filler.json b/tests/static/state_tests/stRandom/randomStatetest112Filler.json
index 2232dbc5162..b2fbe67432c 100644
--- a/tests/static/state_tests/stRandom/randomStatetest112Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest112Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff45447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f549c5779398a848c35307514650541"
             ],
             "gasLimit" : [
-                "0x1962788d"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest114Filler.json b/tests/static/state_tests/stRandom/randomStatetest114Filler.json
index dec6618dd30..8eabbf223e2 100644
--- a/tests/static/state_tests/stRandom/randomStatetest114Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest114Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f3584357ea388725483637d4471727f"
             ],
             "gasLimit" : [
-                "0x090e47ee"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest116Filler.json b/tests/static/state_tests/stRandom/randomStatetest116Filler.json
index cb0fbcfe3a3..0fdcee3cab3 100644
--- a/tests/static/state_tests/stRandom/randomStatetest116Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest116Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>07539337"
             ],
             "gasLimit" : [
-                "0x500ddd76"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest117Filler.json b/tests/static/state_tests/stRandom/randomStatetest117Filler.json
index 56923590461..d460f9eb7c3 100644
--- a/tests/static/state_tests/stRandom/randomStatetest117Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest117Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x447f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f8aa4a4980274f18c6158368d415714"
             ],
             "gasLimit" : [
-                "0x195dc839"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest118Filler.json b/tests/static/state_tests/stRandom/randomStatetest118Filler.json
index bf0c053472a..183f3140b63 100644
--- a/tests/static/state_tests/stRandom/randomStatetest118Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest118Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000006f55817c037fa45bf3850320309a8f02"
             ],
             "gasLimit" : [
-                "0x6c4139ef"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest119Filler.json b/tests/static/state_tests/stRandom/randomStatetest119Filler.json
index 520b9edbf80..fc338cff8a3 100644
--- a/tests/static/state_tests/stRandom/randomStatetest119Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest119Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x4559437f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000006f52503b127c115a9673a43137909566"
             ],
             "gasLimit" : [
-                "0x1199b708"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest11Filler.json b/tests/static/state_tests/stRandom/randomStatetest11Filler.json
index 6ab4562065f..635f7c8fd2c 100644
--- a/tests/static/state_tests/stRandom/randomStatetest11Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest11Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3506fa093f3408a6e531735960a7617127a"
             ],
             "gasLimit" : [
-                "0x558137e9"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest120Filler.json b/tests/static/state_tests/stRandom/randomStatetest120Filler.json
index 5dafb5d7516..1e95783cc33 100644
--- a/tests/static/state_tests/stRandom/randomStatetest120Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest120Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe8208"
             ],
             "gasLimit" : [
-                "0x6f2e860a"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest121Filler.json b/tests/static/state_tests/stRandom/randomStatetest121Filler.json
index 6ea014b82bb..adb576c4585 100644
--- a/tests/static/state_tests/stRandom/randomStatetest121Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest121Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350456f305842321509108c689f7ca3195a9d"
             ],
             "gasLimit" : [
-                "0x0b1aa486"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest122Filler.json b/tests/static/state_tests/stRandom/randomStatetest122Filler.json
index 09a1a805273..c28b93aa4d6 100644
--- a/tests/static/state_tests/stRandom/randomStatetest122Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest122Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6fa2825b6c338f8d717156560af045136b"
             ],
             "gasLimit" : [
-                "0x667abfc4"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest124Filler.json b/tests/static/state_tests/stRandom/randomStatetest124Filler.json
index 2111f18a1f0..9c1eb720ba0 100644
--- a/tests/static/state_tests/stRandom/randomStatetest124Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest124Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08125580355b17457f7463587b9a7a43"
             ],
             "gasLimit" : [
-                "0x2b83a523"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest125Filler.json b/tests/static/state_tests/stRandom/randomStatetest125Filler.json
index 0d94d1169e5..5f5fd0836a4 100644
--- a/tests/static/state_tests/stRandom/randomStatetest125Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest125Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f0000000000000000000000000000000000000000000000000000000000000001207f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe406f"
             ],
             "gasLimit" : [
-                "0x4b03b27e"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest129Filler.json b/tests/static/state_tests/stRandom/randomStatetest129Filler.json
index f623b18a140..092fdddf304 100644
--- a/tests/static/state_tests/stRandom/randomStatetest129Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest129Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f166e733343093a31a33b8e025a0270"
             ],
             "gasLimit" : [
-                "0x31d30358"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest12Filler.json b/tests/static/state_tests/stRandom/randomStatetest12Filler.json
index d4c19a7db45..f0a3c65453e 100644
--- a/tests/static/state_tests/stRandom/randomStatetest12Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest12Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>027f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f165490a41215369ef2760379411633"
             ],
             "gasLimit" : [
-                "0x1cc90872"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest130Filler.json b/tests/static/state_tests/stRandom/randomStatetest130Filler.json
index 9459fb30113..a4b0a856aff 100644
--- a/tests/static/state_tests/stRandom/randomStatetest130Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest130Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000016f368a668b76306d181a393611988317"
             ],
             "gasLimit" : [
-                "0x297057b2"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest131Filler.json b/tests/static/state_tests/stRandom/randomStatetest131Filler.json
index 3ff74686554..f9a6c32db91 100644
--- a/tests/static/state_tests/stRandom/randomStatetest131Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest131Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001000000000000000000000000000000000000000014416f36ff85758270710168547a9777886096"
             ],
             "gasLimit" : [
-                "0x2cc6a488"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest133Filler.json b/tests/static/state_tests/stRandom/randomStatetest133Filler.json
index 5b64cc51738..f1799ee67a8 100644
--- a/tests/static/state_tests/stRandom/randomStatetest133Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest133Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001357f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000000035830b503516a46d0b03"
             ],
             "gasLimit" : [
-                "0x6d5c76ff"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest134Filler.json b/tests/static/state_tests/stRandom/randomStatetest134Filler.json
index a6974277058..2add8403740 100644
--- a/tests/static/state_tests/stRandom/randomStatetest134Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest134Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x417f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff557f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff55836b636c9c395a073201453340"
             ],
             "gasLimit" : [
-                "0x6455c6fd"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest135Filler.json b/tests/static/state_tests/stRandom/randomStatetest135Filler.json
index f0c7dbb0afd..908ce4c9c70 100644
--- a/tests/static/state_tests/stRandom/randomStatetest135Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest135Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000010000000000000000000000000000000000000000417f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0075a0b643192186630168704"
             ],
             "gasLimit" : [
-                "0x43b3081d"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest137Filler.json b/tests/static/state_tests/stRandom/randomStatetest137Filler.json
index ef4b6dbba6a..b1da564eafd 100644
--- a/tests/static/state_tests/stRandom/randomStatetest137Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest137Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000087f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5a130e86ca17390989355f092a2"
             ],
             "gasLimit" : [
-                "0x2bbb2129"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest138Filler.json b/tests/static/state_tests/stRandom/randomStatetest138Filler.json
index 1ec58d951eb..574ae19100b 100644
--- a/tests/static/state_tests/stRandom/randomStatetest138Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest138Filler.json
@@ -70,7 +70,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350447f0000000000000000000000000000000000000000000000000000000000000001f15951"
             ],
             "gasLimit" : [
-                "0x53e9ea84"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest139Filler.json b/tests/static/state_tests/stRandom/randomStatetest139Filler.json
index 750ca68c711..1908b5fab9f 100644
--- a/tests/static/state_tests/stRandom/randomStatetest139Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest139Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x33447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff43446133451545"
             ],
             "gasLimit" : [
-                "0x44016d98"
+                "0x186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest13Filler.json b/tests/static/state_tests/stRandom/randomStatetest13Filler.json
index f69a078961b..3459310483f 100644
--- a/tests/static/state_tests/stRandom/randomStatetest13Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest13Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000027ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe307f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000001000000000000000000000000000000000000000052"
             ],
             "gasLimit" : [
-                "0x524f3ae7"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest142Filler.json b/tests/static/state_tests/stRandom/randomStatetest142Filler.json
index d49b1ea6365..ddd16b74080 100644
--- a/tests/static/state_tests/stRandom/randomStatetest142Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest142Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff959137630364087e1a640431107c8801"
             ],
             "gasLimit" : [
-                "0x79343825"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest144Filler.json b/tests/static/state_tests/stRandom/randomStatetest144Filler.json
index bcb55ce6bc9..ef72f0776c4 100644
--- a/tests/static/state_tests/stRandom/randomStatetest144Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest144Filler.json
@@ -70,7 +70,7 @@
                 ":raw 0x166e31b12700cdefa7a0591398d415023175d1e5a1eca036986533972cab6625e976572ee91c150c"
             ],
             "gasLimit" : [
-                "0x189cbf1c"
+                "0x186a0"
             ],
             "gasPrice" : "0xe8",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest145Filler.json b/tests/static/state_tests/stRandom/randomStatetest145Filler.json
index ab59d1e4190..6e7cbab9a14 100644
--- a/tests/static/state_tests/stRandom/randomStatetest145Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest145Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f0000000000000000000000000000000000000000000000000000000000000000427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001391333"
             ],
             "gasLimit" : [
-                "0x4385cce0"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest147Filler.json b/tests/static/state_tests/stRandom/randomStatetest147Filler.json
index f72bb41653f..39c22e77255 100644
--- a/tests/static/state_tests/stRandom/randomStatetest147Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest147Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x657ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe43659a9360"
             ],
             "gasLimit" : [
-                "0x40e55a54"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest148Filler.json b/tests/static/state_tests/stRandom/randomStatetest148Filler.json
index 6fb9ebb5b7b..d80c4117901 100644
--- a/tests/static/state_tests/stRandom/randomStatetest148Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest148Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001537f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6f34847e390773919b16559077164472"
             ],
             "gasLimit" : [
-                "0x44f21f26"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest149Filler.json b/tests/static/state_tests/stRandom/randomStatetest149Filler.json
index 14df59d7f91..3a5f2212218 100644
--- a/tests/static/state_tests/stRandom/randomStatetest149Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest149Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0990555107"
             ],
             "gasLimit" : [
-                "0x38a59ba4"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest14Filler.json b/tests/static/state_tests/stRandom/randomStatetest14Filler.json
index 914ac97d4c7..53e2c865f41 100644
--- a/tests/static/state_tests/stRandom/randomStatetest14Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest14Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff20547f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffeff61853634f06b907f899d74"
             ],
             "gasLimit" : [
-                "0x54d3ff45"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest150Filler.json b/tests/static/state_tests/stRandom/randomStatetest150Filler.json
index ec07e2eeb19..56fe15f6a29 100644
--- a/tests/static/state_tests/stRandom/randomStatetest150Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest150Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest154Filler.json b/tests/static/state_tests/stRandom/randomStatetest154Filler.json
index 727319e5100..0e5be7e1a25 100644
--- a/tests/static/state_tests/stRandom/randomStatetest154Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest154Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest155Filler.json b/tests/static/state_tests/stRandom/randomStatetest155Filler.json
index 7d623b59a43..ddce6e96508 100644
--- a/tests/static/state_tests/stRandom/randomStatetest155Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest155Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x457f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000006f3494f39b6ca29473a1995803089101"
             ],
             "gasLimit" : [
-                "0x064d0860"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest156Filler.json b/tests/static/state_tests/stRandom/randomStatetest156Filler.json
index 5ead2872a2a..92f7e0e5a71 100644
--- a/tests/static/state_tests/stRandom/randomStatetest156Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest156Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f813982583141966b389c159aa48b3a88"
             ],
             "gasLimit" : [
-                "0x244eb85c"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest157Filler.json b/tests/static/state_tests/stRandom/randomStatetest157Filler.json
index ee713f662e3..e8890ab47dc 100644
--- a/tests/static/state_tests/stRandom/randomStatetest157Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest157Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0966ff351691689162f371a38d9b789e43"
             ],
             "gasLimit" : [
-                "0x4b1fcfd3"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest158Filler.json b/tests/static/state_tests/stRandom/randomStatetest158Filler.json
index 0260cc34e6d..4e228e2f4c9 100644
--- a/tests/static/state_tests/stRandom/randomStatetest158Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest158Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe4350"
             ],
             "gasLimit" : [
-                "0x44d7bc49"
+                "0x186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest159Filler.json b/tests/static/state_tests/stRandom/randomStatetest159Filler.json
index 53dc63c6186..7162e9d46a0 100644
--- a/tests/static/state_tests/stRandom/randomStatetest159Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest159Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest15Filler.json b/tests/static/state_tests/stRandom/randomStatetest15Filler.json
index 56861baccfb..3a906d78c45 100644
--- a/tests/static/state_tests/stRandom/randomStatetest15Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest15Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f436af043189b6197733280a2f1f038"
             ],
             "gasLimit" : [
-                "0x587d8615"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest161Filler.json b/tests/static/state_tests/stRandom/randomStatetest161Filler.json
index 405e4bc0fc2..3ef281278fc 100644
--- a/tests/static/state_tests/stRandom/randomStatetest161Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest161Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350437f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001416f458a458076526052650a418c9b40863c"
             ],
             "gasLimit" : [
-                "0x49091753"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest162Filler.json b/tests/static/state_tests/stRandom/randomStatetest162Filler.json
index 1e66313122a..c2c8a60273b 100644
--- a/tests/static/state_tests/stRandom/randomStatetest162Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest162Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f355a7f614497339e3b63878b369804"
             ],
             "gasLimit" : [
-                "0x6a56e368"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest163Filler.json b/tests/static/state_tests/stRandom/randomStatetest163Filler.json
index ba8aa74a804..6c93af47f1d 100644
--- a/tests/static/state_tests/stRandom/randomStatetest163Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest163Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest164Filler.json b/tests/static/state_tests/stRandom/randomStatetest164Filler.json
index 3d1debf5004..66b4a8e2f19 100644
--- a/tests/static/state_tests/stRandom/randomStatetest164Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest164Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001000000000000000000000000000000000000000083130539"
             ],
             "gasLimit" : [
-                "0x5bb752f0"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest166Filler.json b/tests/static/state_tests/stRandom/randomStatetest166Filler.json
index 641b5961888..02264584f29 100644
--- a/tests/static/state_tests/stRandom/randomStatetest166Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest166Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff817f0000000000000000000000010000000000000000000000000000000000000000417f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350456f8eb7099d9f160532785143c5937e18"
             ],
             "gasLimit" : [
-                "0x63271159"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest167Filler.json b/tests/static/state_tests/stRandom/randomStatetest167Filler.json
index 7e8c286385f..26d2ae5f843 100644
--- a/tests/static/state_tests/stRandom/randomStatetest167Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest167Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001437f0000000000000000000000000000000000000000000000000000000000000001027f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6fa00b875630178a439384941395369e"
             ],
             "gasLimit" : [
-                "0x5de3730a"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest169Filler.json b/tests/static/state_tests/stRandom/randomStatetest169Filler.json
index 13fc99912bb..f417854b71e 100644
--- a/tests/static/state_tests/stRandom/randomStatetest169Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest169Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
             ],
             "gasLimit" : [
-                "0x0cc5000c"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest16Filler.json b/tests/static/state_tests/stRandom/randomStatetest16Filler.json
index d0124a19f8f..d7225841f8d 100644
--- a/tests/static/state_tests/stRandom/randomStatetest16Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest16Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f0000000000000000000000000000000000000000000000000000000000000000557f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000005531848f7aa4516d7d7578797e"
             ],
             "gasLimit" : [
-                "0x514f2a5b"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest171Filler.json b/tests/static/state_tests/stRandom/randomStatetest171Filler.json
index 6e1cc4b5011..90b1a1e19b0 100644
--- a/tests/static/state_tests/stRandom/randomStatetest171Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest171Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c350437f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>197ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09"
             ],
             "gasLimit" : [
-                "0x6580cd08"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest172Filler.json b/tests/static/state_tests/stRandom/randomStatetest172Filler.json
index e57cebe3965..bb422116b90 100644
--- a/tests/static/state_tests/stRandom/randomStatetest172Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest172Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff09"
             ],
             "gasLimit" : [
-                "0x3fdd64bd"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest173Filler.json b/tests/static/state_tests/stRandom/randomStatetest173Filler.json
index 2f78b701158..f9976a352ee 100644
--- a/tests/static/state_tests/stRandom/randomStatetest173Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest173Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b509ff979443703ca3"
             ],
             "gasLimit" : [
-                "0x55db56d1"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest175Filler.json b/tests/static/state_tests/stRandom/randomStatetest175Filler.json
index 10c095c8eb5..10d074ebe74 100644
--- a/tests/static/state_tests/stRandom/randomStatetest175Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest175Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f6985f2837e09689844171a0235833c"
             ],
             "gasLimit" : [
-                "0x6f6815cb"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest176Filler.json b/tests/static/state_tests/stRandom/randomStatetest176Filler.json
index e9c57e5a437..2a58a407637 100644
--- a/tests/static/state_tests/stRandom/randomStatetest176Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest176Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x327fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350427f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff041469988517f6889d92799e746641"
             ],
             "gasLimit" : [
-                "0x5cf09c2a"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest177Filler.json b/tests/static/state_tests/stRandom/randomStatetest177Filler.json
index 2f6518e9f41..d0f75efc26b 100644
--- a/tests/static/state_tests/stRandom/randomStatetest177Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest177Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x387814bf0652a6f3aefce6ef7be00599328bbf7e802e1ea22644a96fbf319d273c0e715067e4e5e74ecfc3ae60fd917b9224a4bbaa6db919506fc9e3cd4792dbecb1427e907653a3e359acf57c1e4afae77816fdc406706133e14efc6fe3ed1dc01f663f8e79c5fb6a32685ec748da76ab766d20766430b1775afa280f1c02e5617230d3b68fa16d4d73a1b27ae07b1096d44b02414374765d0907504a2f25e45aee4fdbb17b244e93714f36d9c035346d67ce3c18bf3d3af42f3b5f807689e8f429c0070a5812d602d25c4664cccfa7ddff8188f174c046eef00dcd5355c37d900a2ce940246fcaada0526acdd4eaf98a420bae34e22b37"
             ],
             "gasLimit" : [
-                "0x585b63d5"
+                "0x186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest178Filler.json b/tests/static/state_tests/stRandom/randomStatetest178Filler.json
index 6e683c5435a..bfd01d44855 100644
--- a/tests/static/state_tests/stRandom/randomStatetest178Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest178Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest179Filler.json b/tests/static/state_tests/stRandom/randomStatetest179Filler.json
index 288174078c1..b2e8f024a55 100644
--- a/tests/static/state_tests/stRandom/randomStatetest179Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest179Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f515480126a50a173506e0667621292"
             ],
             "gasLimit" : [
-                "0x099776d2"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest17Filler.json b/tests/static/state_tests/stRandom/randomStatetest17Filler.json
index e5feac082c4..66ac94fab32 100644
--- a/tests/static/state_tests/stRandom/randomStatetest17Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest17Filler.json
@@ -66,7 +66,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001427f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001430a7f000000000000000000000000000000000000000000000000000000000000000106813b37"
             ],
             "gasLimit" : [
-                "0x0f1dce69"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest180Filler.json b/tests/static/state_tests/stRandom/randomStatetest180Filler.json
index a5cd4ee7929..d55354b6515 100644
--- a/tests/static/state_tests/stRandom/randomStatetest180Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest180Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001447f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6f11576b693c128a9e0820609c050a219d"
             ],
             "gasLimit" : [
-                "0x2d4b9e14"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest183Filler.json b/tests/static/state_tests/stRandom/randomStatetest183Filler.json
index 0e306eaf6a7..c3753afcade 100644
--- a/tests/static/state_tests/stRandom/randomStatetest183Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest183Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>436f4134547075687854849d7b64658630"
             ],
             "gasLimit" : [
-                "0x2027bd7f"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest184Filler.json b/tests/static/state_tests/stRandom/randomStatetest184Filler.json
index 6efdabc5a1c..3c570449600 100644
--- a/tests/static/state_tests/stRandom/randomStatetest184Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest184Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x64dd3e4e84676723342c1dfaf9af4ef3"
             ],
             "gasLimit" : [
-                "0x3b75fb87"
+                "0x186a0"
             ],
             "gasPrice" : "0x1c",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest185Filler.json b/tests/static/state_tests/stRandom/randomStatetest185Filler.json
index 60d09ab2fac..5469d531964 100644
--- a/tests/static/state_tests/stRandom/randomStatetest185Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest185Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest187Filler.json b/tests/static/state_tests/stRandom/randomStatetest187Filler.json
index 14e8b6ffb8a..634756fc34c 100644
--- a/tests/static/state_tests/stRandom/randomStatetest187Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest187Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000006f75988036a0562096036b04518877199d"
             ],
             "gasLimit" : [
-                "0x316eeeb1"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest188Filler.json b/tests/static/state_tests/stRandom/randomStatetest188Filler.json
index 8025e96377f..ad6e05c721e 100644
--- a/tests/static/state_tests/stRandom/randomStatetest188Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest188Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff817f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4286687859f38379718794"
             ],
             "gasLimit" : [
-                "0x4ac6aafd"
+                "0x186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest189Filler.json b/tests/static/state_tests/stRandom/randomStatetest189Filler.json
index 07eefd71ce3..aa07c83c77b 100644
--- a/tests/static/state_tests/stRandom/randomStatetest189Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest189Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000035900bf37404747650"
             ],
             "gasLimit" : [
-                "0x2fca9ff3"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest18Filler.json b/tests/static/state_tests/stRandom/randomStatetest18Filler.json
index 32d94583938..589a0c7ded0 100644
--- a/tests/static/state_tests/stRandom/randomStatetest18Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest18Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001077f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3504419860b9754998d503105a033436e67133a"
             ],
             "gasLimit" : [
-                "0x3f2630eb"
+                "0x186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest190Filler.json b/tests/static/state_tests/stRandom/randomStatetest190Filler.json
index d53479a60b3..320bf36ef18 100644
--- a/tests/static/state_tests/stRandom/randomStatetest190Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest190Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff09"
             ],
             "gasLimit" : [
-                "0x22da0c9a"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest191Filler.json b/tests/static/state_tests/stRandom/randomStatetest191Filler.json
index 949cd4a051e..31c473becc6 100644
--- a/tests/static/state_tests/stRandom/randomStatetest191Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest191Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f678f0443457084700b645760018a10"
             ],
             "gasLimit" : [
-                "0x56030329"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest192Filler.json b/tests/static/state_tests/stRandom/randomStatetest192Filler.json
index 04666c87d20..048ec073223 100644
--- a/tests/static/state_tests/stRandom/randomStatetest192Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest192Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff347f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe04"
             ],
             "gasLimit" : [
-                "0x79ba31d0"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest194Filler.json b/tests/static/state_tests/stRandom/randomStatetest194Filler.json
index 689ba8f2ade..7402da7c129 100644
--- a/tests/static/state_tests/stRandom/randomStatetest194Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest194Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>"
             ],
             "gasLimit" : [
-                "0x37a091f8"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest195Filler.json b/tests/static/state_tests/stRandom/randomStatetest195Filler.json
index 5cbf5dad934..40365cb46c7 100644
--- a/tests/static/state_tests/stRandom/randomStatetest195Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest195Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097f0000000000000000000000010000000000000000000000000000000000000000"
             ],
             "gasLimit" : [
-                "0x0613064a"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest196Filler.json b/tests/static/state_tests/stRandom/randomStatetest196Filler.json
index 5a45f9d5f9c..91aaca309cd 100644
--- a/tests/static/state_tests/stRandom/randomStatetest196Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest196Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000003703659c5b3a6d7b9a935436"
             ],
             "gasLimit" : [
-                "0x4904551d"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest197Filler.json b/tests/static/state_tests/stRandom/randomStatetest197Filler.json
index 10a9834f255..fc15298c26b 100644
--- a/tests/static/state_tests/stRandom/randomStatetest197Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest197Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350437f00000000000000000000000000000000000000000000000000000000000000016e6a078e5652549f574239"
             ],
             "gasLimit" : [
-                "0x527cfd5b"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest198Filler.json b/tests/static/state_tests/stRandom/randomStatetest198Filler.json
index eeea6624c56..87672af65ee 100644
--- a/tests/static/state_tests/stRandom/randomStatetest198Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest198Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x42417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09ff614044129a0169a2689415"
             ],
             "gasLimit" : [
-                "0x45b9fb1b"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest19Filler.json b/tests/static/state_tests/stRandom/randomStatetest19Filler.json
index 9d94dd4e427..7c496f422ef 100644
--- a/tests/static/state_tests/stRandom/randomStatetest19Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest19Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe3a7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417f0000000000000000000000000000000000000000000000000000000000000001587f000000000000000000000000000000000000000000000000000000000000c3506fff59876660063b7c8df1ff088a8414"
             ],
             "gasLimit" : [
-                "0x6d929716"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest200Filler.json b/tests/static/state_tests/stRandom/randomStatetest200Filler.json
index b2cec9f4921..7c2be26956a 100644
--- a/tests/static/state_tests/stRandom/randomStatetest200Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest200Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x437f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>346f42051af2a24050039e9d3a678b028a0a80"
             ],
             "gasLimit" : [
-                "0x138a126b"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest201Filler.json b/tests/static/state_tests/stRandom/randomStatetest201Filler.json
index e8960cce037..fac56360beb 100644
--- a/tests/static/state_tests/stRandom/randomStatetest201Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest201Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09ff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff8b8263974074da449e68610399"
             ],
             "gasLimit" : [
-                "0x49308968"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest202Filler.json b/tests/static/state_tests/stRandom/randomStatetest202Filler.json
index 2de8b2eaeb2..00f62f46b9f 100644
--- a/tests/static/state_tests/stRandom/randomStatetest202Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest202Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000557f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6750a3190486f0"
             ],
             "gasLimit" : [
-                "0x1d183aaa"
+                "0x186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest204Filler.json b/tests/static/state_tests/stRandom/randomStatetest204Filler.json
index b7afe28e2aa..01a87107d23 100644
--- a/tests/static/state_tests/stRandom/randomStatetest204Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest204Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0982"
             ],
             "gasLimit" : [
-                "0x4d39e437"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest205Filler.json b/tests/static/state_tests/stRandom/randomStatetest205Filler.json
index eaa6e34261d..9ab6bef6d5b 100644
--- a/tests/static/state_tests/stRandom/randomStatetest205Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest205Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x74ac5e422199cb842b1fdcdef502d4142d033387c6d17fe1f03f0fc4a3c05daadf323f3bb04b7e33dbad9b32f058aa6df6d54c8d7ac95568ba4a6b33a2b0ce8d8c7480ab9e818cf8998564e6d38b92aa1ecd76aa8aff266dd266c96af419778c16a109cba6976922093e50bda96ac1333a946574ad748ad839546ff861257bb6a41cab34045ea7335e1c9667c67424f9baf8781e79e002a233a622f41f2744c21b6baed43543e0dfb9aa81fd1050326b0ebad84fda176f3438d3a7f083"
             ],
             "gasLimit" : [
-                "0x5f2173d3"
+                "0x6f63a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest206Filler.json b/tests/static/state_tests/stRandom/randomStatetest206Filler.json
index fa3456ebe52..c63d3c723b4 100644
--- a/tests/static/state_tests/stRandom/randomStatetest206Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest206Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>427f0000000000000000000000000000000000000000000000000000000000000001427f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6f45736d8e806138378d62087320313c"
             ],
             "gasLimit" : [
-                "0x516e1a90"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest208Filler.json b/tests/static/state_tests/stRandom/randomStatetest208Filler.json
index 35962538c41..fa622ffcc74 100644
--- a/tests/static/state_tests/stRandom/randomStatetest208Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest208Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff09"
             ],
             "gasLimit" : [
-                "0x5534566d"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest209Filler.json b/tests/static/state_tests/stRandom/randomStatetest209Filler.json
index 08353b77bab..ac56304c940 100644
--- a/tests/static/state_tests/stRandom/randomStatetest209Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest209Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0951537d3c6474623b781181a3"
             ],
             "gasLimit" : [
-                "0x44953718"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest20Filler.json b/tests/static/state_tests/stRandom/randomStatetest20Filler.json
index f702ffa4733..92da1732123 100644
--- a/tests/static/state_tests/stRandom/randomStatetest20Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest20Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x31417f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0315208a675944747f7430661519049a"
             ],
             "gasLimit" : [
-                "0x29fb0320"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest210Filler.json b/tests/static/state_tests/stRandom/randomStatetest210Filler.json
index eace37682cf..616f76ae725 100644
--- a/tests/static/state_tests/stRandom/randomStatetest210Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest210Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09"
             ],
             "gasLimit" : [
-                "0x56c7e888"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest211Filler.json b/tests/static/state_tests/stRandom/randomStatetest211Filler.json
index 0eb975af629..d7ae90f1a68 100644
--- a/tests/static/state_tests/stRandom/randomStatetest211Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest211Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7205d6a65458a0cdecda703b9d5440616f95b179076dfa7631cbf765dab81235497f97ddb6e8d399d5294ea49cfd736cdfa49a08a76dc08eff97542b54399a1b5f86b168d33cd083ac41074aa37e2f3f77a248d5db21a54d72c5053f2a79b2048d142fd588c56c48e39fa86bd16645ae7e31281c806dc847b38aba609fb88b5a3c6ce02d711bc1cb89419d740c65fcd7cd9abc94d8aaf97bfb874ed35e242cee6a462cac825efc8b53b43f7687a32b635c969cb779fecda8dcbd0dd35ef6ab482083a8b91f6199bb8050971caa227ac9ad77edf44708d99ac08e92c8c1ff6e536a3eb4625c2d8c514c8a799391a90cb528870e725560136162fb2632b2485e26d9604de562740ee89a2a5b4b1976272d046167f2151feea60ecc547dc9dc31b91ee0a712579874ebef218c4f015cbd8e76040f19d828eed7f9c070a127ce6067ad9831363977e2846559c8b97cfb3b0e8502cd54779657ab8571534f06e34b0d78259338706fac01057e66310e07ef4017629f7bf12ca747aafe8d7ccfcb78b5535dd267e3b445028e40113e1b9ccb7174b36264cfc5606cc1b4815c744393665f0a1c2ce78ff3679513083c95496a6869fe735535b8751fc5455769b44d7c9689576f2b76cb63bae9b5a47f8afd0c0466e798bf78d10b0efecc7e30695891cdc85e5f7a2827dc0b2ad41f92666faa9578ad77aa79aef0363cf4c69574bdfb74601f99ca8df4fbb481dd921b4b580a789e59c7557f305a1804f30d08c10394bc281772eef178800e0f79161010fdff6e028d5be7c0dfc295520e9b5f7fb781fb23ebd9657a42d8623d58350d43a9031a8b7e23c72ea3af0b137386987549539d695dd3e19c2cac0855644773b40cae7e824e3912190e7a6aec7bb06e5c923de8750674988f11efac6aabfc209262900167c7c18e7826b18c6e65696c94c79ed8f574d69ffb0de2046a602f2e9eeb57a764e01cae63fc0e6c11703a61af60fd0c2a6af1e06d545b5ed713146d8b98783da81f50ff3aa0e244e15e73dc099f2266d4ee2fc130375a1cf3341167c5c0586d179a0d6f622951a8e0fc895e4edf64bb1ec825496d2d85c826a263045936448e65d6608d729e8aeb3f8cf65a8addee9da3fe2b2ba4a0e6de6576a5221a372b64abb962d43a76c4519471d55c4425b57b3fef0f46bc07b1e1b4126cab307a91392cedd4fab180e6a943c648703e5058ea2aaa6aa3c1b019a9538e604a7581ea0f2b78b7ad3673313b8d926ab9ad21f10f2c3055732cf0b787838b61e5b85a079913a88cff7819d4066d551729495f62f0f4710cb0962d2460b57e5a5d09a316f7bdd937dd7f809b72c2e4b898648da7f7aea76ec34a016ab863705ad67458a497014e10e75f7d7710fc7784743cc30aa920ad10d24a82a074fa0db118dd5887c4346712f22b6d2e55e99769224338e00cd62030907f6df46f4b14bbd57d01102d02153fb569e432111eaafdd9bb68ff7d35f7590dff5a35eeea2bf69beae63c3e4e6fcbdc19d79f7bb919b2165aab76ce9cc9882ea258d9fd497168b5e9ed5ea3f323f94d5c6a6de663222b5971a8238121faeed83a8e"
             ],
             "gasLimit" : [
-                "0x2e0e0d78"
+                "0x927c0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest212Filler.json b/tests/static/state_tests/stRandom/randomStatetest212Filler.json
index 848a2bd4d3c..3b44242c986 100644
--- a/tests/static/state_tests/stRandom/randomStatetest212Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest212Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe06180908ff3a68f28e61990a52"
             ],
             "gasLimit" : [
-                "0x417ddd1e"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest214Filler.json b/tests/static/state_tests/stRandom/randomStatetest214Filler.json
index 4a95df1e5a6..0abd6e94439 100644
--- a/tests/static/state_tests/stRandom/randomStatetest214Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest214Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff150a6f7b056b335a15a48d7b8841163a503963"
             ],
             "gasLimit" : [
-                "0x1092050b"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest215Filler.json b/tests/static/state_tests/stRandom/randomStatetest215Filler.json
index 663ba73f013..fb14952e95b 100644
--- a/tests/static/state_tests/stRandom/randomStatetest215Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest215Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff446f728f4f1065583139780a981510173b9c"
             ],
             "gasLimit" : [
-                "0x36f5a3d2"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest216Filler.json b/tests/static/state_tests/stRandom/randomStatetest216Filler.json
index bc0e195e944..6bd6cbe0d0e 100644
--- a/tests/static/state_tests/stRandom/randomStatetest216Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest216Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350447f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3506d766d67fe078532089913064494"
             ],
             "gasLimit" : [
-                "0x08befbe7"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest217Filler.json b/tests/static/state_tests/stRandom/randomStatetest217Filler.json
index dd6ca2a2904..7f0c63e5aef 100644
--- a/tests/static/state_tests/stRandom/randomStatetest217Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest217Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001377f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350"
             ],
             "gasLimit" : [
-                "0x3023ee24"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest219Filler.json b/tests/static/state_tests/stRandom/randomStatetest219Filler.json
index 20f5fa993d4..007a6698f3e 100644
--- a/tests/static/state_tests/stRandom/randomStatetest219Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest219Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3506f6253443a4104027144577f33998320"
             ],
             "gasLimit" : [
-                "0x647e4cf8"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest220Filler.json b/tests/static/state_tests/stRandom/randomStatetest220Filler.json
index dbb8b326f74..3bd2a28f174 100644
--- a/tests/static/state_tests/stRandom/randomStatetest220Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest220Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000016f420380a03c4282a3540a1a333a843a"
             ],
             "gasLimit" : [
-                "0x137092c2"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest221Filler.json b/tests/static/state_tests/stRandom/randomStatetest221Filler.json
index 0aa61b5855f..8ac9ef0d387 100644
--- a/tests/static/state_tests/stRandom/randomStatetest221Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest221Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x457f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6f977789947e197f828151867a73771a"
             ],
             "gasLimit" : [
-                "0x3247a673"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest222Filler.json b/tests/static/state_tests/stRandom/randomStatetest222Filler.json
index dce31d374ad..e0294d173e7 100644
--- a/tests/static/state_tests/stRandom/randomStatetest222Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest222Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000001000000000000000000000000000000000000000043397f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c35081"
             ],
             "gasLimit" : [
-                "0x36cd506d"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest225Filler.json b/tests/static/state_tests/stRandom/randomStatetest225Filler.json
index 7634b19feb2..be35d02dbab 100644
--- a/tests/static/state_tests/stRandom/randomStatetest225Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest225Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff506f69786c858e0703566f95f89931119019"
             ],
             "gasLimit" : [
-                "0x25d6c447"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest226Filler.json b/tests/static/state_tests/stRandom/randomStatetest226Filler.json
index 0aaef6df4bd..551cd2d0f2c 100644
--- a/tests/static/state_tests/stRandom/randomStatetest226Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest226Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest227Filler.json b/tests/static/state_tests/stRandom/randomStatetest227Filler.json
index 66749429090..8e3585a0665 100644
--- a/tests/static/state_tests/stRandom/randomStatetest227Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest227Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6f108fa27475689e44993a528752a1523359"
             ],
             "gasLimit" : [
-                "0x2d195619"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest22Filler.json b/tests/static/state_tests/stRandom/randomStatetest22Filler.json
index 67ce8a70570..677de5758dd 100644
--- a/tests/static/state_tests/stRandom/randomStatetest22Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest22Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x6d417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7e969f926084143c79"
             ],
             "gasLimit" : [
-                "0x60e16136"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest230Filler.json b/tests/static/state_tests/stRandom/randomStatetest230Filler.json
index 046f7b47b9d..6466913d510 100644
--- a/tests/static/state_tests/stRandom/randomStatetest230Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest230Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09"
             ],
             "gasLimit" : [
-                "0x762004ae"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest231Filler.json b/tests/static/state_tests/stRandom/randomStatetest231Filler.json
index 34a63eef99c..f7738ca8667 100644
--- a/tests/static/state_tests/stRandom/randomStatetest231Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest231Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6f7b98a491727a089df3365353329e80"
             ],
             "gasLimit" : [
-                "0x7629809a"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest232Filler.json b/tests/static/state_tests/stRandom/randomStatetest232Filler.json
index af6264ba7ac..d24626fc09d 100644
--- a/tests/static/state_tests/stRandom/randomStatetest232Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest232Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0945415883ff9d77"
             ],
             "gasLimit" : [
-                "0x4d30a31a"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest233Filler.json b/tests/static/state_tests/stRandom/randomStatetest233Filler.json
index c7285d85874..f6893676bac 100644
--- a/tests/static/state_tests/stRandom/randomStatetest233Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest233Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff42057f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff517f0000000000000000000000010000000000000000000000000000000000000000657154"
             ],
             "gasLimit" : [
-                "0x16fb234b"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest236Filler.json b/tests/static/state_tests/stRandom/randomStatetest236Filler.json
index e2f726847d5..1edfe754aa7 100644
--- a/tests/static/state_tests/stRandom/randomStatetest236Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest236Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000433918"
             ],
             "gasLimit" : [
-                "0x26ab5372"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest237Filler.json b/tests/static/state_tests/stRandom/randomStatetest237Filler.json
index e178e0067ed..e5f4d17169a 100644
--- a/tests/static/state_tests/stRandom/randomStatetest237Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest237Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000001537f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000003938"
             ],
             "gasLimit" : [
-                "0x02aaddc3"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest238Filler.json b/tests/static/state_tests/stRandom/randomStatetest238Filler.json
index cb7c5e41a8c..8a5d08bc4ad 100644
--- a/tests/static/state_tests/stRandom/randomStatetest238Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest238Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff307fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f7c748813587e990566719934f342316c"
             ],
             "gasLimit" : [
-                "0x22423c20"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest23Filler.json b/tests/static/state_tests/stRandom/randomStatetest23Filler.json
index 380d114930f..43059141809 100644
--- a/tests/static/state_tests/stRandom/randomStatetest23Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest23Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f0000000000000000000000000000000000000000000000000000000000000001427f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f89418c1076f1544315601489386c91"
             ],
             "gasLimit" : [
-                "0x0430d0b2"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest242Filler.json b/tests/static/state_tests/stRandom/randomStatetest242Filler.json
index 7c85f038a17..c3ff801947e 100644
--- a/tests/static/state_tests/stRandom/randomStatetest242Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest242Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08"
             ],
             "gasLimit" : [
-                "0x7d3b2ec5"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest243Filler.json b/tests/static/state_tests/stRandom/randomStatetest243Filler.json
index bc4a86ab3a4..551efefa5e5 100644
--- a/tests/static/state_tests/stRandom/randomStatetest243Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest243Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f424544664076406862554558668490"
             ],
             "gasLimit" : [
-                "0x11036354"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest245Filler.json b/tests/static/state_tests/stRandom/randomStatetest245Filler.json
index 0fd9b8a0e3b..313d222fb7f 100644
--- a/tests/static/state_tests/stRandom/randomStatetest245Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest245Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff157f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0469877c3914165043458789"
             ],
             "gasLimit" : [
-                "0x4b9c3fb3"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest247Filler.json b/tests/static/state_tests/stRandom/randomStatetest247Filler.json
index 8185a010b53..19248c95799 100644
--- a/tests/static/state_tests/stRandom/randomStatetest247Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest247Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe04"
             ],
             "gasLimit" : [
-                "0x25cef0ca"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest248Filler.json b/tests/static/state_tests/stRandom/randomStatetest248Filler.json
index c36081456cd..8659ffff34d 100644
--- a/tests/static/state_tests/stRandom/randomStatetest248Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest248Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000001427f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8636f25990"
             ],
             "gasLimit" : [
-                "0x2fbe208d"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest249Filler.json b/tests/static/state_tests/stRandom/randomStatetest249Filler.json
index 3c2b6561654..eead74ccacf 100644
--- a/tests/static/state_tests/stRandom/randomStatetest249Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest249Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000000012807f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000039"
             ],
             "gasLimit" : [
-                "0x4c5b7c7c"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest24Filler.json b/tests/static/state_tests/stRandom/randomStatetest24Filler.json
index 52a8f3c352b..46c5edf0d4c 100644
--- a/tests/static/state_tests/stRandom/randomStatetest24Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest24Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x41417f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff459d7f0000000000000000000000000000000000000000000000000000000000000001817f000000000000000000000000000000000000000000000000000000000000c35095418211337b053043"
             ],
             "gasLimit" : [
-                "0x2ae4f392"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest250Filler.json b/tests/static/state_tests/stRandom/randomStatetest250Filler.json
index 366ec831d96..7f0959ae5d5 100644
--- a/tests/static/state_tests/stRandom/randomStatetest250Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest250Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x557ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>627f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6a328b186e166407917c7af1029250"
             ],
             "gasLimit" : [
-                "0x578d9202"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest251Filler.json b/tests/static/state_tests/stRandom/randomStatetest251Filler.json
index 0548670a61f..a7b875fdb71 100644
--- a/tests/static/state_tests/stRandom/randomStatetest251Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest251Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7f0000000000000000000000000000000000000000000000000000000000000000447f000000000000000000000000000000000000000000000000000000000000c3505b7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417f00000000000000000000000000000000000000000000000000000000000000006867f1"
             ],
             "gasLimit" : [
-                "0x435eefa4"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest254Filler.json b/tests/static/state_tests/stRandom/randomStatetest254Filler.json
index e09dc548b38..2b894c7f958 100644
--- a/tests/static/state_tests/stRandom/randomStatetest254Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest254Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000001000000000000000000000000000000000000000041417f0000000000000000000000000000000000000000000000000000000000000001447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3506f059b6b83f294740688598c52195a92"
             ],
             "gasLimit" : [
-                "0x6118b302"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest257Filler.json b/tests/static/state_tests/stRandom/randomStatetest257Filler.json
index 51a25067b71..c18f8fe7293 100644
--- a/tests/static/state_tests/stRandom/randomStatetest257Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest257Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff337f000000000000000000000000000000000000000000000000000000000000000099447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350735b9f81208b6f5266"
             ],
             "gasLimit" : [
-                "0x797a6e04"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest259Filler.json b/tests/static/state_tests/stRandom/randomStatetest259Filler.json
index 895ffb64cfd..56ae3e5b474 100644
--- a/tests/static/state_tests/stRandom/randomStatetest259Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest259Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001587fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f04831adc0812f09544927407900709"
             ],
             "gasLimit" : [
-                "0x5fd034fd"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest25Filler.json b/tests/static/state_tests/stRandom/randomStatetest25Filler.json
index 6375fc5da19..86536f843be 100644
--- a/tests/static/state_tests/stRandom/randomStatetest25Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest25Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x427f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000010000000000000000000000000000000000000000437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff807f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6844f1389163a444405b123678749c"
             ],
             "gasLimit" : [
-                "0x2d34dd42"
+                "0x186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest260Filler.json b/tests/static/state_tests/stRandom/randomStatetest260Filler.json
index 4087847a37f..5d48ce5d120 100644
--- a/tests/static/state_tests/stRandom/randomStatetest260Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest260Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001a07ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350f36409156a6aa261413b56f208"
             ],
             "gasLimit" : [
-                "0x39619002"
+                "0x7a120"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest261Filler.json b/tests/static/state_tests/stRandom/randomStatetest261Filler.json
index 9830f19c9be..45271ae4add 100644
--- a/tests/static/state_tests/stRandom/randomStatetest261Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest261Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f0000000000000000000000000000000000000000000000000000000000000000447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000001231b61993"
             ],
             "gasLimit" : [
-                "0x5436a763"
+                "0x186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest263Filler.json b/tests/static/state_tests/stRandom/randomStatetest263Filler.json
index 47f3c1fff46..a8e30368d7f 100644
--- a/tests/static/state_tests/stRandom/randomStatetest263Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest263Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest264Filler.json b/tests/static/state_tests/stRandom/randomStatetest264Filler.json
index def0c26915e..28449f59a5a 100644
--- a/tests/static/state_tests/stRandom/randomStatetest264Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest264Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09"
             ],
             "gasLimit" : [
-                "0x6464e025"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest265Filler.json b/tests/static/state_tests/stRandom/randomStatetest265Filler.json
index 0595ca5c26c..25b036a315c 100644
--- a/tests/static/state_tests/stRandom/randomStatetest265Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest265Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3503b7f000000000000000000000000000000000000000000000000000000000000c3506a7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000745b9b824070397f9219"
             ],
             "gasLimit" : [
-                "0x6c4dfece"
+                "0x186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest266Filler.json b/tests/static/state_tests/stRandom/randomStatetest266Filler.json
index 75b84046545..ec32571c29c 100644
--- a/tests/static/state_tests/stRandom/randomStatetest266Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest266Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x3041047f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000005555945667793459633c9930"
             ],
             "gasLimit" : [
-                "0x7b1c24b1"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest267Filler.json b/tests/static/state_tests/stRandom/randomStatetest267Filler.json
index 0142bb7d552..8d5a9aa39b6 100644
--- a/tests/static/state_tests/stRandom/randomStatetest267Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest267Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x447f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5a132776d398e3b7c14686a07346f"
             ],
             "gasLimit" : [
-                "0x0a7ed73a"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest268Filler.json b/tests/static/state_tests/stRandom/randomStatetest268Filler.json
index 125d543a10c..d738efa75be 100644
--- a/tests/static/state_tests/stRandom/randomStatetest268Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest268Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000016f7466f0a0733d863263934063409442"
             ],
             "gasLimit" : [
-                "0x7ec94731"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest269Filler.json b/tests/static/state_tests/stRandom/randomStatetest269Filler.json
index 3927fe4a23c..df033666fa4 100644
--- a/tests/static/state_tests/stRandom/randomStatetest269Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest269Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6676029968ffa27d04"
             ],
             "gasLimit" : [
-                "0x67dad272"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest270Filler.json b/tests/static/state_tests/stRandom/randomStatetest270Filler.json
index f42e9bbe725..c94b31f7661 100644
--- a/tests/static/state_tests/stRandom/randomStatetest270Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest270Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x427f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000139"
             ],
             "gasLimit" : [
-                "0x47b15b47"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest271Filler.json b/tests/static/state_tests/stRandom/randomStatetest271Filler.json
index 8c5c150a42a..be7fa7a1bf5 100644
--- a/tests/static/state_tests/stRandom/randomStatetest271Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest271Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7f0000000000000000000000000000000000000000000000000000000000000001457f000000000000000000000000000000000000000000000000000000000000c350417f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f0000000000000000000000000000000000000000000000000000000000000000357f00000000000000000000000000000000000000000000000000000000000000000b6d7d958a026999"
             ],
             "gasLimit" : [
-                "0x238967b7"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest274Filler.json b/tests/static/state_tests/stRandom/randomStatetest274Filler.json
index 1f8e35c3060..efccccb917b 100644
--- a/tests/static/state_tests/stRandom/randomStatetest274Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest274Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffffa405457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>88015a9a0542a13a051497514215"
             ],
             "gasLimit" : [
-                "0x0fc46a54"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest275Filler.json b/tests/static/state_tests/stRandom/randomStatetest275Filler.json
index a606223edd7..24628e686b5 100644
--- a/tests/static/state_tests/stRandom/randomStatetest275Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest275Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x437f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000197ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09656756323c5974"
             ],
             "gasLimit" : [
-                "0x115932d1"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest276Filler.json b/tests/static/state_tests/stRandom/randomStatetest276Filler.json
index 33545f999e2..d7fa4b1c991 100644
--- a/tests/static/state_tests/stRandom/randomStatetest276Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest276Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f4382349f7b370589141a31f39741a4f2"
             ],
             "gasLimit" : [
-                "0x3c61719a"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest278Filler.json b/tests/static/state_tests/stRandom/randomStatetest278Filler.json
index ceca9dfc7f1..df21b2aea55 100644
--- a/tests/static/state_tests/stRandom/randomStatetest278Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest278Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001377f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff"
             ],
             "gasLimit" : [
-                "0x030e94ac"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest279Filler.json b/tests/static/state_tests/stRandom/randomStatetest279Filler.json
index add6cea5fbe..707c06ac885 100644
--- a/tests/static/state_tests/stRandom/randomStatetest279Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest279Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000947f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>"
             ],
             "gasLimit" : [
-                "0x3e7f5362"
+                "0x186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest27Filler.json b/tests/static/state_tests/stRandom/randomStatetest27Filler.json
index 3eef559c07a..310715bb74e 100644
--- a/tests/static/state_tests/stRandom/randomStatetest27Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest27Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001000000000000000000000000000000000000000009"
             ],
             "gasLimit" : [
-                "0x0842a949"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest280Filler.json b/tests/static/state_tests/stRandom/randomStatetest280Filler.json
index 9f4885dfacd..eecb64047fb 100644
--- a/tests/static/state_tests/stRandom/randomStatetest280Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest280Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000000143507f000000000000000000000000000000000000000000000000000000000000c350417f00000000000000000000000000000000000000000000000000000000000000006f423b3c407e7c6f16718668738d193cf2"
             ],
             "gasLimit" : [
-                "0x2db9c369"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest281Filler.json b/tests/static/state_tests/stRandom/randomStatetest281Filler.json
index 9fa4a8b42c3..9c5d7e77452 100644
--- a/tests/static/state_tests/stRandom/randomStatetest281Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest281Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>457f000000000000000000000000000000000000000000000000000000000000c350417f00000000000000000000000000000000000000000000000000000000000000016f649a7a3457645670a27fa170639718a2"
             ],
             "gasLimit" : [
-                "0x0f3fa3a9"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest282Filler.json b/tests/static/state_tests/stRandom/randomStatetest282Filler.json
index bfc069adcae..da330d37646 100644
--- a/tests/static/state_tests/stRandom/randomStatetest282Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest282Filler.json
@@ -58,7 +58,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>ff447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff429d41"
             ],
             "gasLimit" : [
-                "0x2939ccd0"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest283Filler.json b/tests/static/state_tests/stRandom/randomStatetest283Filler.json
index 7c254c97684..6fbea2e5dcb 100644
--- a/tests/static/state_tests/stRandom/randomStatetest283Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest283Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000139"
             ],
             "gasLimit" : [
-                "0x58009341"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest286Filler.json b/tests/static/state_tests/stRandom/randomStatetest286Filler.json
index 3f77bb2eba8..016464e0ab9 100644
--- a/tests/static/state_tests/stRandom/randomStatetest286Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest286Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest28Filler.json b/tests/static/state_tests/stRandom/randomStatetest28Filler.json
index 51686d75a5b..9bade42c94c 100644
--- a/tests/static/state_tests/stRandom/randomStatetest28Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest28Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff417f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6f38129d68939a19a2697172926f6a673630"
             ],
             "gasLimit" : [
-                "0x1996674b"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest290Filler.json b/tests/static/state_tests/stRandom/randomStatetest290Filler.json
index c90daf104ba..7c26b3c660d 100644
--- a/tests/static/state_tests/stRandom/randomStatetest290Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest290Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe8309"
             ],
             "gasLimit" : [
-                "0x324884a5"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest291Filler.json b/tests/static/state_tests/stRandom/randomStatetest291Filler.json
index b200cb1071a..92ad1e2d735 100644
--- a/tests/static/state_tests/stRandom/randomStatetest291Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest291Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001"
             ],
             "gasLimit" : [
-                "0x1b7d47a1"
+                "0x186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest292Filler.json b/tests/static/state_tests/stRandom/randomStatetest292Filler.json
index e75a499e821..9f62adf7be8 100644
--- a/tests/static/state_tests/stRandom/randomStatetest292Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest292Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>417f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000013063a09c825a338e"
             ],
             "gasLimit" : [
-                "0x49b45fb5"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest293Filler.json b/tests/static/state_tests/stRandom/randomStatetest293Filler.json
index 36f4b562b18..fd835ae1e1a 100644
--- a/tests/static/state_tests/stRandom/randomStatetest293Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest293Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f458962699489837460090897f305668284"
             ],
             "gasLimit" : [
-                "0x0d2d827e"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest294Filler.json b/tests/static/state_tests/stRandom/randomStatetest294Filler.json
index 6556750affa..cf9408dd9f4 100644
--- a/tests/static/state_tests/stRandom/randomStatetest294Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest294Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x057fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe3c7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9d0718f377825843028dfa02158878"
             ],
             "gasLimit" : [
-                "0x54175ae5"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest295Filler.json b/tests/static/state_tests/stRandom/randomStatetest295Filler.json
index 92ea6c17867..edf7bf5b479 100644
--- a/tests/static/state_tests/stRandom/randomStatetest295Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest295Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>31353a0b3c8b17eb"
             ],
             "gasLimit" : [
-                "0x6f8c60a2"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest296Filler.json b/tests/static/state_tests/stRandom/randomStatetest296Filler.json
index 843b1f21e23..ce8b40bbbbc 100644
--- a/tests/static/state_tests/stRandom/randomStatetest296Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest296Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff417f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>385b9655558f510a6c73"
             ],
             "gasLimit" : [
-                "0x3b53c7bd"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest297Filler.json b/tests/static/state_tests/stRandom/randomStatetest297Filler.json
index 7f4eadef561..f7b729b8da1 100644
--- a/tests/static/state_tests/stRandom/randomStatetest297Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest297Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>437f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe426f91085661509214157d9c8a77758518"
             ],
             "gasLimit" : [
-                "0x0614cc9c"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest298Filler.json b/tests/static/state_tests/stRandom/randomStatetest298Filler.json
index 137c91bfd6e..9197b6ae7a0 100644
--- a/tests/static/state_tests/stRandom/randomStatetest298Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest298Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3500a6f7c542006528b69ff3a7a3a0401613c"
             ],
             "gasLimit" : [
-                "0x6b2d7597"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest299Filler.json b/tests/static/state_tests/stRandom/randomStatetest299Filler.json
index aee0e066f24..610ab76aa66 100644
--- a/tests/static/state_tests/stRandom/randomStatetest299Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest299Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f540813697adf70f20906389d128bf0"
             ],
             "gasLimit" : [
-                "0x05416db1"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest29Filler.json b/tests/static/state_tests/stRandom/randomStatetest29Filler.json
index 2f466d0cc11..2f8f11342d1 100644
--- a/tests/static/state_tests/stRandom/randomStatetest29Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest29Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff087fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09"
             ],
             "gasLimit" : [
-                "0x4d5c10f8"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest2Filler.json b/tests/static/state_tests/stRandom/randomStatetest2Filler.json
index 6f6cc16b04b..9ef1128355d 100644
--- a/tests/static/state_tests/stRandom/randomStatetest2Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest2Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>58437f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000016f3412a47c889e8da06a04049f049888"
             ],
             "gasLimit" : [
-                "0x5b03398e"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest300Filler.json b/tests/static/state_tests/stRandom/randomStatetest300Filler.json
index 2a37f30c776..cea192d7091 100644
--- a/tests/static/state_tests/stRandom/randomStatetest300Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest300Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7f0000000000000000000000000000000000000000000000000000000000000000447f000000000000000000000000000000000000000000000000000000000000c350757f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350"
             ],
             "gasLimit" : [
-                "0x66e1ca2f"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest301Filler.json b/tests/static/state_tests/stRandom/randomStatetest301Filler.json
index 4f393a54fbb..7fb6b8ce6e5 100644
--- a/tests/static/state_tests/stRandom/randomStatetest301Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest301Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000003784946a737aa092f1975664518a"
             ],
             "gasLimit" : [
-                "0x38ef9f8a"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest302Filler.json b/tests/static/state_tests/stRandom/randomStatetest302Filler.json
index 2958318368c..1def2a8d913 100644
--- a/tests/static/state_tests/stRandom/randomStatetest302Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest302Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000971a7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff447f00000000000000000000000000000000000000000000000000000000000000006989206c0b8a01867bf1"
             ],
             "gasLimit" : [
-                "0x10412a73"
+                "0x186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest303Filler.json b/tests/static/state_tests/stRandom/randomStatetest303Filler.json
index bbf89bab805..6b1acbce461 100644
--- a/tests/static/state_tests/stRandom/randomStatetest303Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest303Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff441a35803a0ba466999137"
             ],
             "gasLimit" : [
-                "0x52614e46"
+                "0x186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest304Filler.json b/tests/static/state_tests/stRandom/randomStatetest304Filler.json
index 9bf039781b8..27a57f9a25d 100644
--- a/tests/static/state_tests/stRandom/randomStatetest304Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest304Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f0000000000000000000000010000000000000000000000000000000000000000a27f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff167ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff42070b8c5430070bf1"
             ],
             "gasLimit" : [
-                "0x2e4c7a7b"
+                "0x186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest305Filler.json b/tests/static/state_tests/stRandom/randomStatetest305Filler.json
index 8cbdf4f5b4b..14f174cccc9 100644
--- a/tests/static/state_tests/stRandom/randomStatetest305Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest305Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000006f606e048240069c409313318736200b"
             ],
             "gasLimit" : [
-                "0x55424e44"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest306Filler.json b/tests/static/state_tests/stRandom/randomStatetest306Filler.json
index 383ddec3ce9..3a725c9b54e 100644
--- a/tests/static/state_tests/stRandom/randomStatetest306Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest306Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest307Filler.json b/tests/static/state_tests/stRandom/randomStatetest307Filler.json
index d2b67976e7a..2fb77726019 100644
--- a/tests/static/state_tests/stRandom/randomStatetest307Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest307Filler.json
@@ -61,7 +61,7 @@
                 ":raw 0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5547f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000037f0"
             ],
             "gasLimit" : [
-                "0x1f729d33"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest308Filler.json b/tests/static/state_tests/stRandom/randomStatetest308Filler.json
index 248fdf4e60f..b643803d653 100644
--- a/tests/static/state_tests/stRandom/randomStatetest308Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest308Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest310Filler.json b/tests/static/state_tests/stRandom/randomStatetest310Filler.json
index bcf716ea58b..528c54a8a6f 100644
--- a/tests/static/state_tests/stRandom/randomStatetest310Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest310Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x44587fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff59907fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1a37160b6a650645597c796e9c9795"
             ],
             "gasLimit" : [
-                "0x1a37e2dd"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest311Filler.json b/tests/static/state_tests/stRandom/randomStatetest311Filler.json
index 9a5119d9b53..42973866c72 100644
--- a/tests/static/state_tests/stRandom/randomStatetest311Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest311Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x447f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f13971264a1197d72ff18971902387b"
             ],
             "gasLimit" : [
-                "0x7a558581"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest312Filler.json b/tests/static/state_tests/stRandom/randomStatetest312Filler.json
index 7df1035a44d..9f001e4bb24 100644
--- a/tests/static/state_tests/stRandom/randomStatetest312Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest312Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff427f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f0000000000000000000000000000000000000000000000000000000000000000187b"
             ],
             "gasLimit" : [
-                "0x4e58e928"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest313Filler.json b/tests/static/state_tests/stRandom/randomStatetest313Filler.json
index e56ec5f4baa..0ffaf470a52 100644
--- a/tests/static/state_tests/stRandom/randomStatetest313Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest313Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x0b7f00000000000000000000000000000000000000000000000000000000000000013c7f000000000000000000000000000000000000000000000000000000000000c350a345457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8287a3208c8c5a"
             ],
             "gasLimit" : [
-                "0x48597866"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest315Filler.json b/tests/static/state_tests/stRandom/randomStatetest315Filler.json
index 589adde76f6..e47df471286 100644
--- a/tests/static/state_tests/stRandom/randomStatetest315Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest315Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff067f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f98516a388683755669892b8b371957"
             ],
             "gasLimit" : [
-                "0x51b0da03"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest316Filler.json b/tests/static/state_tests/stRandom/randomStatetest316Filler.json
index c76f9c65298..f770b95d451 100644
--- a/tests/static/state_tests/stRandom/randomStatetest316Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest316Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08"
             ],
             "gasLimit" : [
-                "0x424838c7"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest318Filler.json b/tests/static/state_tests/stRandom/randomStatetest318Filler.json
index af97ffecbc7..8d7665fd15f 100644
--- a/tests/static/state_tests/stRandom/randomStatetest318Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest318Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350457f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3506f8206a30a83887e5a3164667796308d"
             ],
             "gasLimit" : [
-                "0x7aa140cd"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest31Filler.json b/tests/static/state_tests/stRandom/randomStatetest31Filler.json
index 704543d16de..f59e9eaef7b 100644
--- a/tests/static/state_tests/stRandom/randomStatetest31Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest31Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x387f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000009037"
             ],
             "gasLimit" : [
-                "0x2406346e"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest320Filler.json b/tests/static/state_tests/stRandom/randomStatetest320Filler.json
index dea2ca58567..673100529b0 100644
--- a/tests/static/state_tests/stRandom/randomStatetest320Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest320Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff45457f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3505b0a36095511805131558f14fc3b"
             ],
             "gasLimit" : [
-                "0x20a389d0"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest321Filler.json b/tests/static/state_tests/stRandom/randomStatetest321Filler.json
index ebabbb1e972..21e6b5e2156 100644
--- a/tests/static/state_tests/stRandom/randomStatetest321Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest321Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000006a7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff033a06869867986202413a537c"
             ],
             "gasLimit" : [
-                "0x7d74638e"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest322Filler.json b/tests/static/state_tests/stRandom/randomStatetest322Filler.json
index fe9acf8eb9d..41c3a3968f1 100644
--- a/tests/static/state_tests/stRandom/randomStatetest322Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest322Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000427f000000000000000000000000000000000000000000000000000000000000c3506f1206060508840294304101a3128f34"
             ],
             "gasLimit" : [
-                "0x5a3b8dbb"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest323Filler.json b/tests/static/state_tests/stRandom/randomStatetest323Filler.json
index 664177731df..8e751824bcb 100644
--- a/tests/static/state_tests/stRandom/randomStatetest323Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest323Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x6f7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe74977f000000000000000000000000000000000000000000000000000000000000c3506f6b79361811363920"
             ],
             "gasLimit" : [
-                "0x5bca15f0"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest325Filler.json b/tests/static/state_tests/stRandom/randomStatetest325Filler.json
index 1c6347df63b..0814017845a 100644
--- a/tests/static/state_tests/stRandom/randomStatetest325Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest325Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe810903"
             ],
             "gasLimit" : [
-                "0x3cc91dd8"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest326Filler.json b/tests/static/state_tests/stRandom/randomStatetest326Filler.json
index 578614016f0..ed5fbf426ea 100644
--- a/tests/static/state_tests/stRandom/randomStatetest326Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest326Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest327Filler.json b/tests/static/state_tests/stRandom/randomStatetest327Filler.json
index 3cc997c412e..53b0a93ccdd 100644
--- a/tests/static/state_tests/stRandom/randomStatetest327Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest327Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001458b5554397513"
             ],
             "gasLimit" : [
-                "0x72cdf186"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest329Filler.json b/tests/static/state_tests/stRandom/randomStatetest329Filler.json
index fc6bd7def74..fb1ebaa64a0 100644
--- a/tests/static/state_tests/stRandom/randomStatetest329Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest329Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff426fa48d775458574133769c8b750207ff"
             ],
             "gasLimit" : [
-                "0x6424e6d2"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest332Filler.json b/tests/static/state_tests/stRandom/randomStatetest332Filler.json
index bbf9f9c9618..38af5c679c9 100644
--- a/tests/static/state_tests/stRandom/randomStatetest332Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest332Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f7c098e7d625a64319d9e514bf35075"
             ],
             "gasLimit" : [
-                "0x300945c7"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest333Filler.json b/tests/static/state_tests/stRandom/randomStatetest333Filler.json
index 2b54cddaa80..3e4191f77ca 100644
--- a/tests/static/state_tests/stRandom/randomStatetest333Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest333Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f410263f305963310856c15ff5037a0"
             ],
             "gasLimit" : [
-                "0x6343290b"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest334Filler.json b/tests/static/state_tests/stRandom/randomStatetest334Filler.json
index 8f94857503f..f1ce926fc2b 100644
--- a/tests/static/state_tests/stRandom/randomStatetest334Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest334Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000013a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f424468208e181851308b7c7a776863a1"
             ],
             "gasLimit" : [
-                "0x1381fdac"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest335Filler.json b/tests/static/state_tests/stRandom/randomStatetest335Filler.json
index 88a122cf170..6309cc167bf 100644
--- a/tests/static/state_tests/stRandom/randomStatetest335Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest335Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350617e7608617c95f3ff584076e07b5a44"
             ],
             "gasLimit" : [
-                "0x21929afe"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest337Filler.json b/tests/static/state_tests/stRandom/randomStatetest337Filler.json
index 0290b4fc23e..b4d62ab1cbb 100644
--- a/tests/static/state_tests/stRandom/randomStatetest337Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest337Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350670b9af27e9a6468a1"
             ],
             "gasLimit" : [
-                "0x31803093"
+                "0x186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest338Filler.json b/tests/static/state_tests/stRandom/randomStatetest338Filler.json
index 74020cc91fa..fb3ea6dd263 100644
--- a/tests/static/state_tests/stRandom/randomStatetest338Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest338Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff677a9df32e6851606c011906"
             ],
             "gasLimit" : [
-                "0x0856e63f"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest339Filler.json b/tests/static/state_tests/stRandom/randomStatetest339Filler.json
index ab4d0013582..cdf9e93978f 100644
--- a/tests/static/state_tests/stRandom/randomStatetest339Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest339Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f89029e850708a293905668f1a367a2"
             ],
             "gasLimit" : [
-                "0x48d31477"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest33Filler.json b/tests/static/state_tests/stRandom/randomStatetest33Filler.json
index 2fbaae2a753..cd7926016f9 100644
--- a/tests/static/state_tests/stRandom/randomStatetest33Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest33Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest340Filler.json b/tests/static/state_tests/stRandom/randomStatetest340Filler.json
index cca44114379..e6caecf547f 100644
--- a/tests/static/state_tests/stRandom/randomStatetest340Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest340Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09"
             ],
             "gasLimit" : [
-                "0x1bee2318"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest341Filler.json b/tests/static/state_tests/stRandom/randomStatetest341Filler.json
index b3411886489..ef361585cbf 100644
--- a/tests/static/state_tests/stRandom/randomStatetest341Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest341Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x427f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff583481f36a85646d53671639175b9408"
             ],
             "gasLimit" : [
-                "0x01a76401"
+                "0x432380"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest342Filler.json b/tests/static/state_tests/stRandom/randomStatetest342Filler.json
index 04d8ed4381d..b345aee024f 100644
--- a/tests/static/state_tests/stRandom/randomStatetest342Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest342Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000041147fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f36314297399455797b42569e8f0556"
             ],
             "gasLimit" : [
-                "0x6ef54abd"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest343Filler.json b/tests/static/state_tests/stRandom/randomStatetest343Filler.json
index df6df921a9e..4cc44c6dd0c 100644
--- a/tests/static/state_tests/stRandom/randomStatetest343Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest343Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff111010374135"
             ],
             "gasLimit" : [
-                "0x07c3d4a1"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest345Filler.json b/tests/static/state_tests/stRandom/randomStatetest345Filler.json
index 2acf227a42d..e656db8c8eb 100644
--- a/tests/static/state_tests/stRandom/randomStatetest345Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest345Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x417f0000000000000000000000000000000000000000000000000000000000000001447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000000035420b417f056699168fa16d8d94113b"
             ],
             "gasLimit" : [
-                "0x239411f2"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest346Filler.json b/tests/static/state_tests/stRandom/randomStatetest346Filler.json
index b4396ab703f..2c49c022caa 100644
--- a/tests/static/state_tests/stRandom/randomStatetest346Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest346Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09"
             ],
             "gasLimit" : [
-                "0x7d53c78b"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest348Filler.json b/tests/static/state_tests/stRandom/randomStatetest348Filler.json
index b0559aad592..c433e3d6626 100644
--- a/tests/static/state_tests/stRandom/randomStatetest348Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest348Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000000142186f18208119191509036365739735608a"
             ],
             "gasLimit" : [
-                "0x1be24b90"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest349Filler.json b/tests/static/state_tests/stRandom/randomStatetest349Filler.json
index 8daf19d45bb..d1c788d4ac0 100644
--- a/tests/static/state_tests/stRandom/randomStatetest349Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest349Filler.json
@@ -66,7 +66,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0442"
             ],
             "gasLimit" : [
-                "0x34cd45dd"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest350Filler.json b/tests/static/state_tests/stRandom/randomStatetest350Filler.json
index 8d46a3caed8..7b8e6584243 100644
--- a/tests/static/state_tests/stRandom/randomStatetest350Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest350Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0908"
             ],
             "gasLimit" : [
-                "0x5a300832"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest351Filler.json b/tests/static/state_tests/stRandom/randomStatetest351Filler.json
index e7e6b4ecc93..95b73dce865 100644
--- a/tests/static/state_tests/stRandom/randomStatetest351Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest351Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0509355534707785320175fca414"
             ],
             "gasLimit" : [
-                "0x66763ec3"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest352Filler.json b/tests/static/state_tests/stRandom/randomStatetest352Filler.json
index ee0d0d2f726..020aa3105b2 100644
--- a/tests/static/state_tests/stRandom/randomStatetest352Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest352Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000003a457f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>13428284f28a980b4539a39d1408"
             ],
             "gasLimit" : [
-                "0x15c86d5a"
+                "0x186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest353Filler.json b/tests/static/state_tests/stRandom/randomStatetest353Filler.json
index cdb5b3f5e10..6f2ab73f9d1 100644
--- a/tests/static/state_tests/stRandom/randomStatetest353Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest353Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000120ba49036880f865296"
             ],
             "gasLimit" : [
-                "0x3bd984ea"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest354Filler.json b/tests/static/state_tests/stRandom/randomStatetest354Filler.json
index 603a10e4d75..f0931fb458a 100644
--- a/tests/static/state_tests/stRandom/randomStatetest354Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest354Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350603b35641a8e739f86980a4337"
             ],
             "gasLimit" : [
-                "0x49debde5"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest355Filler.json b/tests/static/state_tests/stRandom/randomStatetest355Filler.json
index 2ea2604cf09..e091f11e2f0 100644
--- a/tests/static/state_tests/stRandom/randomStatetest355Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest355Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>457f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001666b56e87c5a499d5389306e"
             ],
             "gasLimit" : [
-                "0x2b37c2e2"
+                "0x186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest356Filler.json b/tests/static/state_tests/stRandom/randomStatetest356Filler.json
index 95ba644a811..d6bf0397aff 100644
--- a/tests/static/state_tests/stRandom/randomStatetest356Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest356Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>827f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe04"
             ],
             "gasLimit" : [
-                "0x523a3970"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest357Filler.json b/tests/static/state_tests/stRandom/randomStatetest357Filler.json
index d02ec1c1980..0de71be154a 100644
--- a/tests/static/state_tests/stRandom/randomStatetest357Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest357Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff09377c538071"
             ],
             "gasLimit" : [
-                "0x359eb7b4"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest358Filler.json b/tests/static/state_tests/stRandom/randomStatetest358Filler.json
index 7014d5a93ae..3f1a10116a0 100644
--- a/tests/static/state_tests/stRandom/randomStatetest358Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest358Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000000000000000000000000000000000000000c3506f679b82a092078f136b5541888c057a"
             ],
             "gasLimit" : [
-                "0x2f94ab96"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest359Filler.json b/tests/static/state_tests/stRandom/randomStatetest359Filler.json
index dff43651b66..7a241b74849 100644
--- a/tests/static/state_tests/stRandom/randomStatetest359Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest359Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff428d06809e75f26764867d853b05"
             ],
             "gasLimit" : [
-                "0x0897bac0"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest360Filler.json b/tests/static/state_tests/stRandom/randomStatetest360Filler.json
index ebad3e7e853..d893106eacf 100644
--- a/tests/static/state_tests/stRandom/randomStatetest360Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest360Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000016f0441548af30803135562840563829c"
             ],
             "gasLimit" : [
-                "0x6f53fde2"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest361Filler.json b/tests/static/state_tests/stRandom/randomStatetest361Filler.json
index 89593e478a2..d2db0664d35 100644
--- a/tests/static/state_tests/stRandom/randomStatetest361Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest361Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x41417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff066f9e9092673a8f430b6ba11520901816"
             ],
             "gasLimit" : [
-                "0x5369d744"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest362Filler.json b/tests/static/state_tests/stRandom/randomStatetest362Filler.json
index 3047bf9b271..93d86b6db89 100644
--- a/tests/static/state_tests/stRandom/randomStatetest362Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest362Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b509"
             ],
             "gasLimit" : [
-                "0x288e5440"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest363Filler.json b/tests/static/state_tests/stRandom/randomStatetest363Filler.json
index cf4453059ff..a05ec338298 100644
--- a/tests/static/state_tests/stRandom/randomStatetest363Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest363Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350117ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f7b20937d953695f369719f9a447905"
             ],
             "gasLimit" : [
-                "0x05e7fe04"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest364Filler.json b/tests/static/state_tests/stRandom/randomStatetest364Filler.json
index 37c0eaef8c8..6b77b79e8d9 100644
--- a/tests/static/state_tests/stRandom/randomStatetest364Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest364Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c350076f7332988d746694918859185920446d"
             ],
             "gasLimit" : [
-                "0x7d75ee8a"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest365Filler.json b/tests/static/state_tests/stRandom/randomStatetest365Filler.json
index 1bb7fd7e136..251c1d9ca41 100644
--- a/tests/static/state_tests/stRandom/randomStatetest365Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest365Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff42417f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000000143b42078537"
             ],
             "gasLimit" : [
-                "0x3786f58e"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest366Filler.json b/tests/static/state_tests/stRandom/randomStatetest366Filler.json
index 13306af54c2..4406a32ec50 100644
--- a/tests/static/state_tests/stRandom/randomStatetest366Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest366Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff446f516f0395f57433725580758f32f194"
             ],
             "gasLimit" : [
-                "0x2c5927e9"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest367Filler.json b/tests/static/state_tests/stRandom/randomStatetest367Filler.json
index 040e1aeea08..174db0bcbf9 100644
--- a/tests/static/state_tests/stRandom/randomStatetest367Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest367Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000447f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5447f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b51905810a6c7a5959339f3342838b"
             ],
             "gasLimit" : [
-                "0x6e0c2062"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest368Filler.json b/tests/static/state_tests/stRandom/randomStatetest368Filler.json
index ef874aaa720..49a183b7410 100644
--- a/tests/static/state_tests/stRandom/randomStatetest368Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest368Filler.json
@@ -70,7 +70,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe097f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b54206f06d8703393560579077"
             ],
             "gasLimit" : [
-                "0x68aac0ae"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest369Filler.json b/tests/static/state_tests/stRandom/randomStatetest369Filler.json
index 00b99e2e20c..3507efffc8e 100644
--- a/tests/static/state_tests/stRandom/randomStatetest369Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest369Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f0000000000000000000000010000000000000000000000000000000000000000"
             ],
             "gasLimit" : [
-                "0x5cf717b8"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest36Filler.json b/tests/static/state_tests/stRandom/randomStatetest36Filler.json
index 08d050fd712..8052346b2a3 100644
--- a/tests/static/state_tests/stRandom/randomStatetest36Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest36Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest370Filler.json b/tests/static/state_tests/stRandom/randomStatetest370Filler.json
index 9cfaf73d114..aca70168abd 100644
--- a/tests/static/state_tests/stRandom/randomStatetest370Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest370Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x44207ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001145344846604627f"
             ],
             "gasLimit" : [
-                "0x24fb3310"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest371Filler.json b/tests/static/state_tests/stRandom/randomStatetest371Filler.json
index 16031e5ab1d..83173b4def6 100644
--- a/tests/static/state_tests/stRandom/randomStatetest371Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest371Filler.json
@@ -66,7 +66,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000010000000000000000000000000000000000000000435a1039"
             ],
             "gasLimit" : [
-                "0x0a06a6ed"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest372Filler.json b/tests/static/state_tests/stRandom/randomStatetest372Filler.json
index 5bf537f108b..1438ec8d22a 100644
--- a/tests/static/state_tests/stRandom/randomStatetest372Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest372Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000011808"
             ],
             "gasLimit" : [
-                "0x7ca7c859"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest376Filler.json b/tests/static/state_tests/stRandom/randomStatetest376Filler.json
index de168ec3c1f..02e3de706ca 100644
--- a/tests/static/state_tests/stRandom/randomStatetest376Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest376Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09ff8c3164"
             ],
             "gasLimit" : [
-                "0x7eee6f62"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest378Filler.json b/tests/static/state_tests/stRandom/randomStatetest378Filler.json
index 0b27f6ee11f..c9acaf758f0 100644
--- a/tests/static/state_tests/stRandom/randomStatetest378Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest378Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "balance" : "1675637682",
diff --git a/tests/static/state_tests/stRandom/randomStatetest37Filler.json b/tests/static/state_tests/stRandom/randomStatetest37Filler.json
index 9c5b7c97474..cb54eedaacd 100644
--- a/tests/static/state_tests/stRandom/randomStatetest37Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest37Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000016fa49835863514f0f29b930b97f11693"
             ],
             "gasLimit" : [
-                "0x0a0454f7"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest380Filler.json b/tests/static/state_tests/stRandom/randomStatetest380Filler.json
index 5fa7dbaaa1b..ddde3256cef 100644
--- a/tests/static/state_tests/stRandom/randomStatetest380Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest380Filler.json
@@ -66,7 +66,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f967737653485593c63408b39943975"
             ],
             "gasLimit" : [
-                "0x261d71ac"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest381Filler.json b/tests/static/state_tests/stRandom/randomStatetest381Filler.json
index 85f9af4e3b8..143ce744b7b 100644
--- a/tests/static/state_tests/stRandom/randomStatetest381Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest381Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff417f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f098ba088881a64904570927a861835"
             ],
             "gasLimit" : [
-                "0x27abd027"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest382Filler.json b/tests/static/state_tests/stRandom/randomStatetest382Filler.json
index febda69d064..3db18dc41cf 100644
--- a/tests/static/state_tests/stRandom/randomStatetest382Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest382Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08"
             ],
             "gasLimit" : [
-                "0x105022a2"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest383Filler.json b/tests/static/state_tests/stRandom/randomStatetest383Filler.json
index 1c9c155d58a..9a902cb9b2e 100644
--- a/tests/static/state_tests/stRandom/randomStatetest383Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest383Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09150255436c75107e"
             ],
             "gasLimit" : [
-                "0x3d488ccc"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest39Filler.json b/tests/static/state_tests/stRandom/randomStatetest39Filler.json
index 942504bbafa..4a96650544d 100644
--- a/tests/static/state_tests/stRandom/randomStatetest39Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest39Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff427f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe9604638ea2179a5803"
             ],
             "gasLimit" : [
-                "0x114273c8"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest3Filler.json b/tests/static/state_tests/stRandom/randomStatetest3Filler.json
index aa652f5296b..2936eaace88 100644
--- a/tests/static/state_tests/stRandom/randomStatetest3Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest3Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f000000000000000000000000000000000000000000000000000000000000c35041"
             ],
             "gasLimit" : [
-                "0x1819c789"
+                "0x186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest41Filler.json b/tests/static/state_tests/stRandom/randomStatetest41Filler.json
index 4a98bdc7c2b..b44807f4c32 100644
--- a/tests/static/state_tests/stRandom/randomStatetest41Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest41Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350517f0000000000000000000000010000000000000000000000000000000000000000417f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56a84a10719a1786a6510349b0282"
             ],
             "gasLimit" : [
-                "0x3cd14fc1"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest42Filler.json b/tests/static/state_tests/stRandom/randomStatetest42Filler.json
index 626ef264317..034a88d5d14 100644
--- a/tests/static/state_tests/stRandom/randomStatetest42Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest42Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [  ">=Cancun"],
+                "network" : [  ">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest43Filler.json b/tests/static/state_tests/stRandom/randomStatetest43Filler.json
index 841f7eb8056..10bdfd51d34 100644
--- a/tests/static/state_tests/stRandom/randomStatetest43Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest43Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff3b0a55096941861a3755a196f259a1"
             ],
             "gasLimit" : [
-                "0x4627c75c"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest45Filler.json b/tests/static/state_tests/stRandom/randomStatetest45Filler.json
index 42d3aa19231..28be4a06504 100644
--- a/tests/static/state_tests/stRandom/randomStatetest45Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest45Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>317fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe43147256a31302"
             ],
             "gasLimit" : [
-                "0x13f6aeec"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest47Filler.json b/tests/static/state_tests/stRandom/randomStatetest47Filler.json
index 0c330bac31c..a0f63e3e4fc 100644
--- a/tests/static/state_tests/stRandom/randomStatetest47Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest47Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350437f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f1544898b167c6a6f6d5b953714457e"
             ],
             "gasLimit" : [
-                "0x3f53d841"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest48Filler.json b/tests/static/state_tests/stRandom/randomStatetest48Filler.json
index aacd334570d..6ae9d2e7859 100644
--- a/tests/static/state_tests/stRandom/randomStatetest48Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest48Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest49Filler.json b/tests/static/state_tests/stRandom/randomStatetest49Filler.json
index 2c03df4be10..5f892f20df8 100644
--- a/tests/static/state_tests/stRandom/randomStatetest49Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest49Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000807f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>61859c"
             ],
             "gasLimit" : [
-                "0x09249356"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest4Filler.json b/tests/static/state_tests/stRandom/randomStatetest4Filler.json
index 9911a612bb9..29da528161b 100644
--- a/tests/static/state_tests/stRandom/randomStatetest4Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest4Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350617e7608617c95f3ff584076e07b5a44"
             ],
             "gasLimit" : [
-                "0x21929afe"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest51Filler.json b/tests/static/state_tests/stRandom/randomStatetest51Filler.json
index 24442bc6e7c..d20d7f869b0 100644
--- a/tests/static/state_tests/stRandom/randomStatetest51Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest51Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f0000000000000000000000000000000000000000000000000000000000000001757f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57a7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe83189b"
             ],
             "gasLimit" : [
-                "0x6ef38b01"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest52Filler.json b/tests/static/state_tests/stRandom/randomStatetest52Filler.json
index ffb561e5252..39c4cef37ef 100644
--- a/tests/static/state_tests/stRandom/randomStatetest52Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest52Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe410a81437f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000006f59a130a10a189fc653057a185b886c"
             ],
             "gasLimit" : [
-                "0x118e1472"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest53Filler.json b/tests/static/state_tests/stRandom/randomStatetest53Filler.json
index 823e2b6451a..41a0f119300 100644
--- a/tests/static/state_tests/stRandom/randomStatetest53Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest53Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x427f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff583481f36a85646d53671639175b9408"
             ],
             "gasLimit" : [
-                "0x01a76401"
+                "0x432380"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest54Filler.json b/tests/static/state_tests/stRandom/randomStatetest54Filler.json
index 2016f2f5444..afc3901b02e 100644
--- a/tests/static/state_tests/stRandom/randomStatetest54Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest54Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000001c9206e3b8f9d858f438a"
             ],
             "gasLimit" : [
-                "0x5e568416"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest55Filler.json b/tests/static/state_tests/stRandom/randomStatetest55Filler.json
index 01258491c49..40b0194833a 100644
--- a/tests/static/state_tests/stRandom/randomStatetest55Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest55Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000000084967f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff137ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016f3a5b594088a2f238089b71"
             ],
             "gasLimit" : [
-                "0x2bd66e7e"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest57Filler.json b/tests/static/state_tests/stRandom/randomStatetest57Filler.json
index f90c4eb5e22..2292ac01de6 100644
--- a/tests/static/state_tests/stRandom/randomStatetest57Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest57Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe097f000000000000000000000000000000000000000000000000000000000000c3508190"
             ],
             "gasLimit" : [
-                "0x194cdf90"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest58Filler.json b/tests/static/state_tests/stRandom/randomStatetest58Filler.json
index 1b09e4752ab..af5f30a37dc 100644
--- a/tests/static/state_tests/stRandom/randomStatetest58Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest58Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350367ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe096902947d567838719e97f301"
             ],
             "gasLimit" : [
-                "0x46a13dad"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest59Filler.json b/tests/static/state_tests/stRandom/randomStatetest59Filler.json
index 90fff51b1d5..21826f8c437 100644
--- a/tests/static/state_tests/stRandom/randomStatetest59Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest59Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0208673a06756406548b99"
             ],
             "gasLimit" : [
-                "0x715e55ee"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest5Filler.json b/tests/static/state_tests/stRandom/randomStatetest5Filler.json
index 56d34778790..358c1bdfc55 100644
--- a/tests/static/state_tests/stRandom/randomStatetest5Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest5Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x427f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09"
             ],
             "gasLimit" : [
-                "0x07345d54"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest60Filler.json b/tests/static/state_tests/stRandom/randomStatetest60Filler.json
index 4b159a27125..5e92b7f6fee 100644
--- a/tests/static/state_tests/stRandom/randomStatetest60Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest60Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x427f0000000000000000000000000000000000000000000000000000000000000000427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f969001091aa15b8b9b75459d015a04"
             ],
             "gasLimit" : [
-                "0x46dc0e07"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest62Filler.json b/tests/static/state_tests/stRandom/randomStatetest62Filler.json
index c5919061753..ace26835784 100644
--- a/tests/static/state_tests/stRandom/randomStatetest62Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest62Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000016f7268713013964a96ac575804332501"
             ],
             "gasLimit" : [
-                "0x1e2fa4a5"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest63Filler.json b/tests/static/state_tests/stRandom/randomStatetest63Filler.json
index a866e0383cf..3ff00a8ba2c 100644
--- a/tests/static/state_tests/stRandom/randomStatetest63Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest63Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000006f977f157e088003767a86928e825296"
             ],
             "gasLimit" : [
-                "0x6f7d811c"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest64Filler.json b/tests/static/state_tests/stRandom/randomStatetest64Filler.json
index 5ed2f8e94fb..6d5e9f390bc 100644
--- a/tests/static/state_tests/stRandom/randomStatetest64Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest64Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x427f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe087f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b50a"
             ],
             "gasLimit" : [
-                "0x0387c6a5"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest66Filler.json b/tests/static/state_tests/stRandom/randomStatetest66Filler.json
index 42fcc9d69ec..8ddec20e431 100644
--- a/tests/static/state_tests/stRandom/randomStatetest66Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest66Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe097f0000000000000000000000010000000000000000000000000000000000000000"
             ],
             "gasLimit" : [
-                "0x5be4cce8"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest67Filler.json b/tests/static/state_tests/stRandom/randomStatetest67Filler.json
index 6be48420e5d..7018d946fa3 100644
--- a/tests/static/state_tests/stRandom/randomStatetest67Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest67Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f699776659a06a27607a2166d537331"
             ],
             "gasLimit" : [
-                "0x037d57b9"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest69Filler.json b/tests/static/state_tests/stRandom/randomStatetest69Filler.json
index ebddf5903f8..41a413f2995 100644
--- a/tests/static/state_tests/stRandom/randomStatetest69Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest69Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe43596f15a0770a7676611a6595057b768b64"
             ],
             "gasLimit" : [
-                "0x5771c53c"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest6Filler.json b/tests/static/state_tests/stRandom/randomStatetest6Filler.json
index 05fbabe64d4..be7125bda84 100644
--- a/tests/static/state_tests/stRandom/randomStatetest6Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest6Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>4143416f1732797105f237768fe506871ac853"
             ],
             "gasLimit" : [
-                "0x35893135"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest72Filler.json b/tests/static/state_tests/stRandom/randomStatetest72Filler.json
index ba29f592c40..d92a9bfb314 100644
--- a/tests/static/state_tests/stRandom/randomStatetest72Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest72Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff417f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe65688dff579830091304"
             ],
             "gasLimit" : [
-                "0x38323082"
+                "0x186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest73Filler.json b/tests/static/state_tests/stRandom/randomStatetest73Filler.json
index d70ba6890f2..fd86931b95e 100644
--- a/tests/static/state_tests/stRandom/randomStatetest73Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest73Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5b573198d729b711671056e0a0555346138"
             ],
             "gasLimit" : [
-                "0x662bcee0"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest74Filler.json b/tests/static/state_tests/stRandom/randomStatetest74Filler.json
index e049835d4db..0a64322268b 100644
--- a/tests/static/state_tests/stRandom/randomStatetest74Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest74Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x427ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3a7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000006f141097788a7b5a72139c07076f1842"
             ],
             "gasLimit" : [
-                "0x16d62c8f"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest75Filler.json b/tests/static/state_tests/stRandom/randomStatetest75Filler.json
index 96d13eb094f..34efbafa988 100644
--- a/tests/static/state_tests/stRandom/randomStatetest75Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest75Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000006f5893504553386c7d15400177928776"
             ],
             "gasLimit" : [
-                "0x0f0baad6"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest77Filler.json b/tests/static/state_tests/stRandom/randomStatetest77Filler.json
index ce36c515052..5c4bc27da9e 100644
--- a/tests/static/state_tests/stRandom/randomStatetest77Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest77Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000141937f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f79a06df1a08d05373216d372190341"
             ],
             "gasLimit" : [
-                "0x4ebc7aaa"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest78Filler.json b/tests/static/state_tests/stRandom/randomStatetest78Filler.json
index 10729b0984e..edec16f4c1b 100644
--- a/tests/static/state_tests/stRandom/randomStatetest78Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest78Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>437f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1174648789aa349e0915aa5911"
             ],
             "gasLimit" : [
-                "0x1e1cba4d"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest80Filler.json b/tests/static/state_tests/stRandom/randomStatetest80Filler.json
index 8a4114252d8..9f11ff97415 100644
--- a/tests/static/state_tests/stRandom/randomStatetest80Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest80Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000010000000000000000000000000000000000000000117fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5681069127b3b9c877d6f6169ff36"
             ],
             "gasLimit" : [
-                "0x0a0d7e38"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest81Filler.json b/tests/static/state_tests/stRandom/randomStatetest81Filler.json
index bcdcb4cfff7..8f44fcd74f4 100644
--- a/tests/static/state_tests/stRandom/randomStatetest81Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest81Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff436f616c327e0435743c515b078453a03c"
             ],
             "gasLimit" : [
-                "0x34f4226c"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest82Filler.json b/tests/static/state_tests/stRandom/randomStatetest82Filler.json
index 6272c2f0990..43fb94f0af0 100644
--- a/tests/static/state_tests/stRandom/randomStatetest82Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest82Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000000006"
             ],
             "gasLimit" : [
-                "0x37692434"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest83Filler.json b/tests/static/state_tests/stRandom/randomStatetest83Filler.json
index 76f2f30d2ff..edbbafb2651 100644
--- a/tests/static/state_tests/stRandom/randomStatetest83Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest83Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000307ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6fa1109af20740728e72150a7a9c0959"
             ],
             "gasLimit" : [
-                "0x1845c699"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest84Filler.json b/tests/static/state_tests/stRandom/randomStatetest84Filler.json
index 983d62f23fa..e2ec640e44e 100644
--- a/tests/static/state_tests/stRandom/randomStatetest84Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest84Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000001000000000000000000000000000000000000000044457f0000000000000000000000000000000000000000000000000000000000000001187f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff521559"
             ],
             "gasLimit" : [
-                "0x4c882f36"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest85Filler.json b/tests/static/state_tests/stRandom/randomStatetest85Filler.json
index b9486083cd9..7e4906d3ddc 100644
--- a/tests/static/state_tests/stRandom/randomStatetest85Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest85Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350f25b557e348ff374819d123109539b"
             ],
             "gasLimit" : [
-                "0x4fd07f62"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest87Filler.json b/tests/static/state_tests/stRandom/randomStatetest87Filler.json
index 3448cce29b4..e76b0a606df 100644
--- a/tests/static/state_tests/stRandom/randomStatetest87Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest87Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000005b7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f446e638e7e16736c030393727d748174"
             ],
             "gasLimit" : [
-                "0x366ad29e"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest88Filler.json b/tests/static/state_tests/stRandom/randomStatetest88Filler.json
index 35d50e02e03..3506087336f 100644
--- a/tests/static/state_tests/stRandom/randomStatetest88Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest88Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>4343537f000000000000000000000000000000000000000000000000000000000000c350117fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000016f34f06a7014541167033909103620f3"
             ],
             "gasLimit" : [
-                "0x32744189"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest89Filler.json b/tests/static/state_tests/stRandom/randomStatetest89Filler.json
index eb2b9477429..c2a3446667b 100644
--- a/tests/static/state_tests/stRandom/randomStatetest89Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest89Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f05648ce0ad106b7a6f3483379e62876b"
             ],
             "gasLimit" : [
-                "0x014255f0"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest90Filler.json b/tests/static/state_tests/stRandom/randomStatetest90Filler.json
index e07ce7836be..b1bc005bbcd 100644
--- a/tests/static/state_tests/stRandom/randomStatetest90Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest90Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff45157f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000016f116b4177f25178d7048212877e9568"
             ],
             "gasLimit" : [
-                "0x03bbb681"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest92Filler.json b/tests/static/state_tests/stRandom/randomStatetest92Filler.json
index 693e1ee7d0c..1a4de48f54f 100644
--- a/tests/static/state_tests/stRandom/randomStatetest92Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest92Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f59640c655956799087168f0658a11a"
             ],
             "gasLimit" : [
-                "0x7eab2c08"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest95Filler.json b/tests/static/state_tests/stRandom/randomStatetest95Filler.json
index c28f32b22a0..76a8cc15906 100644
--- a/tests/static/state_tests/stRandom/randomStatetest95Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest95Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff14447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5b"
             ],
             "gasLimit" : [
-                "0x0169ec4f"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom/randomStatetest96Filler.json b/tests/static/state_tests/stRandom/randomStatetest96Filler.json
index e453af21a07..8ffec72ece9 100644
--- a/tests/static/state_tests/stRandom/randomStatetest96Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest96Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000006f183b68a09b08953085a854a39d9212"
             ],
             "gasLimit" : [
-                "0x569e0238"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest97Filler.json b/tests/static/state_tests/stRandom/randomStatetest97Filler.json
index 73abe3e8895..9426d131b58 100644
--- a/tests/static/state_tests/stRandom/randomStatetest97Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest97Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>587f0000000000000000000000000000000000000000000000000000000000000001957f0000000000000000000000000000000000000000000000000000000000000000407f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3509781040107338b35071887a186"
             ],
             "gasLimit" : [
-                "0x043f70ef"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest98Filler.json b/tests/static/state_tests/stRandom/randomStatetest98Filler.json
index b2f19855cee..20e37582d59 100644
--- a/tests/static/state_tests/stRandom/randomStatetest98Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest98Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000000b08"
             ],
             "gasLimit" : [
-                "0x7b652299"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom/randomStatetest9Filler.json b/tests/static/state_tests/stRandom/randomStatetest9Filler.json
index 6841c7eff67..a998862474b 100644
--- a/tests/static/state_tests/stRandom/randomStatetest9Filler.json
+++ b/tests/static/state_tests/stRandom/randomStatetest9Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000016f757fb845405bf1ff959ba03a9c336b"
             ],
             "gasLimit" : [
-                "0x792f7334"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest384Filler.json b/tests/static/state_tests/stRandom2/randomStatetest384Filler.json
index 7096c94890b..2295be8a0f0 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest384Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest384Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f16133502727c0a7f679b456df0935763"
             ],
             "gasLimit" : [
-                "0x35079d6f"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest385Filler.json b/tests/static/state_tests/stRandom2/randomStatetest385Filler.json
index df292387c19..642e4f97468 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest385Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest385Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>547f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f785188182063156955631a7a85093a"
             ],
             "gasLimit" : [
-                "0x5c05ce5e"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest386Filler.json b/tests/static/state_tests/stRandom2/randomStatetest386Filler.json
index 2b13f821482..05e3ed51763 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest386Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest386Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff047f000000000000000000000000000000000000000000000000000000000000000105133641010b8111"
             ],
             "gasLimit" : [
-                "0x3a2ba3d9"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest387Filler.json b/tests/static/state_tests/stRandom2/randomStatetest387Filler.json
index ec118301f5a..aac64d660bd 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest387Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest387Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350617e7608617c95f3ff584076e07b5a44"
             ],
             "gasLimit" : [
-                "0x21929afe"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest388Filler.json b/tests/static/state_tests/stRandom2/randomStatetest388Filler.json
index 897fa462005..c0d30066de6 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest388Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest388Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5765b8f743b9979a0905b6a189165"
             ],
             "gasLimit" : [
-                "0x7f19d979"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest389Filler.json b/tests/static/state_tests/stRandom2/randomStatetest389Filler.json
index 16773eddd59..2574f6ab096 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest389Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest389Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000427f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3503a863854581237"
             ],
             "gasLimit" : [
-                "0x36288a4f"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest393Filler.json b/tests/static/state_tests/stRandom2/randomStatetest393Filler.json
index e638f97a817..c90e72f6b7d 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest393Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest393Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff20b39838f628b96846cff04"
             ],
             "gasLimit" : [
-                "0x6f6f2ad4"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest395Filler.json b/tests/static/state_tests/stRandom2/randomStatetest395Filler.json
index d396532dfb3..9647fdd1bc1 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest395Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest395Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x447f0000000000000000000000000000000000000000000000000000000000000001417f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f823140710bf13990e4500136726d8b"
             ],
             "gasLimit" : [
-                "0x4f2b2a3f"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest396Filler.json b/tests/static/state_tests/stRandom2/randomStatetest396Filler.json
index d8b07e94e60..62e1ff10d86 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest396Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest396Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001719f197c"
             ],
             "gasLimit" : [
-                "0x1517ae45"
+                "0x186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest398Filler.json b/tests/static/state_tests/stRandom2/randomStatetest398Filler.json
index 3a79b1a1e45..f5fe1cfb573 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest398Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest398Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6f3781413b695a69079d7f5105829207"
             ],
             "gasLimit" : [
-                "0x222e70fb"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest399Filler.json b/tests/static/state_tests/stRandom2/randomStatetest399Filler.json
index 7c02e250ec2..a61d14da8e7 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest399Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest399Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe4544437f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f98324016076d428a9898129b16849a"
             ],
             "gasLimit" : [
-                "0x03dc1685"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest401Filler.json b/tests/static/state_tests/stRandom2/randomStatetest401Filler.json
index 81cb7bd0038..4b6cb265728 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest401Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest401Filler.json
@@ -58,7 +58,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c35044427f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>ff"
             ],
             "gasLimit" : [
-                "0x1bc87846"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest402Filler.json b/tests/static/state_tests/stRandom2/randomStatetest402Filler.json
index f6ef26bf93c..1fbfa6d7bab 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest402Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest402Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f62138c87028162ea32a2db7e301004"
             ],
             "gasLimit" : [
-                "0x63b233fa"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest404Filler.json b/tests/static/state_tests/stRandom2/randomStatetest404Filler.json
index ff2325ff2d6..12a486694c1 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest404Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest404Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6a7f0000000000000000000000000000000000000000000000000000000000000000907f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9066064256"
             ],
             "gasLimit" : [
-                "0x2ab6153e"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest405Filler.json b/tests/static/state_tests/stRandom2/randomStatetest405Filler.json
index b9786b14710..0c220629619 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest405Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest405Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff44457f0000000000000000000000010000000000000000000000000000000000000000037ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f318d0707977199361171756f6d458e"
             ],
             "gasLimit" : [
-                "0x3a821b80"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest406Filler.json b/tests/static/state_tests/stRandom2/randomStatetest406Filler.json
index 89467a9bb00..3e0c3fd1c75 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest406Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest406Filler.json
@@ -66,7 +66,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b58b8e99f33c647165337e389f7b9c909cba"
             ],
             "gasLimit" : [
-                "0x0e167dc4"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest407Filler.json b/tests/static/state_tests/stRandom2/randomStatetest407Filler.json
index 239e04d04a0..35cba12c03e 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest407Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest407Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350437f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6f6d71656f054471181163037902615b"
             ],
             "gasLimit" : [
-                "0x4bd85812"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest408Filler.json b/tests/static/state_tests/stRandom2/randomStatetest408Filler.json
index 0bf4faaebc5..844102c5ce0 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest408Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest408Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f80656e8e6478946a323482135a8bf7"
             ],
             "gasLimit" : [
-                "0x735c9a80"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest409Filler.json b/tests/static/state_tests/stRandom2/randomStatetest409Filler.json
index 3483458b4bf..867816dc521 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest409Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest409Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x5b7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000001000000000000000000000000000000000000000009ff511287868833063aa3579d8e58"
             ],
             "gasLimit" : [
-                "0x496e10c6"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest410Filler.json b/tests/static/state_tests/stRandom2/randomStatetest410Filler.json
index 9af33b4b44c..c9303fcab09 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest410Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest410Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>417f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000045086201771880f3"
             ],
             "gasLimit" : [
-                "0x090f60db"
+                "0x030d40"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest411Filler.json b/tests/static/state_tests/stRandom2/randomStatetest411Filler.json
index 94663f7a4c8..175147d481a 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest411Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest411Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f44a17892738b6895619d7a93507d649d"
             ],
             "gasLimit" : [
-                "0x5cc6a932"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest412Filler.json b/tests/static/state_tests/stRandom2/randomStatetest412Filler.json
index 9cb498b804b..64b5e1a4b73 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest412Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest412Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6fa46ef06a5a858b9742198a37e1153c"
             ],
             "gasLimit" : [
-                "0x324751e0"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest413Filler.json b/tests/static/state_tests/stRandom2/randomStatetest413Filler.json
index a20cd50db7e..702614a5e82 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest413Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest413Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000010000000000000000000000000000000000000000817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe037f00000000000000000000000000000000000000000000000000000000000000016f086e2055149345ad1a018b06370814"
             ],
             "gasLimit" : [
-                "0x63aead26"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest414Filler.json b/tests/static/state_tests/stRandom2/randomStatetest414Filler.json
index b5ea1bc67da..df44c509baf 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest414Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest414Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6251437f0000000000000000000000010000000000000000000000000000000000000000437f000000000000000000000000fffffffffffffffffffffffffffffffffffffffff114"
             ],
             "gasLimit" : [
-                "0x487b0e6d"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest415Filler.json b/tests/static/state_tests/stRandom2/randomStatetest415Filler.json
index b8630ba923e..a6cad527f80 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest415Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest415Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000000000000000000000000000000000000000000142427f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>357f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff62010a8c8794a17e8ea4f2"
             ],
             "gasLimit" : [
-                "0x23bf3178"
+                "0x927c0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest416Filler.json b/tests/static/state_tests/stRandom2/randomStatetest416Filler.json
index 57d85de5dee..ef122c59447 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest416Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest416Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>43"
             ],
             "gasLimit" : [
-                "0x27db6af5"
+                "0x186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest418Filler.json b/tests/static/state_tests/stRandom2/randomStatetest418Filler.json
index 0a7fe2bfab3..261ad727ad8 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest418Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest418Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest419Filler.json b/tests/static/state_tests/stRandom2/randomStatetest419Filler.json
index 94270e19d80..e367d5c1298 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest419Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest419Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x437ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f73095b7ee211595a6b80a311900a78"
             ],
             "gasLimit" : [
-                "0x396348c0"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest420Filler.json b/tests/static/state_tests/stRandom2/randomStatetest420Filler.json
index 39076301112..50fbf16db09 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest420Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest420Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>3a7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001817d7b8956970660129f5015fe0a35"
             ],
             "gasLimit" : [
-                "0x13433a42"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest421Filler.json b/tests/static/state_tests/stRandom2/randomStatetest421Filler.json
index 69129a4c8d1..516de44d09a 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest421Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest421Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x437f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f38454051968ff184a47d500912319717"
             ],
             "gasLimit" : [
-                "0x1418f818"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest422Filler.json b/tests/static/state_tests/stRandom2/randomStatetest422Filler.json
index bbd7278ef9b..9960f128fe4 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest422Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest422Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe527f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>"
             ],
             "gasLimit" : [
-                "0x73e11d18"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest424Filler.json b/tests/static/state_tests/stRandom2/randomStatetest424Filler.json
index f35880abdad..007d099b76c 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest424Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest424Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>437f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000000436f18116552626186825096665471140a"
             ],
             "gasLimit" : [
-                "0x4c6f1c8f"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest425Filler.json b/tests/static/state_tests/stRandom2/randomStatetest425Filler.json
index febc4665b61..bfa72b90b71 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest425Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest425Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f0000000000000000000000010000000000000000000000000000000000000000417f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f885707818b889a89975552f0128442"
             ],
             "gasLimit" : [
-                "0x7a573803"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest426Filler.json b/tests/static/state_tests/stRandom2/randomStatetest426Filler.json
index b72a3faf79c..cf27c887a64 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest426Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest426Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000006f456d1687795a95938b0139976099f0"
             ],
             "gasLimit" : [
-                "0x1e626bcb"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest429Filler.json b/tests/static/state_tests/stRandom2/randomStatetest429Filler.json
index f801a2804ff..51e8bcb2e0a 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest429Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest429Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f98121f388786729087773476331366"
             ],
             "gasLimit" : [
-                "0x570c0fb5"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest430Filler.json b/tests/static/state_tests/stRandom2/randomStatetest430Filler.json
index 2f5a1cc3f0e..2f9bd82eb6d 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest430Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest430Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000006f7d41a29934035b748e96a3135b6964"
             ],
             "gasLimit" : [
-                "0x607daefc"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest433Filler.json b/tests/static/state_tests/stRandom2/randomStatetest433Filler.json
index dd688ac0dc3..3924caf4bd1 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest433Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest433Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350a3f305205bf1562072595730"
             ],
             "gasLimit" : [
-                "0x2e64c884"
+                "0x7a120"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest435Filler.json b/tests/static/state_tests/stRandom2/randomStatetest435Filler.json
index fd09b816c76..49f57350bda 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest435Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest435Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000000447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000042613488076233797f5539"
             ],
             "gasLimit" : [
-                "0x1833d234"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest436Filler.json b/tests/static/state_tests/stRandom2/randomStatetest436Filler.json
index 34a378d0eee..fb2727b0334 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest436Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest436Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x367f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>456f8108067a345b7a76a20a835a0a0b6c10"
             ],
             "gasLimit" : [
-                "0x458f872c"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest437Filler.json b/tests/static/state_tests/stRandom2/randomStatetest437Filler.json
index 2f0fe255173..0c956e5380f 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest437Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest437Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000013a133908"
             ],
             "gasLimit" : [
-                "0x6945be5d"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest438Filler.json b/tests/static/state_tests/stRandom2/randomStatetest438Filler.json
index 53256ac6430..c700232e4b8 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest438Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest438Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
             ],
             "gasLimit" : [
-                "0x6cc5d7a5"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest439Filler.json b/tests/static/state_tests/stRandom2/randomStatetest439Filler.json
index 8972e55cef5..097dd6aa10f 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest439Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest439Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f5b1609653438813340097c53a49316"
             ],
             "gasLimit" : [
-                "0x409d0212"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest440Filler.json b/tests/static/state_tests/stRandom2/randomStatetest440Filler.json
index 15130f4e325..0554ee5bcb3 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest440Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest440Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>45457f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff416f01513a9b8216816f74f3676e9ea261"
             ],
             "gasLimit" : [
-                "0x3ac5ab50"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest442Filler.json b/tests/static/state_tests/stRandom2/randomStatetest442Filler.json
index 96b5ef2e7e4..b0dfe804664 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest442Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest442Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff917f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350183381"
             ],
             "gasLimit" : [
-                "0x664f3c42"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest443Filler.json b/tests/static/state_tests/stRandom2/randomStatetest443Filler.json
index f584824f055..512a0194c1e 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest443Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest443Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001155933704"
             ],
             "gasLimit" : [
-                "0x7331ad52"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest444Filler.json b/tests/static/state_tests/stRandom2/randomStatetest444Filler.json
index 4e2582acaa1..8f9cb77bbf2 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest444Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest444Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7f0000000000000000000000010000000000000000000000000000000000000000607f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6613928435"
             ],
             "gasLimit" : [
-                "0x17593212"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest445Filler.json b/tests/static/state_tests/stRandom2/randomStatetest445Filler.json
index ee52058f0b2..64d0030b596 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest445Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest445Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000008756993365a13761"
             ],
             "gasLimit" : [
-                "0x0115f62d"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest446Filler.json b/tests/static/state_tests/stRandom2/randomStatetest446Filler.json
index 71fdfd32feb..2322b47f0a7 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest446Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest446Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09"
             ],
             "gasLimit" : [
-                "0x0be3dfb6"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest447Filler.json b/tests/static/state_tests/stRandom2/randomStatetest447Filler.json
index e9e8c7654e2..2486f99d3b3 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest447Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest447Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff08"
             ],
             "gasLimit" : [
-                "0x708c2d19"
+                "0x186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest448Filler.json b/tests/static/state_tests/stRandom2/randomStatetest448Filler.json
index 64ae485cd2a..0c2344f8636 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest448Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest448Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x427f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff583481f36a85646d53671639175b9408"
             ],
             "gasLimit" : [
-                "0x01a76401"
+                "0x432380"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest449Filler.json b/tests/static/state_tests/stRandom2/randomStatetest449Filler.json
index 0e185eb0d7f..d88fd31f9b5 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest449Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest449Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x197f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>8b66e4ff65a056f39b529f"
             ],
             "gasLimit" : [
-                "0x1ff18b25"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest450Filler.json b/tests/static/state_tests/stRandom2/randomStatetest450Filler.json
index 4a886710d70..afc5aafed54 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest450Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest450Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000010000000000000000000000000000000000000000033a80"
             ],
             "gasLimit" : [
-                "0x3ccd2021"
+                "0x186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest451Filler.json b/tests/static/state_tests/stRandom2/randomStatetest451Filler.json
index ca446bf446b..dbbf12d836d 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest451Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest451Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000006fed05989a0659453076573a87041174"
             ],
             "gasLimit" : [
-                "0x27cf9c6b"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest452Filler.json b/tests/static/state_tests/stRandom2/randomStatetest452Filler.json
index 7d6ca56dac6..885ff1e0e40 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest452Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest452Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6f0a3289746806163630047dff983105"
             ],
             "gasLimit" : [
-                "0x6331f956"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest454Filler.json b/tests/static/state_tests/stRandom2/randomStatetest454Filler.json
index 40a527f7988..7f60dda2f70 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest454Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest454Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000000557f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000557f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>0a84339188646595668352a06185"
             ],
             "gasLimit" : [
-                "0x2fc0c45a"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest455Filler.json b/tests/static/state_tests/stRandom2/randomStatetest455Filler.json
index 9a2c416a313..c0ec9a255eb 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest455Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest455Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6f858b1411f218693ca2245b918274f3"
             ],
             "gasLimit" : [
-                "0x4f485274"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest457Filler.json b/tests/static/state_tests/stRandom2/randomStatetest457Filler.json
index 7f6db8262d6..465c8cf6983 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest457Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest457Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x44417f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f949fa28af308a37a136c626218927d"
             ],
             "gasLimit" : [
-                "0x22e280c9"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest458Filler.json b/tests/static/state_tests/stRandom2/randomStatetest458Filler.json
index 9773acd9b38..cd4dfd51ad0 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest458Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest458Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest460Filler.json b/tests/static/state_tests/stRandom2/randomStatetest460Filler.json
index 8c3c8a1ad65..db3b11d6b0c 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest460Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest460Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000003a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350046f16a23c6c90739ba201697b4315778a"
             ],
             "gasLimit" : [
-                "0x0e831685"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest461Filler.json b/tests/static/state_tests/stRandom2/randomStatetest461Filler.json
index 7f12d65ea55..406eb516017 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest461Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest461Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c350517f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff42515259"
             ],
             "gasLimit" : [
-                "0x47649f15"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest462Filler.json b/tests/static/state_tests/stRandom2/randomStatetest462Filler.json
index 1d3b99a10aa..af7cb5e36ef 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest462Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest462Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000006f8e0186019d029d1354681482826f37"
             ],
             "gasLimit" : [
-                "0x3c8ef93a"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest464Filler.json b/tests/static/state_tests/stRandom2/randomStatetest464Filler.json
index 4e7d8f3448d..ced43701f7d 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest464Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest464Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x447f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8209"
             ],
             "gasLimit" : [
-                "0x31bad908"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest465Filler.json b/tests/static/state_tests/stRandom2/randomStatetest465Filler.json
index eff2c1985e9..8eb3409e746 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest465Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest465Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>437f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001"
             ],
             "gasLimit" : [
-                "0x2f866490"
+                "0x186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest467Filler.json b/tests/static/state_tests/stRandom2/randomStatetest467Filler.json
index a91b60e2631..ad53a64ab3e 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest467Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest467Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest469Filler.json b/tests/static/state_tests/stRandom2/randomStatetest469Filler.json
index 69e324d00a6..8190f231a26 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest469Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest469Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001a07ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350f36409156a6aa261413b56f208"
             ],
             "gasLimit" : [
-                "0x39619002"
+                "0x7a120"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest470Filler.json b/tests/static/state_tests/stRandom2/randomStatetest470Filler.json
index aa0603dddb6..e2fbc10edee 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest470Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest470Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001357f00000000000000000000000000000000000000000000000000000000000000000b"
             ],
             "gasLimit" : [
-                "0x25a86258"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest471Filler.json b/tests/static/state_tests/stRandom2/randomStatetest471Filler.json
index 47d9a005427..09b86dbc8f6 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest471Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest471Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09650618701355040655183a51377d82"
             ],
             "gasLimit" : [
-                "0x305bc4a4"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest472Filler.json b/tests/static/state_tests/stRandom2/randomStatetest472Filler.json
index 93c981d283b..f683489d862 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest472Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest472Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>41437ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff090a"
             ],
             "gasLimit" : [
-                "0x6d4e6c85"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest473Filler.json b/tests/static/state_tests/stRandom2/randomStatetest473Filler.json
index 1d3145e8722..095e7b667d6 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest473Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest473Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff317f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5910209"
             ],
             "gasLimit" : [
-                "0x3904c84b"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest474Filler.json b/tests/static/state_tests/stRandom2/randomStatetest474Filler.json
index c902feecf1d..fee4f5c3443 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest474Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest474Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe027f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f7d6f6b1051778ea1670387810b5805"
             ],
             "gasLimit" : [
-                "0x0b5a2160"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest475Filler.json b/tests/static/state_tests/stRandom2/randomStatetest475Filler.json
index 6ceb88bf695..658e145a3ff 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest475Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest475Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09"
             ],
             "gasLimit" : [
-                "0x4c9f0852"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest476Filler.json b/tests/static/state_tests/stRandom2/randomStatetest476Filler.json
index 709df5d7e2d..87c2730c9ed 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest476Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest476Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest477Filler.json b/tests/static/state_tests/stRandom2/randomStatetest477Filler.json
index 72f9048621a..1b1259f6989 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest477Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest477Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f9084a3758d3456763aa4f09c8b735b"
             ],
             "gasLimit" : [
-                "0x6373c048"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest478Filler.json b/tests/static/state_tests/stRandom2/randomStatetest478Filler.json
index 2334cb4f178..7aaa2d2008b 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest478Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest478Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001447f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f1606588a909558021569"
             ],
             "gasLimit" : [
-                "0x0d3c510a"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest480Filler.json b/tests/static/state_tests/stRandom2/randomStatetest480Filler.json
index 12cde7b2d6e..561ae85d407 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest480Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest480Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff037f0000000000000000000000000000000000000000000000000000000000000000427ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f5af3a474ff64f3a37d51f36a6a607f"
             ],
             "gasLimit" : [
-                "0x7db624ae"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest481Filler.json b/tests/static/state_tests/stRandom2/randomStatetest481Filler.json
index e661dfb2c98..4fe24e268ef 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest481Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest481Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x447f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09437f0000000000000000000000010000000000000000000000000000000000000000a2695a7d52064361127350"
             ],
             "gasLimit" : [
-                "0x209cf2a2"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest482Filler.json b/tests/static/state_tests/stRandom2/randomStatetest482Filler.json
index b0edc509503..7e4338bf70b 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest482Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest482Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f027c9d313d9b09376505927c8e7156"
             ],
             "gasLimit" : [
-                "0x4d741f9d"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest483Filler.json b/tests/static/state_tests/stRandom2/randomStatetest483Filler.json
index 0a6400bedea..2c39db15e56 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest483Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest483Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe8409"
             ],
             "gasLimit" : [
-                "0x27a417be"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest484Filler.json b/tests/static/state_tests/stRandom2/randomStatetest484Filler.json
index 6d66cbc37ba..aad71da192f 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest484Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest484Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff35427ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>595584a2558493a25b5a6a"
             ],
             "gasLimit" : [
-                "0x0948fcd8"
+                "0x07a120"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest485Filler.json b/tests/static/state_tests/stRandom2/randomStatetest485Filler.json
index e81ceb27778..945abd4d5ed 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest485Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest485Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000008e447f00000000000000000000000100000000000000000000000000000000000000003a1a7e"
             ],
             "gasLimit" : [
-                "0x0967d2be"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest487Filler.json b/tests/static/state_tests/stRandom2/randomStatetest487Filler.json
index 57f1b087335..861c2eed326 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest487Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest487Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe337fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0308ff9f708d1710086a73a0766a6b"
             ],
             "gasLimit" : [
-                "0x26482acd"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest488Filler.json b/tests/static/state_tests/stRandom2/randomStatetest488Filler.json
index a91fbc778cf..6fb77f236fd 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest488Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest488Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>427f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f3250648093577f6364a218f0907e7d"
             ],
             "gasLimit" : [
-                "0x5663f4fe"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest489Filler.json b/tests/static/state_tests/stRandom2/randomStatetest489Filler.json
index 11b093f4f0e..0afe81b1fb1 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest489Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest489Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000456f2b8e846b91987417705a126e770764"
             ],
             "gasLimit" : [
-                "0x30ad098b"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest491Filler.json b/tests/static/state_tests/stRandom2/randomStatetest491Filler.json
index 563259c67d0..9205474cda1 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest491Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest491Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000006fa0f670645a778c71127d3b5598308b17"
             ],
             "gasLimit" : [
-                "0x30ef58f5"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest493Filler.json b/tests/static/state_tests/stRandom2/randomStatetest493Filler.json
index 9a1dce7cadd..27dd7f73644 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest493Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest493Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff09"
             ],
             "gasLimit" : [
-                "0x1ef0f8a1"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest494Filler.json b/tests/static/state_tests/stRandom2/randomStatetest494Filler.json
index 25b510d4c6f..f8d05fe80d9 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest494Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest494Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x847f000000000000000000000000000000000000000000000000000000000000c35043657f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4362f03c897f50f073f2191054"
             ],
             "gasLimit" : [
-                "0x4146d245"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest495Filler.json b/tests/static/state_tests/stRandom2/randomStatetest495Filler.json
index 1edbac9b15a..6cd065432d6 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest495Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest495Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000006f427ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7e6410f26f519c538ea2070a6c"
             ],
             "gasLimit" : [
-                "0x2c138ff5"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest496Filler.json b/tests/static/state_tests/stRandom2/randomStatetest496Filler.json
index db26408a1bf..417de050036 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest496Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest496Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f0000000000000000000000000000000000000000000000000000000000000000355b7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3500b0b020796"
             ],
             "gasLimit" : [
-                "0x5419707a"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest497Filler.json b/tests/static/state_tests/stRandom2/randomStatetest497Filler.json
index c0c3bfdd504..cd0d7aef16f 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest497Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest497Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0904"
             ],
             "gasLimit" : [
-                "0x794c8040"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest498Filler.json b/tests/static/state_tests/stRandom2/randomStatetest498Filler.json
index 7207070ef6a..a5868702541 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest498Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest498Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest499Filler.json b/tests/static/state_tests/stRandom2/randomStatetest499Filler.json
index dce3b781c63..33cb3908d8e 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest499Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest499Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000399f869aff3b063338"
             ],
             "gasLimit" : [
-                "0x1f62aad6"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest500Filler.json b/tests/static/state_tests/stRandom2/randomStatetest500Filler.json
index 849c886cf06..128df1df999 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest500Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest500Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f87196584968a97046c679199311482"
             ],
             "gasLimit" : [
-                "0x30cf086f"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest501Filler.json b/tests/static/state_tests/stRandom2/randomStatetest501Filler.json
index 6cbaa3989c1..ad6cf762c18 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest501Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest501Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0955"
             ],
             "gasLimit" : [
-                "0x19fec0a8"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest502Filler.json b/tests/static/state_tests/stRandom2/randomStatetest502Filler.json
index 858dc950737..ac478a420c1 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest502Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest502Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c350807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b59c66369a85a46da1821861586378"
             ],
             "gasLimit" : [
-                "0x54710976"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest503Filler.json b/tests/static/state_tests/stRandom2/randomStatetest503Filler.json
index c5ed2f40ae7..52bf90bf5e7 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest503Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest503Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000006f0886a83c66553c9889528d8f1294ff"
             ],
             "gasLimit" : [
-                "0x55a3043d"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest504Filler.json b/tests/static/state_tests/stRandom2/randomStatetest504Filler.json
index bce50cd158c..3df9b0093bf 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest504Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest504Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457f0000000000000000000000000000000000000000000000000000000000000001e37f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c35001589a84106d9c"
             ],
             "gasLimit" : [
-                "0x70b85bda"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest505Filler.json b/tests/static/state_tests/stRandom2/randomStatetest505Filler.json
index e51d46046b8..234f6c3e3e3 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest505Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest505Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f44a06f550371317376738c53998437"
             ],
             "gasLimit" : [
-                "0x1942ac90"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest506Filler.json b/tests/static/state_tests/stRandom2/randomStatetest506Filler.json
index 713ab7ce548..7430b74cf44 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest506Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest506Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000000042377f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006ba218f370862059149e3cff20"
             ],
             "gasLimit" : [
-                "0x7aa74d62"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest507Filler.json b/tests/static/state_tests/stRandom2/randomStatetest507Filler.json
index 371198a24a6..d064b34374d 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest507Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest507Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest510Filler.json b/tests/static/state_tests/stRandom2/randomStatetest510Filler.json
index be31bc053e0..5cef9d8ba77 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest510Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest510Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest511Filler.json b/tests/static/state_tests/stRandom2/randomStatetest511Filler.json
index 56907e970d5..513ba05da24 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest511Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest511Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff416f6a52027f41f267453843630a66444145"
             ],
             "gasLimit" : [
-                "0x019f7430"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest512Filler.json b/tests/static/state_tests/stRandom2/randomStatetest512Filler.json
index 1110bdcb554..a30cabe095f 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest512Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest512Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f3b5bff405670977499515002634492"
             ],
             "gasLimit" : [
-                "0x7716ad27"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest513Filler.json b/tests/static/state_tests/stRandom2/randomStatetest513Filler.json
index 423a6bba512..a7dac8b5579 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest513Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest513Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3b437ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000001982046817382a13afa3760088d"
             ],
             "gasLimit" : [
-                "0x1cf7758f"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest514Filler.json b/tests/static/state_tests/stRandom2/randomStatetest514Filler.json
index 2ebdcde25a3..f6a3ffc95e3 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest514Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest514Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe44447f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506c8ea356796d65546d3883768f"
             ],
             "gasLimit" : [
-                "0x026c8829"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest516Filler.json b/tests/static/state_tests/stRandom2/randomStatetest516Filler.json
index 5ba0ec36e55..2204abb2f44 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest516Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest516Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6a32787358019b391868619409"
             ],
             "gasLimit" : [
-                "0x1abc8d08"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest517Filler.json b/tests/static/state_tests/stRandom2/randomStatetest517Filler.json
index 6b51744f5be..c7c58a67d68 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest517Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest517Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3a6f450831a46a867f32569596f0099f7b8c91"
             ],
             "gasLimit" : [
-                "0x22d1e6e1"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest518Filler.json b/tests/static/state_tests/stRandom2/randomStatetest518Filler.json
index cd8ce82df38..62c8001a7fd 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest518Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest518Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f3c589f416d947a5134f268515b6c92"
             ],
             "gasLimit" : [
-                "0x6854f401"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest519Filler.json b/tests/static/state_tests/stRandom2/randomStatetest519Filler.json
index c42c6186fc7..391e4083247 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest519Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest519Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000001000000000000000000000000000000000000000009457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3501a02556b85a45311"
             ],
             "gasLimit" : [
-                "0x76fec4ed"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest520Filler.json b/tests/static/state_tests/stRandom2/randomStatetest520Filler.json
index 30f7a5ce887..02a3976626c 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest520Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest520Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff190308"
             ],
             "gasLimit" : [
-                "0x5732b2f3"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest521Filler.json b/tests/static/state_tests/stRandom2/randomStatetest521Filler.json
index 6073b9503cf..90f91ca0682 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest521Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest521Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6a73905597946a57769a6d920933"
             ],
             "gasLimit" : [
-                "0x6039159a"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest523Filler.json b/tests/static/state_tests/stRandom2/randomStatetest523Filler.json
index de049fe5b0b..7691d74f2b0 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest523Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest523Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x417f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe4450427f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000003560080b348d"
             ],
             "gasLimit" : [
-                "0x6dcfcf52"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest524Filler.json b/tests/static/state_tests/stRandom2/randomStatetest524Filler.json
index 62bf4fbb511..6475366be49 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest524Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest524Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff357f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000034208a340a9e"
             ],
             "gasLimit" : [
-                "0x2940a5df"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest525Filler.json b/tests/static/state_tests/stRandom2/randomStatetest525Filler.json
index f886fdfd9e8..1fa7d3b8f8a 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest525Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest525Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe022071"
             ],
             "gasLimit" : [
-                "0x51e47512"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest526Filler.json b/tests/static/state_tests/stRandom2/randomStatetest526Filler.json
index 4042be3c3a8..27556ca8636 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest526Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest526Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5417e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5419e01950777810975058c746f"
             ],
             "gasLimit" : [
-                "0x2d1d285d"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest527Filler.json b/tests/static/state_tests/stRandom2/randomStatetest527Filler.json
index 2f50ed85f45..4bedaaa18a6 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest527Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest527Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x347f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff80a1"
             ],
             "gasLimit" : [
-                "0x19412336"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest528Filler.json b/tests/static/state_tests/stRandom2/randomStatetest528Filler.json
index 65ec6cc5acb..73e88e93361 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest528Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest528Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x457f000000000000000000000000000000000000000000000000000000000000c350397ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0a9d30390b8c8584"
             ],
             "gasLimit" : [
-                "0x7b77631d"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest532Filler.json b/tests/static/state_tests/stRandom2/randomStatetest532Filler.json
index 45ec8c51dce..b4c75b2e078 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest532Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest532Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe54447f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f78297ba08ba478507f413b3597109c"
             ],
             "gasLimit" : [
-                "0x40b88610"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest533Filler.json b/tests/static/state_tests/stRandom2/randomStatetest533Filler.json
index 9594abf3fea..1d865a2ce43 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest533Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest533Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001847f00000000000000000000000100000000000000000000000000000000000000003a076152"
             ],
             "gasLimit" : [
-                "0x74d0d631"
+                "0x186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest534Filler.json b/tests/static/state_tests/stRandom2/randomStatetest534Filler.json
index 50cb3374306..4c827de1919 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest534Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest534Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000001000000000000000000000000000000000000000045437f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff457f0000000000000000000000000000000000000000000000000000000000000000436ff3075243846d88747b6a9e7ff28c61"
             ],
             "gasLimit" : [
-                "0x0810f1e2"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest535Filler.json b/tests/static/state_tests/stRandom2/randomStatetest535Filler.json
index 0245f62c095..478dddd7181 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest535Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest535Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit" : [
-                "0x172b6eeb"
+                "0x186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest536Filler.json b/tests/static/state_tests/stRandom2/randomStatetest536Filler.json
index 1d241f514d8..7c1c2990d33 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest536Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest536Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350537f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9309f3999c7d92795a947a6f317f"
             ],
             "gasLimit" : [
-                "0x11f18cf7"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest537Filler.json b/tests/static/state_tests/stRandom2/randomStatetest537Filler.json
index 97b4c272e47..5934fcb1d3b 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest537Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest537Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5688068515a6a996a540a03686d6d"
             ],
             "gasLimit" : [
-                "0x46ac408d"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest539Filler.json b/tests/static/state_tests/stRandom2/randomStatetest539Filler.json
index c1487360b9e..6b33133f97a 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest539Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest539Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff096794200bf18b0b316e41"
             ],
             "gasLimit" : [
-                "0x40a1f17a"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest541Filler.json b/tests/static/state_tests/stRandom2/randomStatetest541Filler.json
index 63ed9c4e5ff..c184d934b40 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest541Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest541Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000004335696e089257368d07897d57350b10"
             ],
             "gasLimit" : [
-                "0x7b88a390"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest542Filler.json b/tests/static/state_tests/stRandom2/randomStatetest542Filler.json
index 4d29222fc02..c95c272b68f 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest542Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest542Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x427f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000397f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>92"
             ],
             "gasLimit" : [
-                "0x073df881"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest543Filler.json b/tests/static/state_tests/stRandom2/randomStatetest543Filler.json
index 1edeb5c2b06..dcd48978662 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest543Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest543Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000004586"
             ],
             "gasLimit" : [
-                "0x41aec609"
+                "0x186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest544Filler.json b/tests/static/state_tests/stRandom2/randomStatetest544Filler.json
index c2ed347f63a..36ec0be39ac 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest544Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest544Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3503b7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f0000000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit" : [
-                "0x68b20f67"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest545Filler.json b/tests/static/state_tests/stRandom2/randomStatetest545Filler.json
index 43a4b1a5a8d..1c1f359fa67 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest545Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest545Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350637c9c82133005"
             ],
             "gasLimit" : [
-                "0x3424aed3"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest546Filler.json b/tests/static/state_tests/stRandom2/randomStatetest546Filler.json
index 127b37e166a..de8378a9f14 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest546Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest546Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff447f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f0000000000000000000000010000000000000000000000000000000000000000956f895258826c35576592208671731501"
             ],
             "gasLimit" : [
-                "0x1284e7d1"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest547Filler.json b/tests/static/state_tests/stRandom2/randomStatetest547Filler.json
index 604f5f454b7..9130db109c9 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest547Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest547Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest548Filler.json b/tests/static/state_tests/stRandom2/randomStatetest548Filler.json
index 4a0ebbe4ae9..95f0af4d839 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest548Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest548Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f0000000000000000000000010000000000000000000000000000000000000000417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001000000000000000000000000000000000000000019417f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f777a349a646633977da01a315a3c03"
             ],
             "gasLimit" : [
-                "0x66ad794c"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest550Filler.json b/tests/static/state_tests/stRandom2/randomStatetest550Filler.json
index 461357d147c..6ebcae93f6c 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest550Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest550Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f4472a17829659c94a29041419564313a"
             ],
             "gasLimit" : [
-                "0x0b32e55b"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest552Filler.json b/tests/static/state_tests/stRandom2/randomStatetest552Filler.json
index 8dd34cfed41..6cc378542f0 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest552Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest552Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff42147ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe547f00000000000000000000000000000000000000000000000000000000000000006f6a72a37b5219f089416d4336a08e82"
             ],
             "gasLimit" : [
-                "0x59f4666c"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest553Filler.json b/tests/static/state_tests/stRandom2/randomStatetest553Filler.json
index 0db7ee2c6c8..7783a273f1f 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest553Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest553Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000016f94819c780585376da073368c45828ca0"
             ],
             "gasLimit" : [
-                "0x54f14b65"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest554Filler.json b/tests/static/state_tests/stRandom2/randomStatetest554Filler.json
index 8d6d8c4b1cd..2767f0a8d3e 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest554Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest554Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest555Filler.json b/tests/static/state_tests/stRandom2/randomStatetest555Filler.json
index 6e6e2fd5e21..353051b555f 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest555Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest555Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000000000000000000000000000000000000000c3506f3b8f936e6f3874603c59120707e3588c"
             ],
             "gasLimit" : [
-                "0x1d8ad73a"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest556Filler.json b/tests/static/state_tests/stRandom2/randomStatetest556Filler.json
index 8bc8c4e8bd9..d5df9f08163 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest556Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest556Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f726e757692a2ad96526b9e8b77a33a"
             ],
             "gasLimit" : [
-                "0x6e98031d"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest559Filler.json b/tests/static/state_tests/stRandom2/randomStatetest559Filler.json
index f7712d714d5..9238a28d7a2 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest559Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest559Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000008509ff15"
             ],
             "gasLimit" : [
-                "0x07d9fc6d"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest560Filler.json b/tests/static/state_tests/stRandom2/randomStatetest560Filler.json
index 21607a8272e..556bd50ee01 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest560Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest560Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c35059a17f0000000000000000000000000000000000000000000000000000000000000001f38f07bf"
             ],
             "gasLimit" : [
-                "0x5a11064f"
+                "0x7a120"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest562Filler.json b/tests/static/state_tests/stRandom2/randomStatetest562Filler.json
index 2b6270ab6b5..900e4916109 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest562Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest562Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000001937fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350a094448744"
             ],
             "gasLimit" : [
-                "0x7f8db103"
+                "0x186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest563Filler.json b/tests/static/state_tests/stRandom2/randomStatetest563Filler.json
index afbe1512e0b..1d2f17919b5 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest563Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest563Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe418b7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>0461098038315ba267"
             ],
             "gasLimit" : [
-                "0x3e2f4059"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest564Filler.json b/tests/static/state_tests/stRandom2/randomStatetest564Filler.json
index c63aacbd85e..63db63071d0 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest564Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest564Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x5b7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe45500816"
             ],
             "gasLimit" : [
-                "0x79ad8da8"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest565Filler.json b/tests/static/state_tests/stRandom2/randomStatetest565Filler.json
index d3b1a203e8e..647d1ce1543 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest565Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest565Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350137f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000009237"
             ],
             "gasLimit" : [
-                "0x273f739f"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest566Filler.json b/tests/static/state_tests/stRandom2/randomStatetest566Filler.json
index 8f4037bfeeb..8bf27c3d3ee 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest566Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest566Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x9a7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000117f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff427f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>939633325786657343"
             ],
             "gasLimit" : [
-                "0x122017a8"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest567Filler.json b/tests/static/state_tests/stRandom2/randomStatetest567Filler.json
index 71e8df0b96f..0d16740aba6 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest567Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest567Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017e7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe906697998df1160b"
             ],
             "gasLimit" : [
-                "0x213b31cb"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest569Filler.json b/tests/static/state_tests/stRandom2/randomStatetest569Filler.json
index 1370f26d4e3..2b2eb435e1a 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest569Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest569Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>097f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe8e0781816fff31986c0a773c9b0144"
             ],
             "gasLimit" : [
-                "0x45dd1ab1"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest571Filler.json b/tests/static/state_tests/stRandom2/randomStatetest571Filler.json
index 78e8f391142..e4d975390ca 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest571Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest571Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000015b7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>3c6508766c8b6b403a"
             ],
             "gasLimit" : [
-                "0x7592dd6b"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest572Filler.json b/tests/static/state_tests/stRandom2/randomStatetest572Filler.json
index 5ece5e8cade..cd747006a21 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest572Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest572Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe097f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>440ba13b38"
             ],
             "gasLimit" : [
-                "0x3291d5d5"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest574Filler.json b/tests/static/state_tests/stRandom2/randomStatetest574Filler.json
index ae9cf1b5473..d2e4b977d3a 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest574Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest574Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001047f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff046d369354827d7433a335af"
             ],
             "gasLimit" : [
-                "0x04faf66d"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest575Filler.json b/tests/static/state_tests/stRandom2/randomStatetest575Filler.json
index 8d15b98d30a..c83a1cbee00 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest575Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest575Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>95949655558f6771c7798d047d7b"
             ],
             "gasLimit" : [
-                "0x229f89df"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest576Filler.json b/tests/static/state_tests/stRandom2/randomStatetest576Filler.json
index b9f6b6e1757..c2b997bad17 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest576Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest576Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f0000000000000000000000000000000000000000000000000000000000000000447f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000000086053a0b43890710810651116e15"
             ],
             "gasLimit" : [
-                "0x06420906"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest578Filler.json b/tests/static/state_tests/stRandom2/randomStatetest578Filler.json
index 9311303bb79..fd8b91111b7 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest578Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest578Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c350457f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff42"
             ],
             "gasLimit" : [
-                "0x73673a3c"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest579Filler.json b/tests/static/state_tests/stRandom2/randomStatetest579Filler.json
index 99093100368..f9f8663f214 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest579Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest579Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350f2075b67c7"
             ],
             "gasLimit" : [
-                "0x390c2e5b"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest580Filler.json b/tests/static/state_tests/stRandom2/randomStatetest580Filler.json
index 6fc21fe51fc..ee47ad0c162 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest580Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest580Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000000457f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000006f4640879d18777b953a209836379a30"
             ],
             "gasLimit" : [
-                "0x0a3b391c"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest581Filler.json b/tests/static/state_tests/stRandom2/randomStatetest581Filler.json
index c18ef30ede1..f108faf238d 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest581Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest581Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001037f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff44920907ff7e7d7012"
             ],
             "gasLimit" : [
-                "0x12fe8a68"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest582Filler.json b/tests/static/state_tests/stRandom2/randomStatetest582Filler.json
index 16129d7b8cf..b7d78f18882 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest582Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest582Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>417f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000045086201771880f3"
             ],
             "gasLimit" : [
-                "0x090f60db"
+                "0x030d40"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest583Filler.json b/tests/static/state_tests/stRandom2/randomStatetest583Filler.json
index fd2ef041dc5..12a325b7c7b 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest583Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest583Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest584Filler.json b/tests/static/state_tests/stRandom2/randomStatetest584Filler.json
index eee72acabbc..756c3d18520 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest584Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest584Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe9692190933"
             ],
             "gasLimit" : [
-                "0x05a07ffb"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest585Filler.json b/tests/static/state_tests/stRandom2/randomStatetest585Filler.json
index 93e08348225..47d75ef5ec5 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest585Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest585Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
             ],
             "gasLimit" : [
-                "0x0af82ef7"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest586Filler.json b/tests/static/state_tests/stRandom2/randomStatetest586Filler.json
index 14de3201327..9ee2157eda1 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest586Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest586Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000137"
             ],
             "gasLimit" : [
-                "0x405404a3"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest587Filler.json b/tests/static/state_tests/stRandom2/randomStatetest587Filler.json
index f3d052eaad5..7f50c8cfde4 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest587Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest587Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350117f0000000000000000000000000000000000000000000000000000000000000001457f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6f8b7152a3958a923c1665b27557089a"
             ],
             "gasLimit" : [
-                "0x79afcd8f"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest588Filler.json b/tests/static/state_tests/stRandom2/randomStatetest588Filler.json
index 03abd8dadcd..64a18ed08d8 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest588Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest588Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff41437f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff430637"
             ],
             "gasLimit" : [
-                "0x1008ed34"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest589Filler.json b/tests/static/state_tests/stRandom2/randomStatetest589Filler.json
index e4b11089d92..60674b6ccfd 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest589Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest589Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x427f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff583481f36a85646d53671639175b9408"
             ],
             "gasLimit" : [
-                "0x01a76401"
+                "0x432380"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest592Filler.json b/tests/static/state_tests/stRandom2/randomStatetest592Filler.json
index ee0a7883471..4b1cc405c58 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest592Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest592Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09"
             ],
             "gasLimit" : [
-                "0x62f269f3"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest596Filler.json b/tests/static/state_tests/stRandom2/randomStatetest596Filler.json
index e5b60f07043..3ca26fb72a5 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest596Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest596Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001317f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f7066a3507f6e090653945638306520"
             ],
             "gasLimit" : [
-                "0x13aca2d2"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest597Filler.json b/tests/static/state_tests/stRandom2/randomStatetest597Filler.json
index 503418d9a5c..a3b927467c8 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest597Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest597Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>967f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff3a7e737d40070a156482930a0875"
             ],
             "gasLimit" : [
-                "0x113ba544"
+                "0x186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest599Filler.json b/tests/static/state_tests/stRandom2/randomStatetest599Filler.json
index abbf3f45c92..800e5f58c76 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest599Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest599Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f8d6c60440a44449372068a976a8382"
             ],
             "gasLimit" : [
-                "0x6b3cc33a"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest600Filler.json b/tests/static/state_tests/stRandom2/randomStatetest600Filler.json
index c311a0a0794..52b77ac427e 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest600Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest600Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c35043457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f0b6f37208e76a402927039198c969907"
             ],
             "gasLimit" : [
-                "0x156fb444"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest601Filler.json b/tests/static/state_tests/stRandom2/randomStatetest601Filler.json
index 2fe504bc4fa..eaf96b4b7a8 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest601Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest601Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350377f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000000b3a09785b1084418866100af0868a34"
             ],
             "gasLimit" : [
-                "0x5cc006e7"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest602Filler.json b/tests/static/state_tests/stRandom2/randomStatetest602Filler.json
index 63eea515915..17bb1f5a429 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest602Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest602Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff"
             ],
             "gasLimit" : [
-                "0x396e40ab"
+                "0x186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest603Filler.json b/tests/static/state_tests/stRandom2/randomStatetest603Filler.json
index 87f81f8f9ef..36558f15cf6 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest603Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest603Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>427f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>086f655860560745326476a03cdc360634"
             ],
             "gasLimit" : [
-                "0x02799a8a"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest604Filler.json b/tests/static/state_tests/stRandom2/randomStatetest604Filler.json
index 69cd72769b3..bed6118ec78 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest604Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest604Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000437f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe44a4418a83039c0587363b0518204006065a06"
             ],
             "gasLimit" : [
-                "0x1bf2100a"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest605Filler.json b/tests/static/state_tests/stRandom2/randomStatetest605Filler.json
index a82d93dffaa..ace1ddf22e1 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest605Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest605Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350437f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9058038508"
             ],
             "gasLimit" : [
-                "0x793a40ba"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest607Filler.json b/tests/static/state_tests/stRandom2/randomStatetest607Filler.json
index a9b417d4271..aee42398cba 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest607Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest607Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff09"
             ],
             "gasLimit" : [
-                "0x50bd7adb"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest608Filler.json b/tests/static/state_tests/stRandom2/randomStatetest608Filler.json
index cc7c17d0c5d..05ba8c4eb21 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest608Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest608Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350537fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08"
             ],
             "gasLimit" : [
-                "0x430fbee1"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest609Filler.json b/tests/static/state_tests/stRandom2/randomStatetest609Filler.json
index c04a760e7dc..ad131b19864 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest609Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest609Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000001a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000001a736e628f7964367396"
             ],
             "gasLimit" : [
-                "0x75367410"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest610Filler.json b/tests/static/state_tests/stRandom2/randomStatetest610Filler.json
index 49e3572d531..11e4ef1c822 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest610Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest610Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x417f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f01f353a2437e4384726497587b8556"
             ],
             "gasLimit" : [
-                "0x180823ff"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest611Filler.json b/tests/static/state_tests/stRandom2/randomStatetest611Filler.json
index 8ff936feb86..92c6b5efb31 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest611Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest611Filler.json
@@ -63,7 +63,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c350417f0000000000000000000000000000000000000000000000000000000000000001437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001357f00000000000000000000000000000000000000000000000000000000000000000b9b84a3"
             ],
             "gasLimit" : [
-                "0x518d8397"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest612Filler.json b/tests/static/state_tests/stRandom2/randomStatetest612Filler.json
index d834adbf6c0..01bffcb8461 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest612Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest612Filler.json
@@ -65,7 +65,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09"
             ],
             "gasLimit" : [
-                "0x5aab961a"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest615Filler.json b/tests/static/state_tests/stRandom2/randomStatetest615Filler.json
index 42552a7be06..1eac279d096 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest615Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest615Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe837f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001000000000000000000000000000000000000000009556c6f390a3054d7368a9a"
             ],
             "gasLimit" : [
-                "0x14400294"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest616Filler.json b/tests/static/state_tests/stRandom2/randomStatetest616Filler.json
index 023f5b6889d..c574d1b65aa 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest616Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest616Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f86a2409b991539f0423c0342363c3b"
             ],
             "gasLimit" : [
-                "0x0f05af2a"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest618Filler.json b/tests/static/state_tests/stRandom2/randomStatetest618Filler.json
index 2e967fa5962..5fcaab82496 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest618Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest618Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest620Filler.json b/tests/static/state_tests/stRandom2/randomStatetest620Filler.json
index 32a8ea4efb1..bc9779a6182 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest620Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest620Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427f0000000000000000000000010000000000000000000000000000000000000000457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f6c54a420327d73727d9d1a667bf389"
             ],
             "gasLimit" : [
-                "0x47166848"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest621Filler.json b/tests/static/state_tests/stRandom2/randomStatetest621Filler.json
index 9eca5438d3a..f866873b9f9 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest621Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest621Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f0000000000000000000000000000000000000000000000000000000000000000441a7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f3ba187a19366899e595220741232905b"
             ],
             "gasLimit" : [
-                "0x660d9780"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest625Filler.json b/tests/static/state_tests/stRandom2/randomStatetest625Filler.json
index 4404db7d9df..642d44252ae 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest625Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest625Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000887f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa301"
             ],
             "gasLimit" : [
-                "0x71bb9e4a"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest626Filler.json b/tests/static/state_tests/stRandom2/randomStatetest626Filler.json
index 5278a838a36..ee6077cabf4 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest626Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest626Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c350f4fd94058f06a2"
             ],
             "gasLimit" : [
-                "0x165c15bc"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest629Filler.json b/tests/static/state_tests/stRandom2/randomStatetest629Filler.json
index d78f967b103..c420c2469f3 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest629Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest629Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>347f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>116f427277147c617f4354a35a1a47977a"
             ],
             "gasLimit" : [
-                "0x5b0db6f8"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest630Filler.json b/tests/static/state_tests/stRandom2/randomStatetest630Filler.json
index d8a3ca4f178..7218a1cd157 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest630Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest630Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000001427f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f9461a46e61507a1206917b17137e7e"
             ],
             "gasLimit" : [
-                "0x32a16829"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest633Filler.json b/tests/static/state_tests/stRandom2/randomStatetest633Filler.json
index cbad2ab3321..0057c33bc9d 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest633Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest633Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6f82941340756317567250f1573a8976"
             ],
             "gasLimit" : [
-                "0x7699ed46"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest635Filler.json b/tests/static/state_tests/stRandom2/randomStatetest635Filler.json
index 4abbbef8c41..041e38e808c 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest635Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest635Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6a5b7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe66f2707d83713b6b8f3208"
             ],
             "gasLimit" : [
-                "0x3c465078"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest636Filler.json b/tests/static/state_tests/stRandom2/randomStatetest636Filler.json
index 58d20a54568..4874164434e 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest636Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest636Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest637Filler.json b/tests/static/state_tests/stRandom2/randomStatetest637Filler.json
index 728de29fe51..1fe449fb3dd 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest637Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest637Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f44931064138e9df1768334028c201471"
             ],
             "gasLimit" : [
-                "0x0e9c030c"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest638Filler.json b/tests/static/state_tests/stRandom2/randomStatetest638Filler.json
index ebf5b1e02f6..cce1d314e4a 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest638Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest638Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09"
             ],
             "gasLimit" : [
-                "0x3a475d31"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest639Filler.json b/tests/static/state_tests/stRandom2/randomStatetest639Filler.json
index 65dac837b75..13a4b97d815 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest639Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest639Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest640Filler.json b/tests/static/state_tests/stRandom2/randomStatetest640Filler.json
index a52e5837872..e7d4c4c5f1d 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest640Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest640Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000807f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff5088"
             ],
             "gasLimit" : [
-                "0x014f5d2b"
+                "0x0186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest641Filler.json b/tests/static/state_tests/stRandom2/randomStatetest641Filler.json
index f07f2a3b726..8a24890cb9b 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest641Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest641Filler.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f29199c9aa4054170f1a15a55056f96"
             ],
             "gasLimit" : [
-                "0x17ee5409"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRandom2/randomStatetest650Filler.json b/tests/static/state_tests/stRandom2/randomStatetest650Filler.json
index 31b27dade43..88812c8ce5b 100644
--- a/tests/static/state_tests/stRandom2/randomStatetest650Filler.json
+++ b/tests/static/state_tests/stRandom2/randomStatetest650Filler.json
@@ -44,7 +44,7 @@
 			":raw 0x000000d514029599b459ce6d7f5a430010f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730aefbfbdefbfbdefbfbdefbfbd0300"
 		],
 		"gasLimit":[
-			"0x1312d00"
+			"0x124f80"
 		],
 		"gasPrice":"0x0a",
 		"nonce":"0x00",
diff --git a/tests/static/state_tests/stRandom2/randomStatetestFiller.json b/tests/static/state_tests/stRandom2/randomStatetestFiller.json
index b9b5fb5cea2..9ca02c00f9b 100644
--- a/tests/static/state_tests/stRandom2/randomStatetestFiller.json
+++ b/tests/static/state_tests/stRandom2/randomStatetestFiller.json
@@ -64,7 +64,7 @@
                 ":raw 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f29199c9aa4054170f1a15a55056f96"
             ],
             "gasLimit" : [
-                "0x17ee5409"
+                "0x186a0"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stRecursiveCreate/recursiveCreateReturnValueFiller.json b/tests/static/state_tests/stRecursiveCreate/recursiveCreateReturnValueFiller.json
index 9b7f96b13eb..81ae677edb3 100644
--- a/tests/static/state_tests/stRecursiveCreate/recursiveCreateReturnValueFiller.json
+++ b/tests/static/state_tests/stRecursiveCreate/recursiveCreateReturnValueFiller.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "d2571607e241ecf590ed94b12d87c94babe36db6" : {
                         "nonce" : "0x02"
diff --git a/tests/static/state_tests/stReturnDataTest/call_ecrec_success_empty_then_returndatasizeFiller.json b/tests/static/state_tests/stReturnDataTest/call_ecrec_success_empty_then_returndatasizeFiller.json
index e6c13bc60db..8802b29c5ee 100644
--- a/tests/static/state_tests/stReturnDataTest/call_ecrec_success_empty_then_returndatasizeFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/call_ecrec_success_empty_then_returndatasizeFiller.json
@@ -46,7 +46,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/call_outsize_then_create_successful_then_returndatasizeFiller.json b/tests/static/state_tests/stReturnDataTest/call_outsize_then_create_successful_then_returndatasizeFiller.json
index 46781645c9d..e24e78b25d4 100644
--- a/tests/static/state_tests/stReturnDataTest/call_outsize_then_create_successful_then_returndatasizeFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/call_outsize_then_create_successful_then_returndatasizeFiller.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/call_then_call_value_fail_then_returndatasizeFiller.json b/tests/static/state_tests/stReturnDataTest/call_then_call_value_fail_then_returndatasizeFiller.json
index a703d2849b8..bfe32c611fc 100644
--- a/tests/static/state_tests/stReturnDataTest/call_then_call_value_fail_then_returndatasizeFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/call_then_call_value_fail_then_returndatasizeFiller.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/call_then_create_successful_then_returndatasizeFiller.json b/tests/static/state_tests/stReturnDataTest/call_then_create_successful_then_returndatasizeFiller.json
index 7e3fcd46a7b..6aa76059b89 100644
--- a/tests/static/state_tests/stReturnDataTest/call_then_create_successful_then_returndatasizeFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/call_then_create_successful_then_returndatasizeFiller.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/create_callprecompile_returndatasizeFiller.json b/tests/static/state_tests/stReturnDataTest/create_callprecompile_returndatasizeFiller.json
index 08ad2aa6809..e9a53f7b117 100644
--- a/tests/static/state_tests/stReturnDataTest/create_callprecompile_returndatasizeFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/create_callprecompile_returndatasizeFiller.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/modexp_modsize0_returndatasizeFiller.json b/tests/static/state_tests/stReturnDataTest/modexp_modsize0_returndatasizeFiller.json
index d7f7edf6b5c..6d603054ad5 100644
--- a/tests/static/state_tests/stReturnDataTest/modexp_modsize0_returndatasizeFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/modexp_modsize0_returndatasizeFiller.json
@@ -124,7 +124,7 @@
 				":raw 0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000f3f14010101"
             ],
             "gasLimit" : [
-                "1000000000"
+                "10000000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json b/tests/static/state_tests/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json
index eca4f9563e8..f53b654e3d2 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json
@@ -51,7 +51,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatacopy_afterFailing_createFiller.json b/tests/static/state_tests/stReturnDataTest/returndatacopy_afterFailing_createFiller.json
index 91588958a2c..e0f3b038fa4 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatacopy_afterFailing_createFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatacopy_afterFailing_createFiller.json
@@ -49,7 +49,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatacopy_after_failing_callcodeFiller.json b/tests/static/state_tests/stReturnDataTest/returndatacopy_after_failing_callcodeFiller.json
index 66e01676933..115db561e04 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatacopy_after_failing_callcodeFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatacopy_after_failing_callcodeFiller.json
@@ -59,7 +59,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatacopy_after_failing_delegatecallFiller.json b/tests/static/state_tests/stReturnDataTest/returndatacopy_after_failing_delegatecallFiller.json
index f96f843f711..8285e1a826d 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatacopy_after_failing_delegatecallFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatacopy_after_failing_delegatecallFiller.json
@@ -59,7 +59,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatacopy_after_failing_staticcallFiller.json b/tests/static/state_tests/stReturnDataTest/returndatacopy_after_failing_staticcallFiller.json
index f50fb51f7fe..98f461c173c 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatacopy_after_failing_staticcallFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatacopy_after_failing_staticcallFiller.json
@@ -59,7 +59,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatacopy_after_revert_in_staticcallFiller.json b/tests/static/state_tests/stReturnDataTest/returndatacopy_after_revert_in_staticcallFiller.json
index 1d77be4e511..4f1b7234420 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatacopy_after_revert_in_staticcallFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatacopy_after_revert_in_staticcallFiller.json
@@ -59,7 +59,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatacopy_after_successful_callcodeFiller.json b/tests/static/state_tests/stReturnDataTest/returndatacopy_after_successful_callcodeFiller.json
index 598b69c21ea..76ab2858564 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatacopy_after_successful_callcodeFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatacopy_after_successful_callcodeFiller.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatacopy_after_successful_delegatecallFiller.json b/tests/static/state_tests/stReturnDataTest/returndatacopy_after_successful_delegatecallFiller.json
index f66ba9d0c63..0574f508c70 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatacopy_after_successful_delegatecallFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatacopy_after_successful_delegatecallFiller.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatacopy_after_successful_staticcallFiller.json b/tests/static/state_tests/stReturnDataTest/returndatacopy_after_successful_staticcallFiller.json
index c7460df649e..4ad52af9d57 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatacopy_after_successful_staticcallFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatacopy_after_successful_staticcallFiller.json
@@ -59,7 +59,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatacopy_following_callFiller.json b/tests/static/state_tests/stReturnDataTest/returndatacopy_following_callFiller.json
index 7b409cfc732..0ccfdbdf859 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatacopy_following_callFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatacopy_following_callFiller.json
@@ -52,7 +52,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatacopy_following_createFiller.json b/tests/static/state_tests/stReturnDataTest/returndatacopy_following_createFiller.json
index 5e4a78accb7..4c841637350 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatacopy_following_createFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatacopy_following_createFiller.json
@@ -52,7 +52,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatacopy_following_failing_callFiller.json b/tests/static/state_tests/stReturnDataTest/returndatacopy_following_failing_callFiller.json
index c317bad3d6e..259539bc03e 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatacopy_following_failing_callFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatacopy_following_failing_callFiller.json
@@ -54,7 +54,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatacopy_following_revertFiller.json b/tests/static/state_tests/stReturnDataTest/returndatacopy_following_revertFiller.json
index d27d373fa38..eed062fa0df 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatacopy_following_revertFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatacopy_following_revertFiller.json
@@ -52,7 +52,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatacopy_following_revert_in_createFiller.json b/tests/static/state_tests/stReturnDataTest/returndatacopy_following_revert_in_createFiller.json
index 57eaa6e8a24..64477f49a68 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatacopy_following_revert_in_createFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatacopy_following_revert_in_createFiller.json
@@ -45,7 +45,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatacopy_following_successful_createFiller.json b/tests/static/state_tests/stReturnDataTest/returndatacopy_following_successful_createFiller.json
index 079b05e0473..97d307d6c3b 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatacopy_following_successful_createFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatacopy_following_successful_createFiller.json
@@ -45,7 +45,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatacopy_following_too_big_transferFiller.json b/tests/static/state_tests/stReturnDataTest/returndatacopy_following_too_big_transferFiller.json
index 0d3e1213118..b9e762874e2 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatacopy_following_too_big_transferFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatacopy_following_too_big_transferFiller.json
@@ -55,7 +55,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatacopy_initialFiller.json b/tests/static/state_tests/stReturnDataTest/returndatacopy_initialFiller.json
index 511397103ee..c694b201ec8 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatacopy_initialFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatacopy_initialFiller.json
@@ -45,7 +45,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatacopy_initial_256Filler.json b/tests/static/state_tests/stReturnDataTest/returndatacopy_initial_256Filler.json
index ba87a7cb5c7..6dc0423da4c 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatacopy_initial_256Filler.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatacopy_initial_256Filler.json
@@ -52,7 +52,7 @@
                 ":raw 0x0000000000000000000000000000000000000000000000000000000000000065"
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatacopy_initial_big_sumFiller.json b/tests/static/state_tests/stReturnDataTest/returndatacopy_initial_big_sumFiller.json
index d77e2855953..025a0145fe8 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatacopy_initial_big_sumFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatacopy_initial_big_sumFiller.json
@@ -45,7 +45,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatacopy_overrunFiller.json b/tests/static/state_tests/stReturnDataTest/returndatacopy_overrunFiller.json
index 5ddf03cfdcf..8107650822c 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatacopy_overrunFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatacopy_overrunFiller.json
@@ -52,7 +52,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatasize_after_failing_callcodeFiller.json b/tests/static/state_tests/stReturnDataTest/returndatasize_after_failing_callcodeFiller.json
index b85f7b5d629..57e776388d7 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatasize_after_failing_callcodeFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatasize_after_failing_callcodeFiller.json
@@ -60,7 +60,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x030d40"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatasize_after_failing_delegatecallFiller.json b/tests/static/state_tests/stReturnDataTest/returndatasize_after_failing_delegatecallFiller.json
index a8eecba1010..497d5b2d2b7 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatasize_after_failing_delegatecallFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatasize_after_failing_delegatecallFiller.json
@@ -60,7 +60,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatasize_after_failing_staticcallFiller.json b/tests/static/state_tests/stReturnDataTest/returndatasize_after_failing_staticcallFiller.json
index 85d0b791a99..8e77e96c3fd 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatasize_after_failing_staticcallFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatasize_after_failing_staticcallFiller.json
@@ -60,7 +60,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatasize_after_oog_after_deeperFiller.json b/tests/static/state_tests/stReturnDataTest/returndatasize_after_oog_after_deeperFiller.json
index b42909acfb2..9305ce13445 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatasize_after_oog_after_deeperFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatasize_after_oog_after_deeperFiller.json
@@ -73,7 +73,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x030d40"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatasize_after_successful_callcodeFiller.json b/tests/static/state_tests/stReturnDataTest/returndatasize_after_successful_callcodeFiller.json
index 11f9d9d9223..9d7953fa378 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatasize_after_successful_callcodeFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatasize_after_successful_callcodeFiller.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatasize_after_successful_delegatecallFiller.json b/tests/static/state_tests/stReturnDataTest/returndatasize_after_successful_delegatecallFiller.json
index 8fa0e62019c..045deef61da 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatasize_after_successful_delegatecallFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatasize_after_successful_delegatecallFiller.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatasize_after_successful_staticcallFiller.json b/tests/static/state_tests/stReturnDataTest/returndatasize_after_successful_staticcallFiller.json
index 29e834ba188..fbcddeaceae 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatasize_after_successful_staticcallFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatasize_after_successful_staticcallFiller.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatasize_bugFiller.json b/tests/static/state_tests/stReturnDataTest/returndatasize_bugFiller.json
index 53bb6e1d85c..5d952df8bed 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatasize_bugFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatasize_bugFiller.json
@@ -60,7 +60,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatasize_following_successful_createFiller.json b/tests/static/state_tests/stReturnDataTest/returndatasize_following_successful_createFiller.json
index 401472542c7..13c2c333ff4 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatasize_following_successful_createFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatasize_following_successful_createFiller.json
@@ -46,7 +46,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatasize_initialFiller.json b/tests/static/state_tests/stReturnDataTest/returndatasize_initialFiller.json
index 2a55ed713cf..710c3b30385 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatasize_initialFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatasize_initialFiller.json
@@ -45,7 +45,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stReturnDataTest/returndatasize_initial_zero_readFiller.json b/tests/static/state_tests/stReturnDataTest/returndatasize_initial_zero_readFiller.json
index 840c832b3b0..fefe165d787 100644
--- a/tests/static/state_tests/stReturnDataTest/returndatasize_initial_zero_readFiller.json
+++ b/tests/static/state_tests/stReturnDataTest/returndatasize_initial_zero_readFiller.json
@@ -45,7 +45,7 @@
                 "", ":raw 0x992919aa"
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRevertTest/LoopCallsDepthThenRevert2Filler.json b/tests/static/state_tests/stRevertTest/LoopCallsDepthThenRevert2Filler.json
index ddd07a1b882..cd1f5bf2345 100644
--- a/tests/static/state_tests/stRevertTest/LoopCallsDepthThenRevert2Filler.json
+++ b/tests/static/state_tests/stRevertTest/LoopCallsDepthThenRevert2Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                         "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                             "balance" : "0x03",
diff --git a/tests/static/state_tests/stRevertTest/LoopCallsDepthThenRevert3Filler.json b/tests/static/state_tests/stRevertTest/LoopCallsDepthThenRevert3Filler.json
index f02681e2735..4adb62d0904 100644
--- a/tests/static/state_tests/stRevertTest/LoopCallsDepthThenRevert3Filler.json
+++ b/tests/static/state_tests/stRevertTest/LoopCallsDepthThenRevert3Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                         "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                             "balance" : "0x01",
diff --git a/tests/static/state_tests/stRevertTest/RevertInCreateInInit_ParisFiller.json b/tests/static/state_tests/stRevertTest/RevertInCreateInInit_ParisFiller.json
index 66ba99caf13..a392aa1f5f7 100644
--- a/tests/static/state_tests/stRevertTest/RevertInCreateInInit_ParisFiller.json
+++ b/tests/static/state_tests/stRevertTest/RevertInCreateInInit_ParisFiller.json
@@ -42,7 +42,7 @@
                 "{ (seq (address) (CREATE 0 0 (lll (seq (mstore 0 0x112233) (revert 0 32)) 0)) (SSTORE 0 (RETURNDATASIZE)) (returndatacopy 0 0 32) (sstore 1 (mload 0)) (STOP) ) }"
             ],
             "gasLimit" : [
-                "42907729921"
+                "200000"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRevertTest/RevertOpcodeInCreateReturnsFiller.json b/tests/static/state_tests/stRevertTest/RevertOpcodeInCreateReturnsFiller.json
index f1649047310..a76b9d617e5 100644
--- a/tests/static/state_tests/stRevertTest/RevertOpcodeInCreateReturnsFiller.json
+++ b/tests/static/state_tests/stRevertTest/RevertOpcodeInCreateReturnsFiller.json
@@ -45,7 +45,7 @@
                 ""
             ],
             "gasLimit" : [
-                "42907729921"
+                "100000"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stRevertTest/costRevertFiller.yml b/tests/static/state_tests/stRevertTest/costRevertFiller.yml
index d7e3e637b63..18b5d742eed 100644
--- a/tests/static/state_tests/stRevertTest/costRevertFiller.yml
+++ b/tests/static/state_tests/stRevertTest/costRevertFiller.yml
@@ -256,7 +256,7 @@ costRevert:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC:
           storage:
@@ -276,7 +276,7 @@ costRevert:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC:
           storage:
diff --git a/tests/static/state_tests/stSLoadTest/sloadGasCostFiller.json b/tests/static/state_tests/stSLoadTest/sloadGasCostFiller.json
index 024702224bc..d0351e9dc5e 100644
--- a/tests/static/state_tests/stSLoadTest/sloadGasCostFiller.json
+++ b/tests/static/state_tests/stSLoadTest/sloadGasCostFiller.json
@@ -41,7 +41,7 @@
       },
       "transaction": {
         "data": ["0x"],
-        "gasLimit": ["100000000"],
+        "gasLimit": ["100000"],
         "gasPrice": "10",
         "nonce": "0",
         "secretKey": "<eoa:sender:0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8>",
diff --git a/tests/static/state_tests/stSelfBalance/selfBalanceEqualsBalanceFiller.json b/tests/static/state_tests/stSelfBalance/selfBalanceEqualsBalanceFiller.json
index 9a554d8d760..e0beec88372 100644
--- a/tests/static/state_tests/stSelfBalance/selfBalanceEqualsBalanceFiller.json
+++ b/tests/static/state_tests/stSelfBalance/selfBalanceEqualsBalanceFiller.json
@@ -40,7 +40,7 @@
       },
       "transaction": {
         "data": ["0x"],
-        "gasLimit": ["100000000"],
+        "gasLimit": ["100000"],
         "gasPrice": "10",
         "nonce": "0",
         "secretKey": "<eoa:sender:0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8>",
diff --git a/tests/static/state_tests/stSelfBalance/selfBalanceFiller.json b/tests/static/state_tests/stSelfBalance/selfBalanceFiller.json
index 2ef4c6d576d..7649837a646 100644
--- a/tests/static/state_tests/stSelfBalance/selfBalanceFiller.json
+++ b/tests/static/state_tests/stSelfBalance/selfBalanceFiller.json
@@ -41,7 +41,7 @@
       },
       "transaction": {
         "data": ["0x"],
-        "gasLimit": ["100000000"],
+        "gasLimit": ["100000"],
         "gasPrice": "10",
         "nonce": "0",
         "secretKey": "<eoa:sender:0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8>",
diff --git a/tests/static/state_tests/stSelfBalance/selfBalanceGasCostFiller.json b/tests/static/state_tests/stSelfBalance/selfBalanceGasCostFiller.json
index fae52cdb42a..7c429f50472 100644
--- a/tests/static/state_tests/stSelfBalance/selfBalanceGasCostFiller.json
+++ b/tests/static/state_tests/stSelfBalance/selfBalanceGasCostFiller.json
@@ -41,7 +41,7 @@
       },
       "transaction": {
         "data": ["0x"],
-        "gasLimit": ["100000000"],
+        "gasLimit": ["100000"],
         "gasPrice": "10",
         "nonce": "0",
         "secretKey": "<eoa:sender:0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8>",
diff --git a/tests/static/state_tests/stSelfBalance/selfBalanceUpdateFiller.json b/tests/static/state_tests/stSelfBalance/selfBalanceUpdateFiller.json
index 056d7db42fc..12bd43744d3 100644
--- a/tests/static/state_tests/stSelfBalance/selfBalanceUpdateFiller.json
+++ b/tests/static/state_tests/stSelfBalance/selfBalanceUpdateFiller.json
@@ -42,7 +42,7 @@
       },
       "transaction": {
         "data": ["0x"],
-        "gasLimit": ["100000000"],
+        "gasLimit": ["200000"],
         "gasPrice": "10",
         "nonce": "0",
         "secretKey": "<eoa:sender:0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8>",
diff --git a/tests/static/state_tests/stShift/shiftSignedCombinationsFiller.yml b/tests/static/state_tests/stShift/shiftSignedCombinationsFiller.yml
index 76ffe5643a7..cde93458ba2 100644
--- a/tests/static/state_tests/stShift/shiftSignedCombinationsFiller.yml
+++ b/tests/static/state_tests/stShift/shiftSignedCombinationsFiller.yml
@@ -155,7 +155,7 @@ shiftSignedCombinations:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>=Cancun'
+        - '>=Cancun<Osaka'
       result:
         <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>:
           balance: '1000000000000000001'
diff --git a/tests/static/state_tests/stSolidityTest/ContractInheritanceFiller.json b/tests/static/state_tests/stSolidityTest/ContractInheritanceFiller.json
index e8663f2920e..6337b7c13b0 100644
--- a/tests/static/state_tests/stSolidityTest/ContractInheritanceFiller.json
+++ b/tests/static/state_tests/stSolidityTest/ContractInheritanceFiller.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun" ],
+                "network" : [ ">=Cancun<Osaka" ],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stSolidityTest/TestCryptographicFunctionsFiller.json b/tests/static/state_tests/stSolidityTest/TestCryptographicFunctionsFiller.json
index 4e186d4765e..c5157d63999 100644
--- a/tests/static/state_tests/stSolidityTest/TestCryptographicFunctionsFiller.json
+++ b/tests/static/state_tests/stSolidityTest/TestCryptographicFunctionsFiller.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun" ],
+                "network" : [ ">=Cancun<Osaka" ],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stSolidityTest/TestOverflowFiller.json b/tests/static/state_tests/stSolidityTest/TestOverflowFiller.json
index d2df59480cd..9bc97ce1ce5 100644
--- a/tests/static/state_tests/stSolidityTest/TestOverflowFiller.json
+++ b/tests/static/state_tests/stSolidityTest/TestOverflowFiller.json
@@ -70,7 +70,7 @@
                 ":raw 0xc0406226"
             ],
             "gasLimit" : [
-                "35000000"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stSolidityTest/TestStoreGasPricesFiller.json b/tests/static/state_tests/stSolidityTest/TestStoreGasPricesFiller.json
index c23f73144bc..02b27dc4e65 100644
--- a/tests/static/state_tests/stSolidityTest/TestStoreGasPricesFiller.json
+++ b/tests/static/state_tests/stSolidityTest/TestStoreGasPricesFiller.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun" ],
+                "network" : [ ">=Cancun<Osaka" ],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stSpecialTest/FailedCreateRevertsDeletionParisFiller.json b/tests/static/state_tests/stSpecialTest/FailedCreateRevertsDeletionParisFiller.json
index c08bf1f3588..2de0e77fceb 100644
--- a/tests/static/state_tests/stSpecialTest/FailedCreateRevertsDeletionParisFiller.json
+++ b/tests/static/state_tests/stSpecialTest/FailedCreateRevertsDeletionParisFiller.json
@@ -45,7 +45,7 @@
                 "{ (seq (address) (CREATE 0 0 (lll (seq (mstore 0 0x112233) (revert 0 32)) 0)) (invalid) ) }"
             ],
             "gasLimit" : [
-                "0x0a00000000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x0a",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stSpecialTest/JUMPDEST_AttackFiller.json b/tests/static/state_tests/stSpecialTest/JUMPDEST_AttackFiller.json
index 2c91afe8825..e10a0537630 100644
--- a/tests/static/state_tests/stSpecialTest/JUMPDEST_AttackFiller.json
+++ b/tests/static/state_tests/stSpecialTest/JUMPDEST_AttackFiller.json
@@ -10,7 +10,7 @@
         "expect" : [
     	    {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
             			"nonce" : "1"
diff --git a/tests/static/state_tests/stSpecialTest/JUMPDEST_AttackwithJumpFiller.json b/tests/static/state_tests/stSpecialTest/JUMPDEST_AttackwithJumpFiller.json
index 6fb424a7e6e..e61b74daee0 100644
--- a/tests/static/state_tests/stSpecialTest/JUMPDEST_AttackwithJumpFiller.json
+++ b/tests/static/state_tests/stSpecialTest/JUMPDEST_AttackwithJumpFiller.json
@@ -10,7 +10,7 @@
         "expect" : [
     	    {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
             			"nonce" : "1"
diff --git a/tests/static/state_tests/stSpecialTest/OverflowGasMakeMoneyFiller.json b/tests/static/state_tests/stSpecialTest/OverflowGasMakeMoneyFiller.json
index a7c894676cc..fecf90182d7 100644
--- a/tests/static/state_tests/stSpecialTest/OverflowGasMakeMoneyFiller.json
+++ b/tests/static/state_tests/stSpecialTest/OverflowGasMakeMoneyFiller.json
@@ -35,7 +35,7 @@
                 ""
             ],
             "gasLimit" : [
-                "9214364837600034817"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stStaticCall/static_ABAcalls1Filler.json b/tests/static/state_tests/stStaticCall/static_ABAcalls1Filler.json
index 1a1c62b1f3d..5687d8b0f50 100644
--- a/tests/static/state_tests/stStaticCall/static_ABAcalls1Filler.json
+++ b/tests/static/state_tests/stStaticCall/static_ABAcalls1Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
         		    "<contract:target:0x1000000000000000000000000000000000000000>" : {
 		            	"storage" : {
@@ -40,7 +40,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
 		            "<contract:target:0x1000000000000000000000000000000000000000>" : {
 		                "storage" : {
diff --git a/tests/static/state_tests/stStaticCall/static_ABAcalls2Filler.json b/tests/static/state_tests/stStaticCall/static_ABAcalls2Filler.json
index 4724dd064d3..5b3a82804b6 100644
--- a/tests/static/state_tests/stStaticCall/static_ABAcalls2Filler.json
+++ b/tests/static/state_tests/stStaticCall/static_ABAcalls2Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
         		    "<contract:target:0x1000000000000000000000000000000000000000>" : {
             			"storage" : {
@@ -40,7 +40,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
 		            "<contract:target:0x1000000000000000000000000000000000000000>" : {
 			            "storage" : {
diff --git a/tests/static/state_tests/stStaticCall/static_Call1024BalanceTooLow2Filler.json b/tests/static/state_tests/stStaticCall/static_Call1024BalanceTooLow2Filler.json
index 921513bc12c..b3116b9d28f 100644
--- a/tests/static/state_tests/stStaticCall/static_Call1024BalanceTooLow2Filler.json
+++ b/tests/static/state_tests/stStaticCall/static_Call1024BalanceTooLow2Filler.json
@@ -10,7 +10,7 @@
         "expect" : [
 	    {
                 "indexes" : { "data" : 0, "gas" : -1, "value" : -1 },
-                "network" : [  ">=Cancun" ],
+                "network" : [  ">=Cancun<Osaka" ],
                 "result" : {
                     "<contract:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "storage" : {
@@ -28,7 +28,7 @@
             },
 	        {
                 "indexes" : { "data" : 1, "gas" : -1, "value" : -1 },
-                "network" : [ ">=Cancun" ],
+                "network" : [ ">=Cancun<Osaka" ],
                 "result" : {
                     "<contract:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stStaticCall/static_Call1024BalanceTooLowFiller.json b/tests/static/state_tests/stStaticCall/static_Call1024BalanceTooLowFiller.json
index 6c7c825c0ae..3f7f4a7d074 100644
--- a/tests/static/state_tests/stStaticCall/static_Call1024BalanceTooLowFiller.json
+++ b/tests/static/state_tests/stStaticCall/static_Call1024BalanceTooLowFiller.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
 					"<contract:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
 						"storage" : {
@@ -36,7 +36,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
 					"<contract:0xcbbf5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
 						"storage" : {
diff --git a/tests/static/state_tests/stStaticCall/static_Call1024PreCalls2Filler.json b/tests/static/state_tests/stStaticCall/static_Call1024PreCalls2Filler.json
index 7fa9d98bab8..7d566f501cd 100644
--- a/tests/static/state_tests/stStaticCall/static_Call1024PreCalls2Filler.json
+++ b/tests/static/state_tests/stStaticCall/static_Call1024PreCalls2Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<contract:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "storage" : {
@@ -38,7 +38,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stStaticCall/static_Call1024PreCalls3Filler.json b/tests/static/state_tests/stStaticCall/static_Call1024PreCalls3Filler.json
index c598a3dee70..ee76f379391 100644
--- a/tests/static/state_tests/stStaticCall/static_Call1024PreCalls3Filler.json
+++ b/tests/static/state_tests/stStaticCall/static_Call1024PreCalls3Filler.json
@@ -10,7 +10,7 @@
         "expect" : [
 	    {
                 "indexes" : { "data" : 0, "gas" : -1, "value" : -1 },
-                "network" : [ ">=Cancun" ],
+                "network" : [ ">=Cancun<Osaka" ],
                 "result" : {
                     "<contract:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "storage" : {
@@ -30,7 +30,7 @@
             },
     	    {
                 "indexes" : { "data" : 1, "gas" : -1, "value" : -1 },
-                "network" : [">=Cancun" ],
+                "network" : [">=Cancun<Osaka" ],
                 "result" : {
                     "<contract:0xcbbf5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stStaticCall/static_Call1024PreCallsFiller.json b/tests/static/state_tests/stStaticCall/static_Call1024PreCallsFiller.json
index e902ff14334..06ac20d91e6 100644
--- a/tests/static/state_tests/stStaticCall/static_Call1024PreCallsFiller.json
+++ b/tests/static/state_tests/stStaticCall/static_Call1024PreCallsFiller.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
 					"<contract:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
 						"storage" : {
@@ -38,7 +38,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
 					"<contract:0xcbbf5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
 						"storage" : {
diff --git a/tests/static/state_tests/stStaticCall/static_Call10Filler.json b/tests/static/state_tests/stStaticCall/static_Call10Filler.json
index 482475ac566..9fd1691d419 100644
--- a/tests/static/state_tests/stStaticCall/static_Call10Filler.json
+++ b/tests/static/state_tests/stStaticCall/static_Call10Filler.json
@@ -96,7 +96,7 @@
         		":raw 0x000000000000000000000000<contract:0xcbbf5374fce5edbc8e2a8697c15331677e6ebf0b>"
             ],
             "gasLimit" : [
-                "9214364837600034817"
+                "200000"
             ],
             "gasPrice" : "10",
             "nonce" : "",
diff --git a/tests/static/state_tests/stStaticCall/static_Call1MB1024CalldepthFiller.json b/tests/static/state_tests/stStaticCall/static_Call1MB1024CalldepthFiller.json
index bce1654401d..3931318a708 100644
--- a/tests/static/state_tests/stStaticCall/static_Call1MB1024CalldepthFiller.json
+++ b/tests/static/state_tests/stStaticCall/static_Call1MB1024CalldepthFiller.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
 				    "<contract:target:0x1000000000000000000000000000000000000000>" : {
 				        "storage" : {
@@ -36,7 +36,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
 				    "<contract:target:0x1000000000000000000000000000000000000000>" : {
 				        "storage" : {
diff --git a/tests/static/state_tests/stStaticCall/static_Call50000Filler.json b/tests/static/state_tests/stStaticCall/static_Call50000Filler.json
index 5fbe39bfa62..95cdcfc6a9f 100644
--- a/tests/static/state_tests/stStaticCall/static_Call50000Filler.json
+++ b/tests/static/state_tests/stStaticCall/static_Call50000Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "code" : "0x",
@@ -50,7 +50,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "nonce" : "0x01",
diff --git a/tests/static/state_tests/stStaticCall/static_Call50000_ecrecFiller.json b/tests/static/state_tests/stStaticCall/static_Call50000_ecrecFiller.json
index 31c035f23f0..caff75c3149 100644
--- a/tests/static/state_tests/stStaticCall/static_Call50000_ecrecFiller.json
+++ b/tests/static/state_tests/stStaticCall/static_Call50000_ecrecFiller.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "nonce" : "0x01",
@@ -41,7 +41,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "code" : "0x",
diff --git a/tests/static/state_tests/stStaticCall/static_Call50000_identity2Filler.json b/tests/static/state_tests/stStaticCall/static_Call50000_identity2Filler.json
index 0f5acae496d..6f25c93c65c 100644
--- a/tests/static/state_tests/stStaticCall/static_Call50000_identity2Filler.json
+++ b/tests/static/state_tests/stStaticCall/static_Call50000_identity2Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "code" : "0x",
@@ -43,7 +43,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "code" : "0x",
diff --git a/tests/static/state_tests/stStaticCall/static_Call50000_identityFiller.json b/tests/static/state_tests/stStaticCall/static_Call50000_identityFiller.json
index 4ccfca4f5c9..f80595618c3 100644
--- a/tests/static/state_tests/stStaticCall/static_Call50000_identityFiller.json
+++ b/tests/static/state_tests/stStaticCall/static_Call50000_identityFiller.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "code" : "0x",
@@ -41,7 +41,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "code" : "0x",
diff --git a/tests/static/state_tests/stStaticCall/static_Call50000_rip160Filler.json b/tests/static/state_tests/stStaticCall/static_Call50000_rip160Filler.json
index adc3ff05d97..8edff855839 100644
--- a/tests/static/state_tests/stStaticCall/static_Call50000_rip160Filler.json
+++ b/tests/static/state_tests/stStaticCall/static_Call50000_rip160Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "nonce" : "0x01",
diff --git a/tests/static/state_tests/stStaticCall/static_Call50000bytesContract50_1Filler.json b/tests/static/state_tests/stStaticCall/static_Call50000bytesContract50_1Filler.json
index 7a5c2abd442..a8652d6a013 100644
--- a/tests/static/state_tests/stStaticCall/static_Call50000bytesContract50_1Filler.json
+++ b/tests/static/state_tests/stStaticCall/static_Call50000bytesContract50_1Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "nonce" : "0x01",
@@ -48,7 +48,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "nonce" : "0x01",
diff --git a/tests/static/state_tests/stStaticCall/static_Call50000bytesContract50_2Filler.json b/tests/static/state_tests/stStaticCall/static_Call50000bytesContract50_2Filler.json
index ed14b9a2d52..762b7d46ab6 100644
--- a/tests/static/state_tests/stStaticCall/static_Call50000bytesContract50_2Filler.json
+++ b/tests/static/state_tests/stStaticCall/static_Call50000bytesContract50_2Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "nonce" : "0x01",
@@ -48,7 +48,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "nonce" : "0x01",
diff --git a/tests/static/state_tests/stStaticCall/static_Call50000bytesContract50_3Filler.json b/tests/static/state_tests/stStaticCall/static_Call50000bytesContract50_3Filler.json
index 665f8e7e960..4bb201f071c 100644
--- a/tests/static/state_tests/stStaticCall/static_Call50000bytesContract50_3Filler.json
+++ b/tests/static/state_tests/stStaticCall/static_Call50000bytesContract50_3Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "nonce" : "0x01",
@@ -47,7 +47,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
                         "nonce" : "0x01",
diff --git a/tests/static/state_tests/stStaticCall/static_CallContractToCreateContractOOGBonusGasFiller.json b/tests/static/state_tests/stStaticCall/static_CallContractToCreateContractOOGBonusGasFiller.json
index 93ad3f6dff1..04f02687b81 100644
--- a/tests/static/state_tests/stStaticCall/static_CallContractToCreateContractOOGBonusGasFiller.json
+++ b/tests/static/state_tests/stStaticCall/static_CallContractToCreateContractOOGBonusGasFiller.json
@@ -1,5 +1,8 @@
 {
     "static_CallContractToCreateContractOOGBonusGas" : {
+        "_info" : {
+            "comment": "Gas analysis showed this test's gas can go as low as 101174, and still yield the same traces, which implies the test is broken"
+        },
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
@@ -14,7 +17,7 @@
                     "gas" : 0,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "1",
@@ -41,7 +44,7 @@
                     "gas" : 1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "0",
diff --git a/tests/static/state_tests/stStaticCall/static_CallContractToCreateContractOOGFiller.json b/tests/static/state_tests/stStaticCall/static_CallContractToCreateContractOOGFiller.json
index 1235cb98135..68488cdb4ff 100644
--- a/tests/static/state_tests/stStaticCall/static_CallContractToCreateContractOOGFiller.json
+++ b/tests/static/state_tests/stStaticCall/static_CallContractToCreateContractOOGFiller.json
@@ -69,7 +69,7 @@
                 ""
             ],
             "gasLimit" : [
-                "20000000"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stStaticCall/static_CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json b/tests/static/state_tests/stStaticCall/static_CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json
index b0cad9d85ac..20b03a81063 100644
--- a/tests/static/state_tests/stStaticCall/static_CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json
+++ b/tests/static/state_tests/stStaticCall/static_CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json
@@ -61,7 +61,7 @@
                 ""
             ],
             "gasLimit" : [
-                "20000000"
+                "300000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stStaticCall/static_CallLoseGasOOGFiller.json b/tests/static/state_tests/stStaticCall/static_CallLoseGasOOGFiller.json
index 7e5b78ac079..086c7d5fdfd 100644
--- a/tests/static/state_tests/stStaticCall/static_CallLoseGasOOGFiller.json
+++ b/tests/static/state_tests/stStaticCall/static_CallLoseGasOOGFiller.json
@@ -49,7 +49,7 @@
                 ""
             ],
             "gasLimit" : [
-                "9214364837600034817"
+                "200000"
             ],
             "gasPrice" : "10",
             "nonce" : "",
diff --git a/tests/static/state_tests/stStaticCall/static_CallRecursiveBomb0Filler.json b/tests/static/state_tests/stStaticCall/static_CallRecursiveBomb0Filler.json
index 9d5372c676e..30d109d13b8 100644
--- a/tests/static/state_tests/stStaticCall/static_CallRecursiveBomb0Filler.json
+++ b/tests/static/state_tests/stStaticCall/static_CallRecursiveBomb0Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stStaticCall/static_CallRecursiveBomb0_OOG_atMaxCallDepthFiller.json b/tests/static/state_tests/stStaticCall/static_CallRecursiveBomb0_OOG_atMaxCallDepthFiller.json
index 74f0ab885c2..5f564c251b3 100644
--- a/tests/static/state_tests/stStaticCall/static_CallRecursiveBomb0_OOG_atMaxCallDepthFiller.json
+++ b/tests/static/state_tests/stStaticCall/static_CallRecursiveBomb0_OOG_atMaxCallDepthFiller.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x195e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stStaticCall/static_CallRecursiveBomb1Filler.json b/tests/static/state_tests/stStaticCall/static_CallRecursiveBomb1Filler.json
index 5f6480a363c..8ef3f6b8c3a 100644
--- a/tests/static/state_tests/stStaticCall/static_CallRecursiveBomb1Filler.json
+++ b/tests/static/state_tests/stStaticCall/static_CallRecursiveBomb1Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x195e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stStaticCall/static_CallRecursiveBomb2Filler.json b/tests/static/state_tests/stStaticCall/static_CallRecursiveBomb2Filler.json
index 0b7575e16ab..369b96327ee 100644
--- a/tests/static/state_tests/stStaticCall/static_CallRecursiveBomb2Filler.json
+++ b/tests/static/state_tests/stStaticCall/static_CallRecursiveBomb2Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x195e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stStaticCall/static_CallRecursiveBombLog2Filler.json b/tests/static/state_tests/stStaticCall/static_CallRecursiveBombLog2Filler.json
index c848b4dee5f..1214e9058e5 100644
--- a/tests/static/state_tests/stStaticCall/static_CallRecursiveBombLog2Filler.json
+++ b/tests/static/state_tests/stStaticCall/static_CallRecursiveBombLog2Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stStaticCall/static_CallRecursiveBombLogFiller.json b/tests/static/state_tests/stStaticCall/static_CallRecursiveBombLogFiller.json
index 9a400e7ae97..9dcae0002c9 100644
--- a/tests/static/state_tests/stStaticCall/static_CallRecursiveBombLogFiller.json
+++ b/tests/static/state_tests/stStaticCall/static_CallRecursiveBombLogFiller.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [ ">=Cancun"],
+                "network" : [ ">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stStaticCall/static_CallRecursiveBombPreCall2Filler.json b/tests/static/state_tests/stStaticCall/static_CallRecursiveBombPreCall2Filler.json
index 3619f2e2d43..fb693cd1dd1 100644
--- a/tests/static/state_tests/stStaticCall/static_CallRecursiveBombPreCall2Filler.json
+++ b/tests/static/state_tests/stStaticCall/static_CallRecursiveBombPreCall2Filler.json
@@ -10,7 +10,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stStaticCall/static_CallRecursiveBombPreCallFiller.json b/tests/static/state_tests/stStaticCall/static_CallRecursiveBombPreCallFiller.json
index a738bf6295d..f000d8b440e 100644
--- a/tests/static/state_tests/stStaticCall/static_CallRecursiveBombPreCallFiller.json
+++ b/tests/static/state_tests/stStaticCall/static_CallRecursiveBombPreCallFiller.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stStaticCall/static_LoopCallsDepthThenRevert2Filler.json b/tests/static/state_tests/stStaticCall/static_LoopCallsDepthThenRevert2Filler.json
index bcef24ba5a2..48b506420e1 100644
--- a/tests/static/state_tests/stStaticCall/static_LoopCallsDepthThenRevert2Filler.json
+++ b/tests/static/state_tests/stStaticCall/static_LoopCallsDepthThenRevert2Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                         "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                             "shouldnotexist" : "1"
diff --git a/tests/static/state_tests/stStaticCall/static_LoopCallsDepthThenRevert3Filler.json b/tests/static/state_tests/stStaticCall/static_LoopCallsDepthThenRevert3Filler.json
index 1da16315a7b..b236f8d0075 100644
--- a/tests/static/state_tests/stStaticCall/static_LoopCallsDepthThenRevert3Filler.json
+++ b/tests/static/state_tests/stStaticCall/static_LoopCallsDepthThenRevert3Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                         "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                             "shouldnotexist" : "1"
diff --git a/tests/static/state_tests/stStaticCall/static_Return50000_2Filler.json b/tests/static/state_tests/stStaticCall/static_Return50000_2Filler.json
index ab54186cc90..f2c178c800c 100644
--- a/tests/static/state_tests/stStaticCall/static_Return50000_2Filler.json
+++ b/tests/static/state_tests/stStaticCall/static_Return50000_2Filler.json
@@ -69,7 +69,7 @@
                 ""
             ],
             "gasLimit" : [
-                "88250000"
+                "15500000"
             ],
             "gasPrice" : "10",
             "nonce" : "",
diff --git a/tests/static/state_tests/stStaticCall/static_callcallcall_ABCB_RECURSIVEFiller.json b/tests/static/state_tests/stStaticCall/static_callcallcall_ABCB_RECURSIVEFiller.json
index ec6ef238a09..d7a7fce2d2a 100644
--- a/tests/static/state_tests/stStaticCall/static_callcallcall_ABCB_RECURSIVEFiller.json
+++ b/tests/static/state_tests/stStaticCall/static_callcallcall_ABCB_RECURSIVEFiller.json
@@ -68,7 +68,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stStaticCall/static_callcallcallcode_ABCB_RECURSIVE2Filler.json b/tests/static/state_tests/stStaticCall/static_callcallcallcode_ABCB_RECURSIVE2Filler.json
index 6981221a4e2..12e9cc40c54 100644
--- a/tests/static/state_tests/stStaticCall/static_callcallcallcode_ABCB_RECURSIVE2Filler.json
+++ b/tests/static/state_tests/stStaticCall/static_callcallcallcode_ABCB_RECURSIVE2Filler.json
@@ -68,7 +68,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stStaticCall/static_callcallcallcode_ABCB_RECURSIVEFiller.json b/tests/static/state_tests/stStaticCall/static_callcallcallcode_ABCB_RECURSIVEFiller.json
index 079810e9242..af2bd7d1b29 100644
--- a/tests/static/state_tests/stStaticCall/static_callcallcallcode_ABCB_RECURSIVEFiller.json
+++ b/tests/static/state_tests/stStaticCall/static_callcallcallcode_ABCB_RECURSIVEFiller.json
@@ -72,7 +72,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stStaticCall/static_callcallcodecall_ABCB_RECURSIVE2Filler.json b/tests/static/state_tests/stStaticCall/static_callcallcodecall_ABCB_RECURSIVE2Filler.json
index c64a73e3fd5..307b8b34a8f 100644
--- a/tests/static/state_tests/stStaticCall/static_callcallcodecall_ABCB_RECURSIVE2Filler.json
+++ b/tests/static/state_tests/stStaticCall/static_callcallcodecall_ABCB_RECURSIVE2Filler.json
@@ -68,7 +68,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stStaticCall/static_callcallcodecall_ABCB_RECURSIVEFiller.json b/tests/static/state_tests/stStaticCall/static_callcallcodecall_ABCB_RECURSIVEFiller.json
index 0bf58eef36f..480c2cab80f 100644
--- a/tests/static/state_tests/stStaticCall/static_callcallcodecall_ABCB_RECURSIVEFiller.json
+++ b/tests/static/state_tests/stStaticCall/static_callcallcodecall_ABCB_RECURSIVEFiller.json
@@ -72,7 +72,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stStaticCall/static_callcallcodecallcode_ABCB_RECURSIVE2Filler.json b/tests/static/state_tests/stStaticCall/static_callcallcodecallcode_ABCB_RECURSIVE2Filler.json
index 5d68dcd2ab1..de653a7e564 100644
--- a/tests/static/state_tests/stStaticCall/static_callcallcodecallcode_ABCB_RECURSIVE2Filler.json
+++ b/tests/static/state_tests/stStaticCall/static_callcallcodecallcode_ABCB_RECURSIVE2Filler.json
@@ -68,7 +68,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stStaticCall/static_callcallcodecallcode_ABCB_RECURSIVEFiller.json b/tests/static/state_tests/stStaticCall/static_callcallcodecallcode_ABCB_RECURSIVEFiller.json
index f94e55dc132..761f2c3e29a 100644
--- a/tests/static/state_tests/stStaticCall/static_callcallcodecallcode_ABCB_RECURSIVEFiller.json
+++ b/tests/static/state_tests/stStaticCall/static_callcallcodecallcode_ABCB_RECURSIVEFiller.json
@@ -72,7 +72,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stStaticCall/static_callcode_checkPCFiller.json b/tests/static/state_tests/stStaticCall/static_callcode_checkPCFiller.json
index 114e0768733..7947459dbd0 100644
--- a/tests/static/state_tests/stStaticCall/static_callcode_checkPCFiller.json
+++ b/tests/static/state_tests/stStaticCall/static_callcode_checkPCFiller.json
@@ -46,7 +46,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "1100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stStaticCall/static_callcodecallcall_ABCB_RECURSIVE2Filler.json b/tests/static/state_tests/stStaticCall/static_callcodecallcall_ABCB_RECURSIVE2Filler.json
index bfa1696173e..a68186f6b05 100644
--- a/tests/static/state_tests/stStaticCall/static_callcodecallcall_ABCB_RECURSIVE2Filler.json
+++ b/tests/static/state_tests/stStaticCall/static_callcodecallcall_ABCB_RECURSIVE2Filler.json
@@ -56,7 +56,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stStaticCall/static_callcodecallcall_ABCB_RECURSIVEFiller.json b/tests/static/state_tests/stStaticCall/static_callcodecallcall_ABCB_RECURSIVEFiller.json
index 71f066ab3d3..2adf5863fae 100644
--- a/tests/static/state_tests/stStaticCall/static_callcodecallcall_ABCB_RECURSIVEFiller.json
+++ b/tests/static/state_tests/stStaticCall/static_callcodecallcall_ABCB_RECURSIVEFiller.json
@@ -60,7 +60,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stStaticCall/static_callcodecallcallcode_ABCB_RECURSIVE2Filler.json b/tests/static/state_tests/stStaticCall/static_callcodecallcallcode_ABCB_RECURSIVE2Filler.json
index 6e5f29ac4d9..8ca29204c27 100644
--- a/tests/static/state_tests/stStaticCall/static_callcodecallcallcode_ABCB_RECURSIVE2Filler.json
+++ b/tests/static/state_tests/stStaticCall/static_callcodecallcallcode_ABCB_RECURSIVE2Filler.json
@@ -71,7 +71,7 @@
 		        ":raw 0x000000000000000000000000<contract:0x2000000000000000000000000000000000000001>"
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stStaticCall/static_callcodecallcallcode_ABCB_RECURSIVEFiller.json b/tests/static/state_tests/stStaticCall/static_callcodecallcallcode_ABCB_RECURSIVEFiller.json
index a3302bdbf2f..3fd5e567e58 100644
--- a/tests/static/state_tests/stStaticCall/static_callcodecallcallcode_ABCB_RECURSIVEFiller.json
+++ b/tests/static/state_tests/stStaticCall/static_callcodecallcallcode_ABCB_RECURSIVEFiller.json
@@ -60,7 +60,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stStaticCall/static_callcodecallcodecall_ABCB_RECURSIVE2Filler.json b/tests/static/state_tests/stStaticCall/static_callcodecallcodecall_ABCB_RECURSIVE2Filler.json
index b5a5c164208..62e7f85ad5f 100644
--- a/tests/static/state_tests/stStaticCall/static_callcodecallcodecall_ABCB_RECURSIVE2Filler.json
+++ b/tests/static/state_tests/stStaticCall/static_callcodecallcodecall_ABCB_RECURSIVE2Filler.json
@@ -56,7 +56,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stStaticCall/static_callcodecallcodecall_ABCB_RECURSIVEFiller.json b/tests/static/state_tests/stStaticCall/static_callcodecallcodecall_ABCB_RECURSIVEFiller.json
index 35b5aa6391d..fcd2599837d 100644
--- a/tests/static/state_tests/stStaticCall/static_callcodecallcodecall_ABCB_RECURSIVEFiller.json
+++ b/tests/static/state_tests/stStaticCall/static_callcodecallcodecall_ABCB_RECURSIVEFiller.json
@@ -60,7 +60,7 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "600000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",
diff --git a/tests/static/state_tests/stSystemOperationsTest/ABAcalls1Filler.json b/tests/static/state_tests/stSystemOperationsTest/ABAcalls1Filler.json
index 164d1d0d3fb..dcde920293c 100644
--- a/tests/static/state_tests/stSystemOperationsTest/ABAcalls1Filler.json
+++ b/tests/static/state_tests/stSystemOperationsTest/ABAcalls1Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Cancun"],
+                "network" : [">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stSystemOperationsTest/ABAcalls2Filler.json b/tests/static/state_tests/stSystemOperationsTest/ABAcalls2Filler.json
index 33074737192..8300f3b8db1 100644
--- a/tests/static/state_tests/stSystemOperationsTest/ABAcalls2Filler.json
+++ b/tests/static/state_tests/stSystemOperationsTest/ABAcalls2Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [  ">=Cancun"],
+                "network" : [  ">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stSystemOperationsTest/Call10Filler.json b/tests/static/state_tests/stSystemOperationsTest/Call10Filler.json
index f54008ba3b2..0d82753197f 100644
--- a/tests/static/state_tests/stSystemOperationsTest/Call10Filler.json
+++ b/tests/static/state_tests/stSystemOperationsTest/Call10Filler.json
@@ -53,7 +53,7 @@
                 ""
             ],
             "gasLimit" : [
-                "0x7f000ffffffffff0"
+                "0x30d40"
             ],
             "gasPrice" : "10",
             "nonce" : "",
diff --git a/tests/static/state_tests/stSystemOperationsTest/CallRecursiveBomb0Filler.json b/tests/static/state_tests/stSystemOperationsTest/CallRecursiveBomb0Filler.json
index 4b6dd491dfc..cc2ec202910 100644
--- a/tests/static/state_tests/stSystemOperationsTest/CallRecursiveBomb0Filler.json
+++ b/tests/static/state_tests/stSystemOperationsTest/CallRecursiveBomb0Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [  ">=Cancun"],
+                "network" : [  ">=Cancun<Osaka"],
                 "result" : {
                     "<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stSystemOperationsTest/CallRecursiveBomb0_OOG_atMaxCallDepthFiller.json b/tests/static/state_tests/stSystemOperationsTest/CallRecursiveBomb0_OOG_atMaxCallDepthFiller.json
index 93ce2f5f6ca..f890d040c8c 100644
--- a/tests/static/state_tests/stSystemOperationsTest/CallRecursiveBomb0_OOG_atMaxCallDepthFiller.json
+++ b/tests/static/state_tests/stSystemOperationsTest/CallRecursiveBomb0_OOG_atMaxCallDepthFiller.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [  ">=Cancun"],
+                "network" : [  ">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stSystemOperationsTest/CallRecursiveBomb1Filler.json b/tests/static/state_tests/stSystemOperationsTest/CallRecursiveBomb1Filler.json
index e2b5f9064da..17646e544a3 100644
--- a/tests/static/state_tests/stSystemOperationsTest/CallRecursiveBomb1Filler.json
+++ b/tests/static/state_tests/stSystemOperationsTest/CallRecursiveBomb1Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [  ">=Cancun"],
+                "network" : [  ">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stSystemOperationsTest/CallRecursiveBomb2Filler.json b/tests/static/state_tests/stSystemOperationsTest/CallRecursiveBomb2Filler.json
index d2416556b9e..874738c3ec0 100644
--- a/tests/static/state_tests/stSystemOperationsTest/CallRecursiveBomb2Filler.json
+++ b/tests/static/state_tests/stSystemOperationsTest/CallRecursiveBomb2Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [  ">=Cancun"],
+                "network" : [  ">=Cancun<Osaka"],
                 "result" : {
                     "<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stSystemOperationsTest/CallRecursiveBombLog2Filler.json b/tests/static/state_tests/stSystemOperationsTest/CallRecursiveBombLog2Filler.json
index a0bfb6a3a14..2473ed1d061 100644
--- a/tests/static/state_tests/stSystemOperationsTest/CallRecursiveBombLog2Filler.json
+++ b/tests/static/state_tests/stSystemOperationsTest/CallRecursiveBombLog2Filler.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [  ">=Cancun"],
+                "network" : [  ">=Cancun<Osaka"],
                 "result" : {
                     "<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stSystemOperationsTest/CallRecursiveBombLogFiller.json b/tests/static/state_tests/stSystemOperationsTest/CallRecursiveBombLogFiller.json
index ca5bdae1b38..41832c31132 100644
--- a/tests/static/state_tests/stSystemOperationsTest/CallRecursiveBombLogFiller.json
+++ b/tests/static/state_tests/stSystemOperationsTest/CallRecursiveBombLogFiller.json
@@ -14,7 +14,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [  ">=Cancun"],
+                "network" : [  ">=Cancun<Osaka"],
                 "result" : {
                     "<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>" : {
                         "storage" : {
diff --git a/tests/static/state_tests/stSystemOperationsTest/extcodecopyFiller.json b/tests/static/state_tests/stSystemOperationsTest/extcodecopyFiller.json
index 690e1950fe4..2b6adc37b0b 100644
--- a/tests/static/state_tests/stSystemOperationsTest/extcodecopyFiller.json
+++ b/tests/static/state_tests/stSystemOperationsTest/extcodecopyFiller.json
@@ -65,7 +65,7 @@
                 ":raw 0x6e27b0577f2549e5fa01e3db96e7b03a62e489115538620295677faf15040c1c1796bad130e2462a8b8d6bbe0fa35bf12087047ef4ff4e66df8772196b4401998ff7f4219c013a0d927b22d8d3fdf625809abb182507d180e687b666f4f1e4f3b8172e87760f436c701264b89739f3d7c50ec524f16b1a4f91397b760a5209b9b7710544694ecf2729643b3ca545c7"
             ],
             "gasLimit" : [
-                "0x3bd760dd"
+                "0x186a0"
             ],
             "gasPrice" : "0x1cd49878",
             "nonce" : "0x00",
diff --git a/tests/static/state_tests/stTransactionTest/HighGasLimitFiller.json b/tests/static/state_tests/stTransactionTest/HighGasLimitFiller.json
index c141a237cd5..70eb7496d3d 100644
--- a/tests/static/state_tests/stTransactionTest/HighGasLimitFiller.json
+++ b/tests/static/state_tests/stTransactionTest/HighGasLimitFiller.json
@@ -39,7 +39,7 @@
                 ":raw 0x3240349548983454"
             ],
             "gasLimit" : [
-                "1152921504606846976"
+                "100000"
             ],
             "gasPrice" : "10",
             "nonce" : "0",