diff --git a/models/gold/tests/event_logs/test_gold__event_logs_full.yml b/models/gold/tests/event_logs/test_gold__event_logs_full.yml
index 0fa67e4..acd36c8 100644
--- a/models/gold/tests/event_logs/test_gold__event_logs_full.yml
+++ b/models/gold/tests/event_logs/test_gold__event_logs_full.yml
@@ -4,7 +4,8 @@ models:
     tests:
       - dbt_utils.unique_combination_of_columns:
           combination_of_columns:
-            - _LOG_ID
+            - TX_HASH
+            - EVENT_INDEX
       - fsc_utils.sequence_gaps:
           partition_by:
             - BLOCK_NUMBER
diff --git a/models/gold/tests/event_logs/test_gold__event_logs_recent.yml b/models/gold/tests/event_logs/test_gold__event_logs_recent.yml
index a90829f..247638c 100644
--- a/models/gold/tests/event_logs/test_gold__event_logs_recent.yml
+++ b/models/gold/tests/event_logs/test_gold__event_logs_recent.yml
@@ -4,7 +4,8 @@ models:
     tests:
       - dbt_utils.unique_combination_of_columns:
           combination_of_columns:
-            - _LOG_ID
+            - TX_HASH
+            - EVENT_INDEX
       - fsc_utils.sequence_gaps:
           partition_by:
             - BLOCK_NUMBER
diff --git a/models/gold/tests/traces/test_gold__traces_full.sql b/models/gold/tests/traces/test_gold__traces_full.sql
index 0bae578..0f3910f 100644
--- a/models/gold/tests/traces/test_gold__traces_full.sql
+++ b/models/gold/tests/traces/test_gold__traces_full.sql
@@ -6,8 +6,4 @@
 SELECT
     *
 FROM
-    {{ ref('testnet__fact_traces') }}
-WHERE 
-    from_address <> '0x'
-AND
-    to_address <> '0x'
\ No newline at end of file
+    {{ ref('testnet__fact_traces') }}
\ No newline at end of file
diff --git a/models/gold/tests/traces/test_gold__traces_full.yml b/models/gold/tests/traces/test_gold__traces_full.yml
index adfb9ad..cd76e70 100644
--- a/models/gold/tests/traces/test_gold__traces_full.yml
+++ b/models/gold/tests/traces/test_gold__traces_full.yml
@@ -12,6 +12,4 @@ models:
         tests:
           - dbt_expectations.expect_row_values_to_have_recent_data:
               datepart: day
-              interval: 1
-
-
+              interval: 1
\ No newline at end of file
diff --git a/models/gold/tests/traces/test_gold__traces_recent.sql b/models/gold/tests/traces/test_gold__traces_recent.sql
index 805d7dc..ba63a6d 100644
--- a/models/gold/tests/traces/test_gold__traces_recent.sql
+++ b/models/gold/tests/traces/test_gold__traces_recent.sql
@@ -20,8 +20,4 @@ WHERE
             block_number
         FROM
             last_3_days
-    )
-AND 
-    from_address <> '0x'
-AND
-    to_address <> '0x'
+    )
\ No newline at end of file
diff --git a/models/silver/core/tests/traces/test_silver__traces_full.sql b/models/silver/core/tests/traces/test_silver__traces_full.sql
index 66d5fe4..4471331 100644
--- a/models/silver/core/tests/traces/test_silver__traces_full.sql
+++ b/models/silver/core/tests/traces/test_silver__traces_full.sql
@@ -6,4 +6,4 @@
 SELECT
     *
 FROM
-    {{ ref('silver_testnet__traces') }}
\ No newline at end of file
+    {{ ref('silver_testnet__traces') }}
diff --git a/models/silver/core/tests/traces/test_silver__traces_full.yml b/models/silver/core/tests/traces/test_silver__traces_full.yml
index b5a2883..6efdba9 100644
--- a/models/silver/core/tests/traces/test_silver__traces_full.yml
+++ b/models/silver/core/tests/traces/test_silver__traces_full.yml
@@ -6,7 +6,7 @@ models:
           combination_of_columns:
             - BLOCK_NUMBER
             - TX_POSITION
-            - TRACE_ADDRESS
+            - TRACE_INDEX
     columns:
       - name: BLOCK_NUMBER
         tests:
@@ -14,19 +14,45 @@ models:
           - dbt_expectations.expect_column_values_to_be_in_type_list:
               column_type_list:
                 - NUMBER    
-                - FLOAT
-      - name: TX_POSITION
-        tests:
-          - not_null
-          - dbt_expectations.expect_column_values_to_be_in_type_list:
-              column_type_list:
-                - NUMBER    
-                - FLOAT   
-      - name: TRACE_ADDRESS
-        tests:
-          - not_null
-      - name: PARENT_TRACE_ADDRESS
+                - FLOAT    
+      - name: BLOCK_TIMESTAMP
         tests:
           - not_null:
-              where: TRACE_ADDRESS <> 'ORIGIN'
+              where: NOT IS_PENDING
+          - dbt_expectations.expect_row_values_to_have_recent_data:
+              datepart: day
+              interval: 1
+          - dbt_expectations.expect_column_values_to_be_in_type_list:
+              column_type_list:
+                - TIMESTAMP_NTZ
+      - name: TX_HASH
+        tests:
+          - not_null:
+              where: NOT IS_PENDING
+          - dbt_expectations.expect_column_values_to_match_regex:
+              regex: 0[xX][0-9a-fA-F]+
+      - name: FROM_ADDRESS
+        tests:
+          - not_null:
+              where: TYPE <> 'SELFDESTRUCT'
+          - dbt_expectations.expect_column_values_to_match_regex:
+              regex: 0[xX][0-9a-fA-F]+
+      - name: TO_ADDRESS
+        tests:
+          - dbt_expectations.expect_column_values_to_match_regex:
+              regex: 0[xX][0-9a-fA-F]+
+              where: TO_ADDRESS IS NOT NULL
+      - name: IDENTIFIER
+        tests:
+          - not_null
+      - name: VALUE
+        tests:
+          - not_null
+      - name: GAS
+        tests:
+          - not_null
+      - name: GAS_USED
+        tests:
+          - not_null
+
 
diff --git a/models/silver/core/tests/traces/test_silver__traces_recent.sql b/models/silver/core/tests/traces/test_silver__traces_recent.sql
index b5d1a61..ab3fba0 100644
--- a/models/silver/core/tests/traces/test_silver__traces_recent.sql
+++ b/models/silver/core/tests/traces/test_silver__traces_recent.sql
@@ -20,4 +20,4 @@ WHERE
             block_number
         FROM
             last_3_days
-    )
\ No newline at end of file
+    )
diff --git a/models/silver/core/tests/traces/test_silver__traces_recent.yml b/models/silver/core/tests/traces/test_silver__traces_recent.yml
index d62be9d..2e8b3d5 100644
--- a/models/silver/core/tests/traces/test_silver__traces_recent.yml
+++ b/models/silver/core/tests/traces/test_silver__traces_recent.yml
@@ -6,7 +6,7 @@ models:
           combination_of_columns:
             - BLOCK_NUMBER
             - TX_POSITION
-            - TRACE_ADDRESS
+            - TRACE_INDEX
     columns:
       - name: BLOCK_NUMBER
         tests:
@@ -14,18 +14,21 @@ models:
           - dbt_expectations.expect_column_values_to_be_in_type_list:
               column_type_list:
                 - NUMBER    
-                - FLOAT
-      - name: TX_POSITION
-        tests:
-          - not_null
-          - dbt_expectations.expect_column_values_to_be_in_type_list:
-              column_type_list:
-                - NUMBER    
-                - FLOAT   
-      - name: TRACE_ADDRESS
-        tests:
-          - not_null
-      - name: PARENT_TRACE_ADDRESS
+                - FLOAT    
+      - name: BLOCK_TIMESTAMP
         tests:
           - not_null:
-              where: TRACE_ADDRESS <> 'ORIGIN'
\ No newline at end of file
+              where: NOT IS_PENDING
+          - dbt_expectations.expect_row_values_to_have_recent_data:
+              datepart: day
+              interval: 1
+          - dbt_expectations.expect_column_values_to_be_in_type_list:
+              column_type_list:
+                - TIMESTAMP_NTZ
+      - name: TX_HASH
+        tests:
+          - not_null:
+              where: NOT IS_PENDING
+          - dbt_expectations.expect_column_values_to_match_regex:
+              regex: 0[xX][0-9a-fA-F]+
+     
\ No newline at end of file
diff --git a/models/streamline/core/retry/_missing_traces.sql b/models/streamline/core/retry/_missing_traces.sql
index 5e81553..60c376d 100644
--- a/models/streamline/core/retry/_missing_traces.sql
+++ b/models/streamline/core/retry/_missing_traces.sql
@@ -14,7 +14,7 @@ SELECT
 FROM
     {{ ref("silver_testnet__transactions") }}
     tx
-    LEFT JOIN {{ ref("testnet__fact_traces") }}
+    LEFT JOIN {{ ref("silver_testnet__traces") }}
     tr
     ON tx.block_number = tr.block_number
     AND tx.tx_hash = tr.tx_hash