diff --git a/substreams/ethereum-curve/test_assets.yaml b/substreams/ethereum-curve/test_assets.yaml
index bb69fa7..6a9088d 100644
--- a/substreams/ethereum-curve/test_assets.yaml
+++ b/substreams/ethereum-curve/test_assets.yaml
@@ -6,7 +6,7 @@ protocol_type_names:
 tests:
   - name: test_3pool_creation
     start_block: 10809470
-    stop_block: 10809480
+    stop_block: 10810226
     expected_state:
       protocol_components:
         - id: "0xbebc44782c7db0a1a60cb6fe97d0b483032ff1c7"
@@ -18,18 +18,18 @@ tests:
           creation_tx: "0x20793bbf260912aae189d5d261ff003c9b9166da8191d8f9d63ff1c7722f3ac6"
   - name: test_steth_creation
     start_block: 11592550
-    stop_block: 11592553
+    stop_block: 11595553
     expected_state:
       protocol_components:
         - id: "0xdc24316b9ae028f1497c275eb9192a3ea0f67022"
           tokens:
-            - "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE"
+            - "0x0000000000000000000000000000000000000000"
             - "0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84"
           static_attributes:
           creation_tx: "0xfac67ecbd423a5b915deff06045ec9343568edaec34ae95c43d35f2c018afdaa"
   - name: test_crypto_swap_ng_factory_plain_pool_creation
     start_block: 19355220
-    stop_block: 19355225
+    stop_block: 19356225
     expected_state:
       protocol_components:
         - id: "0xeeda34a377dd0ca676b9511ee1324974fa8d980d"
@@ -40,7 +40,7 @@ tests:
           creation_tx: "0x0e2bad5695d4ff8ebbaf668674a24bdcc4843da44933d947f2a454fd731da3c1"
   - name: test_crypto_swap_ng_factory_meta_pool_creation
     start_block: 19216042
-    stop_block: 19216045
+    stop_block: 19217045
     expected_state:
       protocol_components:
         - id: "0xef484de8C07B6e2d732A92B5F78e81B38f99f95E"
@@ -51,7 +51,7 @@ tests:
           creation_tx: "0x3cfeecae1b43086ee5705f89b803e21eb0492d7d5db06c229586db8fc72f5665"
   - name: test_metapool_factory_metapool_creation
     start_block: 18028600
-    stop_block: 18028610
+    stop_block: 18029610
     expected_state:
       protocol_components:
         - id: "0x61fA2c947e523F9ABfb8d7e2903A5D5218C119a7"
@@ -59,10 +59,10 @@ tests:
             - "0x6c3ea9036406852006290770BEdFcAbA0e23A0e8"
             - "0x3175Df0976dFA876431C2E9eE6Bc45b65d3473CC"
           static_attributes:
-          creation_tx: "0x78454fd29fad021842288092aaeee5eff9ab877e006ac372d084e5e95ca2bd2c"
+          creation_tx: "0xc9c6b879cbb19f7f26405335c3879c350592d530956878ff172e9efad786c63f"
   - name: test_metapool_factory_plainpool_creation
     start_block: 18808555
-    stop_block: 18808577
+    stop_block: 18818577
     expected_state:
       protocol_components:
         - id: "0xf2DCf6336D8250754B4527f57b275b19c8D5CF88"
@@ -79,7 +79,7 @@ tests:
           creation_tx: "0x455559b43afaf429c15c1d807fd7f5dd47be30f6411a854499f719b944f4c024"
   - name: test_cryptopool_factory_creation
     start_block: 19162590
-    stop_block: 19162633
+    stop_block: 19163633
     expected_state:
       protocol_components:
         - id: "0x71db3764d6841d8b01dc27c0fd4a66a8a34b2be0"
@@ -96,13 +96,13 @@ tests:
           creation_tx: "0xa5b13d50c56242f7994b8e1339032bb4c6f9ac3af3054d4eae3ce9e32e3c1a50"
   - name: test_tricrypto_factory_creation
     start_block: 17371455
-    stop_block: 17371457
+    stop_block: 17374457
     expected_state:
       protocol_components:
         - id: "0x7F86Bf177Dd4F3494b841a37e810A34dD56c829B"
           tokens:
             - "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"
             - "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599"
-            - "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2" #TODO: NEEDS TO BE NATIVE
+            - "0x0000000000000000000000000000000000000000"
           static_attributes:
           creation_tx: "0x2bd59c19f993b83729fb23498f897a58567c6f0b3ee2f00613ba515a7b19fe23"