diff --git a/storage/src/models.rs b/storage/src/models.rs
index d1774a44b..90c0b7761 100644
--- a/storage/src/models.rs
+++ b/storage/src/models.rs
@@ -635,7 +635,7 @@ mod tests {
         let (model_storage, _temp_dir) = create_test_model_storage().await;
 
         let model_data = b"fake model data";
-        let checksum = "abc123";
+        let checksum = "c4928585ac684a63148634c0655c561d94260f841aceb618ef21b6492e8a1da8";
 
         let checkpoint = ModelCheckpoint::new(
             "test_model".to_string(),
@@ -716,7 +716,7 @@ mod tests {
                 "transformer".to_string(),
                 format!("test_model/checkpoint_{}.bin", i * 100),
                 model_data.len() as u64,
-                format!("checksum_{}", i),
+                "c4928585ac684a63148634c0655c561d94260f841aceb618ef21b6492e8a1da8".to_string(),
             );
 
             if i == 3 {
@@ -931,7 +931,7 @@ mod tests {
             "transformer".to_string(),
             "rich_model/checkpoint.bin".to_string(),
             model_data.len() as u64,
-            "hash".to_string(),
+            "6dbdb6a147ad4d808455652bf5a10120161678395f6bfbd21eb6fe4e731aceeb".to_string(),
         )
         .with_hyperparameters(hyperparams)
         .with_accuracy_metrics(metrics)
@@ -1062,7 +1062,7 @@ mod tests {
                 "arch".to_string(),
                 format!("{}/checkpoint.bin", model_name),
                 model_data.len() as u64,
-                format!("hash_{}", model_name),
+                "3a6eb0790f39ac87c94f3856b2dd2c5d110e6811602261a9a923d3bb23adc8b7".to_string(),
             );
             model_storage
                 .store_checkpoint(&checkpoint, model_data)
@@ -1094,7 +1094,7 @@ mod tests {
                     "arch".to_string(),
                     format!("model_{}/checkpoint_{}.bin", model_num, checkpoint_num),
                     model_data.len() as u64,
-                    format!("hash_{}_{}", model_num, checkpoint_num),
+                    "58c7782f0bc82df754cadee10fd1cb82c80fb8103a0b5c7986a221751f67f188".to_string(),
                 );
                 model_storage
                     .store_checkpoint(&checkpoint, model_data)
@@ -1226,7 +1226,7 @@ mod tests {
             "arch".to_string(),
             "cached_model/checkpoint.bin".to_string(),
             model_data.len() as u64,
-            "hash".to_string(),
+            "005990c21ec5a6959371ee4beb18a79237edee42873b6691c45d6907eb496ef5".to_string(),
         );
 
         // Store checkpoint (should cache metadata)
@@ -1288,7 +1288,7 @@ mod tests {
             "arch".to_string(),
             "large_model/checkpoint.bin".to_string(),
             model_data.len() as u64,
-            "hash".to_string(),
+            "e5b844cc57f57094ea4585e235f36c78c1cd222262bb89d53c94dcb4d6b3e55d".to_string(),
         );
 
         model_storage
diff --git a/tests/production_integration_tests.rs b/tests/production_integration_tests.rs
index 5060840bc..9f6b507ee 100644
--- a/tests/production_integration_tests.rs
+++ b/tests/production_integration_tests.rs
@@ -498,13 +498,14 @@ impl ProductionTestHarness {
             black_box(1 + 1);
             let end = HardwareTimestamp::now();
 
-            let duration = end.duration_since(start);
+            let duration = end.duration_since(&start)?;
             measurements.push(duration);
         }
 
         // Return median measurement for more stable results
         measurements.sort();
-        Ok(measurements[measurements.len() / 2])
+        let median_ns = measurements[measurements.len() / 2];
+        Ok(Duration::from_nanos(median_ns))
     }
 
     async fn measure_lockfree_queue_latency(
diff --git a/tests/regulatory_submission_tests.rs b/tests/regulatory_submission_tests.rs
index fdfee095d..28acef23f 100644
--- a/tests/regulatory_submission_tests.rs
+++ b/tests/regulatory_submission_tests.rs
@@ -5,6 +5,7 @@ use chrono::{DateTime, Duration, Utc};
 use std::collections::HashMap;
 use tokio;
 use trading_engine::compliance::*;
+use common::{OrderId, OrderSide, OrderType, Price, Quantity};
 
 #[tokio::test]
 async fn test_mifid_ii_rts22_report_generation() {
@@ -171,7 +172,7 @@ async fn test_audit_trail_export() {
 
         // Modify order details for variety
         if let Some(ref mut order) = context.order_info {
-            order.order_id = format!("AUDIT_TEST_{:03}", i);
+            order.order_id = OrderId::new(); // Generate unique ID
             order.quantity = Quantity::from_f64(100.0 * (i as f64 + 1.0)).unwrap();
         }
 
@@ -296,15 +297,14 @@ async fn test_cross_regulation_compliance() {
 fn create_compliance_context_with_order() -> ComplianceContext {
     ComplianceContext {
         order_info: Some(OrderInfo {
-            order_id: "COMPLIANCE_TEST_001".to_string(),
-            symbol: Symbol::from("AAPL".to_string()),
-            instrument_id: "AAPL".to_string(),
-            side: Side::Buy,
+            order_id: OrderId::new(),
+            symbol: "AAPL".to_string(),
+            side: OrderSide::Buy,
             quantity: Quantity::from_f64(1000.0).unwrap(),
-            price: Price::from_f64(150.0).unwrap(),
-            order_type: Some(OrderType::Limit),
-            portfolio_id: Some("COMPLIANCE_PORTFOLIO".to_string()),
-            strategy_id: Some("COMPLIANCE_STRATEGY".to_string()),
+            price: Some(Price::from_f64(150.0).unwrap()),
+            order_type: OrderType::Limit,
+            client_id: "COMPLIANCE_CLIENT_001".to_string(),
+            timestamp: Utc::now(),
         }),
         client_info: Some(ClientInfo {
             client_id: "COMPLIANCE_CLIENT_001".to_string(),