diff --git a/src/ethereum_test_types/tests/test_types.py b/src/ethereum_test_types/tests/test_types.py
index 770ee6c42c..224e3dfa98 100644
--- a/src/ethereum_test_types/tests/test_types.py
+++ b/src/ethereum_test_types/tests/test_types.py
@@ -454,9 +454,9 @@ def test_account_merge(
             Environment(),
             {
                 "currentCoinbase": "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                "currentGasLimit": "100000000000000000",
-                "currentNumber": "1",
-                "currentTimestamp": "1000",
+                "currentGasLimit": "0x16345785d8a0000",
+                "currentNumber": "0x1",
+                "currentTimestamp": "0x3e8",
                 "blockHashes": {},
                 "ommers": [],
                 "parentUncleHash": (
@@ -487,17 +487,17 @@ def test_account_merge(
             ),
             {
                 "currentCoinbase": "0x0000000000000000000000000000000000001234",
-                "currentGasLimit": "100000000000000000",
-                "currentNumber": "1",
-                "currentTimestamp": "1000",
-                "currentDifficulty": "5",
-                "currentRandom": "6",
-                "currentBaseFee": "7",
-                "parentDifficulty": "8",
-                "parentTimestamp": "9",
-                "parentBaseFee": "10",
-                "parentGasUsed": "11",
-                "parentGasLimit": "12",
+                "currentGasLimit": "0x16345785d8a0000",
+                "currentNumber": "0x1",
+                "currentTimestamp": "0x3e8",
+                "currentDifficulty": "0x5",
+                "currentRandom": "0x6",
+                "currentBaseFee": "0x7",
+                "parentDifficulty": "0x8",
+                "parentTimestamp": "0x9",
+                "parentBaseFee": "0xa",
+                "parentGasUsed": "0xb",
+                "parentGasLimit": "0xc",
                 "parentUncleHash": (
                     "0x000000000000000000000000000000000000000000000000000000000000000d"
                 ),
@@ -509,13 +509,13 @@ def test_account_merge(
                         "amount": "0x2",
                     },
                 ],
-                "parentBlobGasUsed": "14",
-                "parentExcessBlobGas": "15",
-                "currentBlobGasUsed": "16",
-                "currentExcessBlobGas": "17",
+                "parentBlobGasUsed": "0xe",
+                "parentExcessBlobGas": "0xf",
+                "currentBlobGasUsed": "0x10",
+                "currentExcessBlobGas": "0x11",
                 "blockHashes": {
-                    "1": "0x0000000000000000000000000000000000000000000000000000000000000002",
-                    "3": "0x0000000000000000000000000000000000000000000000000000000000000004",
+                    "0x1": "0x0000000000000000000000000000000000000000000000000000000000000002",
+                    "0x3": "0x0000000000000000000000000000000000000000000000000000000000000004",
                 },
                 "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000004",
                 "ommers": [],
diff --git a/src/ethereum_test_types/types.py b/src/ethereum_test_types/types.py
index b163af4f48..9a02f61e97 100644
--- a/src/ethereum_test_types/types.py
+++ b/src/ethereum_test_types/types.py
@@ -408,13 +408,13 @@ class Environment(EnvironmentGeneric[HexNumber]):
     must be executed.
     """
 
-    blob_gas_used: Number | None = Field(None, alias="currentBlobGasUsed")
+    blob_gas_used: HexNumber | None = Field(None, alias="currentBlobGasUsed")
     parent_ommers_hash: Hash = Field(Hash(EmptyOmmersRoot), alias="parentUncleHash")
-    parent_blob_gas_used: Number | None = Field(None)
-    parent_excess_blob_gas: Number | None = Field(None)
+    parent_blob_gas_used: HexNumber | None = Field(None)
+    parent_excess_blob_gas: HexNumber | None = Field(None)
     parent_beacon_block_root: Hash | None = Field(None)
 
-    block_hashes: Dict[Number, Hash] = Field(default_factory=dict)
+    block_hashes: Dict[HexNumber, Hash] = Field(default_factory=dict)
     ommers: List[Hash] = Field(default_factory=list)
     withdrawals: List[Withdrawal] | None = Field(None)
     extra_data: Bytes = Field(Bytes(b"\x00"), exclude=True)