diff --git a/tests/mainnet/pectra/models/canonical_execution_block.yaml b/tests/mainnet/pectra/models/canonical_execution_block.yaml
index 27d2f0a0..c37d9287 100644
--- a/tests/mainnet/pectra/models/canonical_execution_block.yaml
+++ b/tests/mainnet/pectra/models/canonical_execution_block.yaml
@@ -3,14 +3,32 @@ network: mainnet
 spec: pectra
 external_data:
     canonical_execution_block:
-        url: https://data.ethpandaops.io/xatu-cbt/pectra/canonical_execution_block.parquet
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_block.parquet
         network_column: meta_network_name
 assertions:
-    - name: total count
+    - name: total count and bounds
       sql: |
         SELECT
-          COUNT(*) AS count
+          COUNT(*) AS count,
+          MIN(block_number) AS min_block,
+          MAX(block_number) AS max_block
         FROM
           cluster('{remote_cluster}', default.canonical_execution_block) FINAL
       expected:
-        count: 20
+        count: 42
+        min_block: "49018"
+        max_block: "6372586"
+    - name: Case 1 block exists (simple expiry-reactivation)
+      sql: |
+        SELECT COUNT(*) AS count
+        FROM cluster('{remote_cluster}', default.canonical_execution_block) FINAL
+        WHERE block_number = 63809
+      expected:
+        count: 1
+    - name: Case 12 genesis-era block exists
+      sql: |
+        SELECT COUNT(*) AS count
+        FROM cluster('{remote_cluster}', default.canonical_execution_block) FINAL
+        WHERE block_number = 49018
+      expected:
+        count: 1
diff --git a/tests/mainnet/pectra/models/canonical_execution_storage_diffs.yaml b/tests/mainnet/pectra/models/canonical_execution_storage_diffs.yaml
index e1f76f88..d926459d 100644
--- a/tests/mainnet/pectra/models/canonical_execution_storage_diffs.yaml
+++ b/tests/mainnet/pectra/models/canonical_execution_storage_diffs.yaml
@@ -3,14 +3,52 @@ network: mainnet
 spec: pectra
 external_data:
     canonical_execution_storage_diffs:
-        url: https://data.ethpandaops.io/xatu-cbt/pectra/canonical_execution_storage_diffs.parquet
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_diffs.parquet
         network_column: meta_network_name
 assertions:
-    - name: total count
+    - name: total count and bounds
       sql: |
         SELECT
-          COUNT(*) AS count
+          COUNT(*) AS count,
+          MIN(block_number) AS min_block,
+          MAX(block_number) AS max_block,
+          uniq(address) AS unique_addresses
         FROM
           cluster('{remote_cluster}', default.canonical_execution_storage_diffs) FINAL
       expected:
-        count: 12011
+        count: 38
+        min_block: "49018"
+        max_block: "5178368"
+        unique_addresses: "10"
+    - name: Case 1 diffs exist (simple expiry-reactivation)
+      sql: |
+        SELECT COUNT(*) AS count
+        FROM cluster('{remote_cluster}', default.canonical_execution_storage_diffs) FINAL
+        WHERE address = '0x793ae8c1b1a160bfc07bfb0d04f85eab1a71f4f2'
+          AND slot = '0x0000000000000000000000000000000000000000000000000000000000000000'
+      expected:
+        count: 2
+    - name: Case 2 diffs exist (cleared and recreated)
+      sql: |
+        SELECT COUNT(*) AS count
+        FROM cluster('{remote_cluster}', default.canonical_execution_storage_diffs) FINAL
+        WHERE address = '0x888666ca69e0f178ded6d75b5726cee99a87d698'
+          AND slot = '0xf5fa518bd9ef45a19f0eb529e4a900e5af17852b097fc69f632ec0d4fb198e4a'
+      expected:
+        count: 8
+    - name: Case 10 full 32-byte slot diff exists
+      sql: |
+        SELECT COUNT(*) AS count
+        FROM cluster('{remote_cluster}', default.canonical_execution_storage_diffs) FINAL
+        WHERE address = '0x4eea5019ef91a8c8bfa80a1eea04bdda526316c4'
+          AND slot = '0x0000000000000000000000000000000000000000000000000000000000000000'
+      expected:
+        count: 2
+    - name: Case 12 genesis-era diffs exist
+      sql: |
+        SELECT COUNT(*) AS count
+        FROM cluster('{remote_cluster}', default.canonical_execution_storage_diffs) FINAL
+        WHERE address = '0x630ea66c8c5dc205d45a978573fa86df5af1fe7a'
+          AND block_number = 49018
+      expected:
+        count: 6
diff --git a/tests/mainnet/pectra/models/canonical_execution_storage_reads.yaml b/tests/mainnet/pectra/models/canonical_execution_storage_reads.yaml
index 2c21a051..5842d6d6 100644
--- a/tests/mainnet/pectra/models/canonical_execution_storage_reads.yaml
+++ b/tests/mainnet/pectra/models/canonical_execution_storage_reads.yaml
@@ -3,14 +3,45 @@ network: mainnet
 spec: pectra
 external_data:
     canonical_execution_storage_reads:
-        url: https://data.ethpandaops.io/xatu-cbt/pectra/canonical_execution_storage_reads.parquet
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_reads.parquet
         network_column: meta_network_name
 assertions:
-    - name: total count
+    - name: total count and bounds
       sql: |
         SELECT
-          COUNT(*) AS count
+          COUNT(*) AS count,
+          MIN(block_number) AS min_block,
+          MAX(block_number) AS max_block,
+          uniq(contract_address) AS unique_addresses
         FROM
           cluster('{remote_cluster}', default.canonical_execution_storage_reads) FINAL
       expected:
-        count: 35145
+        count: 44
+        min_block: "49018"
+        max_block: "6372586"
+        unique_addresses: "10"
+    - name: Case 1 reads exist (simple expiry-reactivation)
+      sql: |
+        SELECT COUNT(*) AS count
+        FROM cluster('{remote_cluster}', default.canonical_execution_storage_reads) FINAL
+        WHERE contract_address = '0x793ae8c1b1a160bfc07bfb0d04f85eab1a71f4f2'
+          AND slot = '0x0000000000000000000000000000000000000000000000000000000000000000'
+      expected:
+        count: 5
+    - name: Case 6 reactivation read exists (longest expiry ~2.5 years)
+      sql: |
+        SELECT COUNT(*) AS count
+        FROM cluster('{remote_cluster}', default.canonical_execution_storage_reads) FINAL
+        WHERE contract_address = '0x329219be8810602a59b76df9ed7d52dc3afc3e8b'
+          AND slot = '0x0000000000000000000000000000000000000000000000000000000000000000'
+          AND block_number = 6365361
+      expected:
+        count: 1
+    - name: Case 11 reads exist (complete 3-cycle)
+      sql: |
+        SELECT COUNT(*) AS count
+        FROM cluster('{remote_cluster}', default.canonical_execution_storage_reads) FINAL
+        WHERE contract_address = '0xdbf03b407c01e7cd3cbea99509d93f8dddc8c6fb'
+          AND slot = '0x0000000000000000000000000000000000000000000000000000000000000002'
+      expected:
+        count: 12
diff --git a/tests/mainnet/pectra/models/int_address_storage_slot_first_access.yaml b/tests/mainnet/pectra/models/int_address_storage_slot_first_access.yaml
index 2e0907ac..d00d5cac 100644
--- a/tests/mainnet/pectra/models/int_address_storage_slot_first_access.yaml
+++ b/tests/mainnet/pectra/models/int_address_storage_slot_first_access.yaml
@@ -3,24 +3,24 @@ network: mainnet
 spec: pectra
 external_data:
     canonical_execution_storage_diffs:
-        url: https://data.ethpandaops.io/xatu-cbt/pectra/canonical_execution_storage_diffs.parquet
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_diffs.parquet
         network_column: meta_network_name
     canonical_execution_storage_reads:
-        url: https://data.ethpandaops.io/xatu-cbt/pectra/canonical_execution_storage_reads.parquet
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_reads.parquet
         network_column: meta_network_name
 assertions:
     - name: Expected bounds and size
       sql: |
         SELECT
           COUNT(*) AS count,
-          MIN(block_number) AS min,
-          MAX(block_number) AS max
+          MIN(block_number) AS min_block,
+          MAX(block_number) AS max_block
         FROM
           int_address_storage_slot_first_access FINAL
       expected:
-        count: 16746
-        max: "22923437"
-        min: "22923418"
+        count: 17
+        min_block: "49018"
+        max_block: "6372586"
     - name: Expected admin bounds
       sql: |
         SELECT
@@ -31,5 +31,21 @@ assertions:
         WHERE
           table = 'int_address_storage_slot_first_access'
       expected:
-        max: "22923437"
-        min: "22923418"
+        max: "6372586"
+        min: "49018"
+    - name: Case 1 first access is at block 63809
+      sql: |
+        SELECT block_number
+        FROM int_address_storage_slot_first_access FINAL
+        WHERE address = '0x793ae8c1b1a160bfc07bfb0d04f85eab1a71f4f2'
+          AND slot_key = '0x0000000000000000000000000000000000000000000000000000000000000000'
+      expected:
+        block_number: "63809"
+    - name: Case 12 genesis-era first access at block 49018
+      sql: |
+        SELECT COUNT(*) AS count
+        FROM int_address_storage_slot_first_access FINAL
+        WHERE address = '0x630ea66c8c5dc205d45a978573fa86df5af1fe7a'
+          AND block_number = 49018
+      expected:
+        count: 3
diff --git a/tests/mainnet/pectra/models/int_address_storage_slot_last_access.yaml b/tests/mainnet/pectra/models/int_address_storage_slot_last_access.yaml
index d5981c10..d6bd3f34 100644
--- a/tests/mainnet/pectra/models/int_address_storage_slot_last_access.yaml
+++ b/tests/mainnet/pectra/models/int_address_storage_slot_last_access.yaml
@@ -3,24 +3,24 @@ network: mainnet
 spec: pectra
 external_data:
     canonical_execution_storage_diffs:
-        url: https://data.ethpandaops.io/xatu-cbt/pectra/canonical_execution_storage_diffs.parquet
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_diffs.parquet
         network_column: meta_network_name
     canonical_execution_storage_reads:
-        url: https://data.ethpandaops.io/xatu-cbt/pectra/canonical_execution_storage_reads.parquet
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_reads.parquet
         network_column: meta_network_name
 assertions:
     - name: Expected bounds and size
       sql: |
         SELECT
           COUNT(*) AS count,
-          MIN(block_number) AS min,
-          MAX(block_number) AS max
+          MIN(block_number) AS min_block,
+          MAX(block_number) AS max_block
         FROM
           int_address_storage_slot_last_access FINAL
       expected:
-        count: 16746
-        max: "22923437"
-        min: "22923418"
+        count: 17
+        min_block: "49018"
+        max_block: "6372586"
     - name: Expected admin bounds
       sql: |
         SELECT
@@ -31,5 +31,21 @@ assertions:
         WHERE
           table = 'int_address_storage_slot_last_access'
       expected:
-        max: "22923437"
-        min: "22923418"
+        max: "6372586"
+        min: "49018"
+    - name: Case 1 last access is at block 2143395
+      sql: |
+        SELECT block_number
+        FROM int_address_storage_slot_last_access FINAL
+        WHERE address = '0x793ae8c1b1a160bfc07bfb0d04f85eab1a71f4f2'
+          AND slot_key = '0x0000000000000000000000000000000000000000000000000000000000000000'
+      expected:
+        block_number: "2143395"
+    - name: Case 11 last access is at block 6372586 (3rd reactivation)
+      sql: |
+        SELECT block_number
+        FROM int_address_storage_slot_last_access FINAL
+        WHERE address = '0xdbf03b407c01e7cd3cbea99509d93f8dddc8c6fb'
+          AND slot_key = '0x0000000000000000000000000000000000000000000000000000000000000002'
+      expected:
+        block_number: "6372586"
diff --git a/tests/mainnet/pectra/models/int_execution_block_by_date.yaml b/tests/mainnet/pectra/models/int_execution_block_by_date.yaml
index 7d539e9d..5fab985a 100644
--- a/tests/mainnet/pectra/models/int_execution_block_by_date.yaml
+++ b/tests/mainnet/pectra/models/int_execution_block_by_date.yaml
@@ -3,17 +3,21 @@ network: mainnet
 spec: pectra
 external_data:
     canonical_execution_block:
-        url: https://data.ethpandaops.io/xatu-cbt/pectra/canonical_execution_block.parquet
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_block.parquet
         network_column: meta_network_name
 assertions:
-    - name: Expected size
+    - name: Expected bounds and size
       sql: |
         SELECT
-          COUNT(*) AS count
+          COUNT(*) AS count,
+          MIN(block_number) AS min_block,
+          MAX(block_number) AS max_block
         FROM
           int_execution_block_by_date FINAL
       expected:
-        count: 20
+        count: 42
+        min_block: "49018"
+        max_block: "6372586"
     - name: Expected admin bounds
       sql: |
         SELECT
@@ -24,5 +28,15 @@ assertions:
         WHERE
           table = 'int_execution_block_by_date'
       expected:
-        max: "22923437"
-        min: "22923418"
+        max: "6372586"
+        min: "49018"
+    - name: Case 12 genesis-era block timestamp exists
+      sql: |
+        SELECT
+          block_number,
+          toDate(block_date_time) AS block_date
+        FROM int_execution_block_by_date FINAL
+        WHERE block_number = 49018
+      expected:
+        block_number: "49018"
+        block_date: "2015-08-07"
diff --git a/tests/mainnet/pectra/models/int_storage_slot_diff.yaml b/tests/mainnet/pectra/models/int_storage_slot_diff.yaml
new file mode 100644
index 00000000..5f37c34e
--- /dev/null
+++ b/tests/mainnet/pectra/models/int_storage_slot_diff.yaml
@@ -0,0 +1,60 @@
+model: int_storage_slot_diff
+network: mainnet
+spec: pectra
+external_data:
+    canonical_execution_storage_diffs:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_diffs.parquet
+        network_column: meta_network_name
+assertions:
+    - name: Expected bounds and size
+      sql: |
+        SELECT
+          COUNT(*) AS count,
+          MIN(block_number) AS min_block,
+          MAX(block_number) AS max_block
+        FROM
+          int_storage_slot_diff FINAL
+      expected:
+        count: 19
+        min_block: "49018"
+        max_block: "5178368"
+    - name: Expected admin bounds
+      sql: |
+        SELECT
+          MAX(position + interval) AS max,
+          MIN(position) AS min
+        FROM
+          admin_cbt_incremental FINAL
+        WHERE
+          table = 'int_storage_slot_diff'
+      expected:
+        max: "5178368"
+        min: "49018"
+    - name: Case 1 diff exists with correct effective_bytes (7 bytes)
+      sql: |
+        SELECT
+          COUNT(*) AS count,
+          MIN(effective_bytes_to) AS effective_bytes
+        FROM int_storage_slot_diff FINAL
+        WHERE address = '0x793ae8c1b1a160bfc07bfb0d04f85eab1a71f4f2'
+          AND slot_key = '0x0000000000000000000000000000000000000000000000000000000000000000'
+      expected:
+        count: 1
+        effective_bytes: "7"
+    - name: Case 10 full 32-byte slot exists
+      sql: |
+        SELECT effective_bytes_to AS effective_bytes
+        FROM int_storage_slot_diff FINAL
+        WHERE address = '0x4eea5019ef91a8c8bfa80a1eea04bdda526316c4'
+          AND slot_key = '0x0000000000000000000000000000000000000000000000000000000000000000'
+          AND block_number = 3873480
+      expected:
+        effective_bytes: "32"
+    - name: Case 12 genesis-era slots exist (3 slots)
+      sql: |
+        SELECT COUNT(*) AS count
+        FROM int_storage_slot_diff FINAL
+        WHERE address = '0x630ea66c8c5dc205d45a978573fa86df5af1fe7a'
+          AND block_number = 49018
+      expected:
+        count: 3
diff --git a/tests/mainnet/pectra/models/int_storage_slot_diff_by_address_slot.yaml b/tests/mainnet/pectra/models/int_storage_slot_diff_by_address_slot.yaml
new file mode 100644
index 00000000..995cde83
--- /dev/null
+++ b/tests/mainnet/pectra/models/int_storage_slot_diff_by_address_slot.yaml
@@ -0,0 +1,44 @@
+model: int_storage_slot_diff_by_address_slot
+network: mainnet
+spec: pectra
+external_data:
+    canonical_execution_storage_diffs:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_diffs.parquet
+        network_column: meta_network_name
+assertions:
+    - name: Expected bounds and size
+      sql: |
+        SELECT
+          COUNT(*) AS count,
+          MIN(block_number) AS min_block,
+          MAX(block_number) AS max_block
+        FROM
+          int_storage_slot_diff_by_address_slot FINAL
+      expected:
+        count: 19
+        min_block: "49018"
+        max_block: "5178368"
+    - name: Expected admin bounds
+      sql: |
+        SELECT
+          MAX(position + interval) AS max,
+          MIN(position) AS min
+        FROM
+          admin_cbt_incremental FINAL
+        WHERE
+          table = 'int_storage_slot_diff_by_address_slot'
+      expected:
+        max: "5178368"
+        min: "49018"
+    - name: Data matches int_storage_slot_diff
+      sql: |
+        SELECT COUNT(*) AS count
+        FROM int_storage_slot_diff_by_address_slot FINAL a
+        INNER JOIN int_storage_slot_diff FINAL b
+          ON a.block_number = b.block_number
+          AND a.address = b.address
+          AND a.slot_key = b.slot_key
+          AND a.effective_bytes_from = b.effective_bytes_from
+          AND a.effective_bytes_to = b.effective_bytes_to
+      expected:
+        count: 19
diff --git a/tests/mainnet/pectra/models/int_storage_slot_expiry_12m.yaml b/tests/mainnet/pectra/models/int_storage_slot_expiry_12m.yaml
new file mode 100644
index 00000000..7d5b5c0f
--- /dev/null
+++ b/tests/mainnet/pectra/models/int_storage_slot_expiry_12m.yaml
@@ -0,0 +1,24 @@
+model: int_storage_slot_expiry_12m
+network: mainnet
+spec: pectra
+external_data:
+    canonical_execution_block:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_block.parquet
+        network_column: meta_network_name
+    canonical_execution_storage_diffs:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_diffs.parquet
+        network_column: meta_network_name
+    canonical_execution_storage_reads:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_reads.parquet
+        network_column: meta_network_name
+assertions:
+    - name: Expected admin bounds exist
+      sql: |
+        SELECT
+          COUNT(*) AS count
+        FROM
+          admin_cbt_incremental FINAL
+        WHERE
+          table = 'int_storage_slot_expiry_12m'
+      expected:
+        count: 1
diff --git a/tests/mainnet/pectra/models/int_storage_slot_expiry_18m.yaml b/tests/mainnet/pectra/models/int_storage_slot_expiry_18m.yaml
new file mode 100644
index 00000000..ada90420
--- /dev/null
+++ b/tests/mainnet/pectra/models/int_storage_slot_expiry_18m.yaml
@@ -0,0 +1,24 @@
+model: int_storage_slot_expiry_18m
+network: mainnet
+spec: pectra
+external_data:
+    canonical_execution_block:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_block.parquet
+        network_column: meta_network_name
+    canonical_execution_storage_diffs:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_diffs.parquet
+        network_column: meta_network_name
+    canonical_execution_storage_reads:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_reads.parquet
+        network_column: meta_network_name
+assertions:
+    - name: Expected admin bounds exist
+      sql: |
+        SELECT
+          COUNT(*) AS count
+        FROM
+          admin_cbt_incremental FINAL
+        WHERE
+          table = 'int_storage_slot_expiry_18m'
+      expected:
+        count: 1
diff --git a/tests/mainnet/pectra/models/int_storage_slot_expiry_1m.yaml b/tests/mainnet/pectra/models/int_storage_slot_expiry_1m.yaml
new file mode 100644
index 00000000..6472c9a8
--- /dev/null
+++ b/tests/mainnet/pectra/models/int_storage_slot_expiry_1m.yaml
@@ -0,0 +1,52 @@
+model: int_storage_slot_expiry_1m
+network: mainnet
+spec: pectra
+external_data:
+    canonical_execution_block:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_block.parquet
+        network_column: meta_network_name
+    canonical_execution_storage_diffs:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_diffs.parquet
+        network_column: meta_network_name
+    canonical_execution_storage_reads:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_reads.parquet
+        network_column: meta_network_name
+assertions:
+    - name: Expected admin bounds exist
+      sql: |
+        SELECT
+          COUNT(*) AS count
+        FROM
+          admin_cbt_incremental FINAL
+        WHERE
+          table = 'int_storage_slot_expiry_1m'
+      expected:
+        count: 1
+    - name: Case 12 genesis-era 1m expiry exists
+      sql: |
+        SELECT
+          block_number,
+          address,
+          effective_bytes
+        FROM int_storage_slot_expiry_1m FINAL
+        WHERE address = '0x630ea66c8c5dc205d45a978573fa86df5af1fe7a'
+          AND block_number = 199079
+        ORDER BY slot_key
+        LIMIT 1
+      expected:
+        block_number: "199079"
+        address: "0x630ea66c8c5dc205d45a978573fa86df5af1fe7a"
+        effective_bytes: "1"
+    - name: Case 7 1m expiry exists (waterfall base)
+      sql: |
+        SELECT
+          block_number,
+          touch_block,
+          effective_bytes
+        FROM int_storage_slot_expiry_1m FINAL
+        WHERE address = '0x86fa049857e0209aa7d9e616f7eb3b3b78ecfdb0'
+          AND slot_key = '0x9ff87960f26fb9e2553cb67c4d27896d4c8dc8fe6f403d1cc6ba9b6fe71a8d7d'
+      expected:
+        block_number: "4328143"
+        touch_block: "4227606"
+        effective_bytes: "8"
diff --git a/tests/mainnet/pectra/models/int_storage_slot_expiry_24m.yaml b/tests/mainnet/pectra/models/int_storage_slot_expiry_24m.yaml
new file mode 100644
index 00000000..adcd30f1
--- /dev/null
+++ b/tests/mainnet/pectra/models/int_storage_slot_expiry_24m.yaml
@@ -0,0 +1,24 @@
+model: int_storage_slot_expiry_24m
+network: mainnet
+spec: pectra
+external_data:
+    canonical_execution_block:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_block.parquet
+        network_column: meta_network_name
+    canonical_execution_storage_diffs:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_diffs.parquet
+        network_column: meta_network_name
+    canonical_execution_storage_reads:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_reads.parquet
+        network_column: meta_network_name
+assertions:
+    - name: Expected admin bounds exist
+      sql: |
+        SELECT
+          COUNT(*) AS count
+        FROM
+          admin_cbt_incremental FINAL
+        WHERE
+          table = 'int_storage_slot_expiry_24m'
+      expected:
+        count: 1
diff --git a/tests/mainnet/pectra/models/int_storage_slot_expiry_6m.yaml b/tests/mainnet/pectra/models/int_storage_slot_expiry_6m.yaml
new file mode 100644
index 00000000..30606740
--- /dev/null
+++ b/tests/mainnet/pectra/models/int_storage_slot_expiry_6m.yaml
@@ -0,0 +1,47 @@
+model: int_storage_slot_expiry_6m
+network: mainnet
+spec: pectra
+external_data:
+    canonical_execution_block:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_block.parquet
+        network_column: meta_network_name
+    canonical_execution_storage_diffs:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_diffs.parquet
+        network_column: meta_network_name
+    canonical_execution_storage_reads:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_reads.parquet
+        network_column: meta_network_name
+assertions:
+    - name: Expected admin bounds exist
+      sql: |
+        SELECT
+          COUNT(*) AS count
+        FROM
+          admin_cbt_incremental FINAL
+        WHERE
+          table = 'int_storage_slot_expiry_6m'
+      expected:
+        count: 1
+    - name: Case 1 6m expiry exists
+      sql: |
+        SELECT
+          block_number,
+          touch_block,
+          effective_bytes
+        FROM int_storage_slot_expiry_6m FINAL
+        WHERE address = '0x793ae8c1b1a160bfc07bfb0d04f85eab1a71f4f2'
+          AND slot_key = '0x0000000000000000000000000000000000000000000000000000000000000000'
+          AND block_number = 995079
+      expected:
+        block_number: "995079"
+        touch_block: "76588"
+        effective_bytes: "7"
+    - name: Case 7 no 6m expiry (reactivated at 1m)
+      sql: |
+        SELECT
+          COUNT(*) AS count
+        FROM int_storage_slot_expiry_6m FINAL
+        WHERE address = '0x86fa049857e0209aa7d9e616f7eb3b3b78ecfdb0'
+          AND slot_key = '0x9ff87960f26fb9e2553cb67c4d27896d4c8dc8fe6f403d1cc6ba9b6fe71a8d7d'
+      expected:
+        count: 0
diff --git a/tests/mainnet/pectra/models/int_storage_slot_next_touch.yaml b/tests/mainnet/pectra/models/int_storage_slot_next_touch.yaml
new file mode 100644
index 00000000..b8057e27
--- /dev/null
+++ b/tests/mainnet/pectra/models/int_storage_slot_next_touch.yaml
@@ -0,0 +1,84 @@
+model: int_storage_slot_next_touch
+network: mainnet
+spec: pectra
+external_data:
+    canonical_execution_storage_diffs:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_diffs.parquet
+        network_column: meta_network_name
+    canonical_execution_storage_reads:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_reads.parquet
+        network_column: meta_network_name
+assertions:
+    - name: Expected bounds and size
+      sql: |
+        SELECT
+          COUNT(*) AS count,
+          MIN(block_number) AS min_block,
+          MAX(block_number) AS max_block
+        FROM
+          int_storage_slot_next_touch FINAL
+      expected:
+        count: 44
+        min_block: "49018"
+        max_block: "6372586"
+    - name: Expected admin bounds
+      sql: |
+        SELECT
+          MAX(position + interval) AS max,
+          MIN(position) AS min
+        FROM
+          admin_cbt_incremental FINAL
+        WHERE
+          table = 'int_storage_slot_next_touch'
+      expected:
+        max: "6372586"
+        min: "49018"
+    - name: Case 1 touches have correct next_touch_block chain
+      sql: |
+        SELECT
+          block_number,
+          next_touch_block
+        FROM int_storage_slot_next_touch FINAL
+        WHERE address = '0x793ae8c1b1a160bfc07bfb0d04f85eab1a71f4f2'
+          AND slot_key = '0x0000000000000000000000000000000000000000000000000000000000000000'
+        ORDER BY block_number
+        FORMAT JSONEachRow
+      expected_rows:
+        - block_number: "63809"
+          next_touch_block: "76588"
+        - block_number: "76588"
+          next_touch_block: "1059558"
+        - block_number: "1059558"
+          next_touch_block: "1109283"
+        - block_number: "1109283"
+          next_touch_block: "2143395"
+        - block_number: "2143395"
+          next_touch_block: null
+    - name: Case 11 complete 3-cycle has 14 touches
+      sql: |
+        SELECT COUNT(*) AS count
+        FROM int_storage_slot_next_touch FINAL
+        WHERE address = '0xdbf03b407c01e7cd3cbea99509d93f8dddc8c6fb'
+          AND slot_key = '0x0000000000000000000000000000000000000000000000000000000000000002'
+      expected:
+        count: 14
+    - name: Case 11 last touch has null next_touch_block
+      sql: |
+        SELECT block_number, next_touch_block
+        FROM int_storage_slot_next_touch FINAL
+        WHERE address = '0xdbf03b407c01e7cd3cbea99509d93f8dddc8c6fb'
+          AND slot_key = '0x0000000000000000000000000000000000000000000000000000000000000002'
+        ORDER BY block_number DESC
+        LIMIT 1
+      expected:
+        block_number: "6372586"
+        next_touch_block: null
+    - name: Case 12 genesis-era slots have correct next_touch_block (null - never touched again)
+      sql: |
+        SELECT COUNT(*) AS count
+        FROM int_storage_slot_next_touch FINAL
+        WHERE address = '0x630ea66c8c5dc205d45a978573fa86df5af1fe7a'
+          AND block_number = 49018
+          AND next_touch_block IS NULL
+      expected:
+        count: 3
diff --git a/tests/mainnet/pectra/models/int_storage_slot_reactivation_12m.yaml b/tests/mainnet/pectra/models/int_storage_slot_reactivation_12m.yaml
new file mode 100644
index 00000000..9590373b
--- /dev/null
+++ b/tests/mainnet/pectra/models/int_storage_slot_reactivation_12m.yaml
@@ -0,0 +1,24 @@
+model: int_storage_slot_reactivation_12m
+network: mainnet
+spec: pectra
+external_data:
+    canonical_execution_block:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_block.parquet
+        network_column: meta_network_name
+    canonical_execution_storage_diffs:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_diffs.parquet
+        network_column: meta_network_name
+    canonical_execution_storage_reads:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_reads.parquet
+        network_column: meta_network_name
+assertions:
+    - name: Expected admin bounds exist
+      sql: |
+        SELECT
+          COUNT(*) AS count
+        FROM
+          admin_cbt_incremental FINAL
+        WHERE
+          table = 'int_storage_slot_reactivation_12m'
+      expected:
+        count: 1
diff --git a/tests/mainnet/pectra/models/int_storage_slot_reactivation_18m.yaml b/tests/mainnet/pectra/models/int_storage_slot_reactivation_18m.yaml
new file mode 100644
index 00000000..c821abee
--- /dev/null
+++ b/tests/mainnet/pectra/models/int_storage_slot_reactivation_18m.yaml
@@ -0,0 +1,24 @@
+model: int_storage_slot_reactivation_18m
+network: mainnet
+spec: pectra
+external_data:
+    canonical_execution_block:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_block.parquet
+        network_column: meta_network_name
+    canonical_execution_storage_diffs:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_diffs.parquet
+        network_column: meta_network_name
+    canonical_execution_storage_reads:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_reads.parquet
+        network_column: meta_network_name
+assertions:
+    - name: Expected admin bounds exist
+      sql: |
+        SELECT
+          COUNT(*) AS count
+        FROM
+          admin_cbt_incremental FINAL
+        WHERE
+          table = 'int_storage_slot_reactivation_18m'
+      expected:
+        count: 1
diff --git a/tests/mainnet/pectra/models/int_storage_slot_reactivation_1m.yaml b/tests/mainnet/pectra/models/int_storage_slot_reactivation_1m.yaml
new file mode 100644
index 00000000..e85db35d
--- /dev/null
+++ b/tests/mainnet/pectra/models/int_storage_slot_reactivation_1m.yaml
@@ -0,0 +1,37 @@
+model: int_storage_slot_reactivation_1m
+network: mainnet
+spec: pectra
+external_data:
+    canonical_execution_block:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_block.parquet
+        network_column: meta_network_name
+    canonical_execution_storage_diffs:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_diffs.parquet
+        network_column: meta_network_name
+    canonical_execution_storage_reads:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_reads.parquet
+        network_column: meta_network_name
+assertions:
+    - name: Expected admin bounds exist
+      sql: |
+        SELECT
+          COUNT(*) AS count
+        FROM
+          admin_cbt_incremental FINAL
+        WHERE
+          table = 'int_storage_slot_reactivation_1m'
+      expected:
+        count: 1
+    - name: Case 7 1m reactivation exists (waterfall close-call)
+      sql: |
+        SELECT
+          block_number,
+          touch_block,
+          effective_bytes
+        FROM int_storage_slot_reactivation_1m FINAL
+        WHERE address = '0x86fa049857e0209aa7d9e616f7eb3b3b78ecfdb0'
+          AND slot_key = '0x9ff87960f26fb9e2553cb67c4d27896d4c8dc8fe6f403d1cc6ba9b6fe71a8d7d'
+      expected:
+        block_number: "5178368"
+        touch_block: "4227606"
+        effective_bytes: "8"
diff --git a/tests/mainnet/pectra/models/int_storage_slot_reactivation_24m.yaml b/tests/mainnet/pectra/models/int_storage_slot_reactivation_24m.yaml
new file mode 100644
index 00000000..beaf041c
--- /dev/null
+++ b/tests/mainnet/pectra/models/int_storage_slot_reactivation_24m.yaml
@@ -0,0 +1,24 @@
+model: int_storage_slot_reactivation_24m
+network: mainnet
+spec: pectra
+external_data:
+    canonical_execution_block:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_block.parquet
+        network_column: meta_network_name
+    canonical_execution_storage_diffs:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_diffs.parquet
+        network_column: meta_network_name
+    canonical_execution_storage_reads:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_reads.parquet
+        network_column: meta_network_name
+assertions:
+    - name: Expected admin bounds exist
+      sql: |
+        SELECT
+          COUNT(*) AS count
+        FROM
+          admin_cbt_incremental FINAL
+        WHERE
+          table = 'int_storage_slot_reactivation_24m'
+      expected:
+        count: 1
diff --git a/tests/mainnet/pectra/models/int_storage_slot_reactivation_6m.yaml b/tests/mainnet/pectra/models/int_storage_slot_reactivation_6m.yaml
new file mode 100644
index 00000000..d2178ddb
--- /dev/null
+++ b/tests/mainnet/pectra/models/int_storage_slot_reactivation_6m.yaml
@@ -0,0 +1,37 @@
+model: int_storage_slot_reactivation_6m
+network: mainnet
+spec: pectra
+external_data:
+    canonical_execution_block:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_block.parquet
+        network_column: meta_network_name
+    canonical_execution_storage_diffs:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_diffs.parquet
+        network_column: meta_network_name
+    canonical_execution_storage_reads:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_reads.parquet
+        network_column: meta_network_name
+assertions:
+    - name: Expected admin bounds exist
+      sql: |
+        SELECT
+          COUNT(*) AS count
+        FROM
+          admin_cbt_incremental FINAL
+        WHERE
+          table = 'int_storage_slot_reactivation_6m'
+      expected:
+        count: 1
+    - name: Case 1 6m reactivation exists
+      sql: |
+        SELECT
+          block_number,
+          touch_block,
+          effective_bytes
+        FROM int_storage_slot_reactivation_6m FINAL
+        WHERE address = '0x793ae8c1b1a160bfc07bfb0d04f85eab1a71f4f2'
+          AND slot_key = '0x0000000000000000000000000000000000000000000000000000000000000000'
+      expected:
+        block_number: "1059558"
+        touch_block: "76588"
+        effective_bytes: "7"
diff --git a/tests/mainnet/pectra/models/int_storage_slot_read.yaml b/tests/mainnet/pectra/models/int_storage_slot_read.yaml
new file mode 100644
index 00000000..71d4e8e7
--- /dev/null
+++ b/tests/mainnet/pectra/models/int_storage_slot_read.yaml
@@ -0,0 +1,57 @@
+model: int_storage_slot_read
+network: mainnet
+spec: pectra
+external_data:
+    canonical_execution_storage_reads:
+        url: https://data.ethpandaops.io/xatu-cbt/mainnet/pectra/canonical_execution_storage_reads.parquet
+        network_column: meta_network_name
+assertions:
+    - name: Expected bounds and size
+      sql: |
+        SELECT
+          COUNT(*) AS count,
+          MIN(block_number) AS min_block,
+          MAX(block_number) AS max_block
+        FROM
+          int_storage_slot_read FINAL
+      expected:
+        count: 44
+        min_block: "49018"
+        max_block: "6372586"
+    - name: Expected admin bounds
+      sql: |
+        SELECT
+          MAX(position + interval) AS max,
+          MIN(position) AS min
+        FROM
+          admin_cbt_incremental FINAL
+        WHERE
+          table = 'int_storage_slot_read'
+      expected:
+        max: "6372586"
+        min: "49018"
+    - name: Case 1 reads exist (5 touches across expiry-reactivation cycle)
+      sql: |
+        SELECT COUNT(*) AS count
+        FROM int_storage_slot_read FINAL
+        WHERE address = '0x793ae8c1b1a160bfc07bfb0d04f85eab1a71f4f2'
+          AND slot_key = '0x0000000000000000000000000000000000000000000000000000000000000000'
+      expected:
+        count: 5
+    - name: Case 6 reactivation read exists (block 6365361)
+      sql: |
+        SELECT COUNT(*) AS count
+        FROM int_storage_slot_read FINAL
+        WHERE address = '0x329219be8810602a59b76df9ed7d52dc3afc3e8b'
+          AND slot_key = '0x0000000000000000000000000000000000000000000000000000000000000000'
+          AND block_number = 6365361
+      expected:
+        count: 1
+    - name: Case 11 reads exist (complete 3-cycle with 14 touches)
+      sql: |
+        SELECT COUNT(*) AS count
+        FROM int_storage_slot_read FINAL
+        WHERE address = '0xdbf03b407c01e7cd3cbea99509d93f8dddc8c6fb'
+          AND slot_key = '0x0000000000000000000000000000000000000000000000000000000000000002'
+      expected:
+        count: 14