chore(tests): 8037 rebase test fixes

Author: spencer-tb

tests/constantinople/eip1052_extcodehash/test_extcodehash.py

@@ -1617,7 +1617,7 @@ def extcode_checks(target: Address | Bytecode) -> Bytecode:
     tx = Transaction(
         sender=pre.fund_eoa(),
         to=code_address,
-        gas_limit=500_000,
+        gas_limit=1_000_000,
     )
 
     # Pre-Cancun, CALLCODE/DELEGATECALL executes SELFDESTRUCT in A's

tests/osaka/eip7825_transaction_gas_limit_cap/test_tx_gas_limit.py

@@ -12,6 +12,7 @@
 from typing import Callable, List
 
 import pytest
+from execution_testing.forks import Osaka
 from execution_testing import (
     AccessList,
     Account,
@@ -391,7 +392,9 @@ def test_tx_gas_limit_cap_full_calldata(
         data=byte_data * num_of_bytes,
         gas_limit=tx_gas_limit,
         sender=pre.fund_eoa(),
-        error=TransactionException.GAS_LIMIT_EXCEEDS_MAXIMUM
+        error=TransactionException.INTRINSIC_GAS_BELOW_FLOOR_GAS_COST
+        if exceed_tx_gas_limit and fork > Osaka
+        else TransactionException.GAS_LIMIT_EXCEEDS_MAXIMUM
         if correct_intrinsic_cost_in_transaction_gas_limit
         and exceed_tx_gas_limit
         else TransactionException.INTRINSIC_GAS_BELOW_FLOOR_GAS_COST