diff --git a/lib/dal/tests/integration_test/component/upgrade.rs b/lib/dal/tests/integration_test/component/upgrade.rs
index 1829659892..813e86736f 100644
--- a/lib/dal/tests/integration_test/component/upgrade.rs
+++ b/lib/dal/tests/integration_test/component/upgrade.rs
@@ -243,7 +243,8 @@ async fn auto_upgrade_component(ctx: &mut DalContext) {
         .components
         .first()
         .expect("unable to get the upgradable component on the graph");
-    assert_eq!(my_upgraded_component.schema_variant_id.into(), variant_one);
+
+    assert_eq!(my_upgraded_component.schema_variant_id, variant_one.into());
 
     let view_after_upgrade = Component::get_by_id(ctx, my_upgraded_component.component_id.into())
         .await
diff --git a/lib/dal/tests/integration_test/diagram.rs b/lib/dal/tests/integration_test/diagram.rs
index b4ad071f48..644c01380e 100644
--- a/lib/dal/tests/integration_test/diagram.rs
+++ b/lib/dal/tests/integration_test/diagram.rs
@@ -1,4 +1,4 @@
-use dal::{change_status::ChangeStatus, diagram::Diagram, Component, DalContext};
+use dal::{diagram::Diagram, Component, DalContext};
 use dal_test::{
     helpers::{create_component_for_default_schema_name, ChangeSetTestHelpers},
     test,
@@ -50,8 +50,9 @@ async fn components_removed_from_snapshot_have_virtual_diagram_entries(ctx: &mut
         .find(|comp| comp.id == component_to_remove.id().into())
         .expect("Removed Component not found in summary diagram");
     assert!(removed_component_summary.from_base_change_set);
+
     assert_eq!(
-        ChangeStatus::Deleted,
-        removed_component_summary.change_status.into()
+        si_frontend_types::ChangeStatus::Deleted,
+        removed_component_summary.change_status
     );
 }
diff --git a/lib/dal/tests/integration_test/frame.rs b/lib/dal/tests/integration_test/frame.rs
index 43091883d1..3e4e3e8e2e 100644
--- a/lib/dal/tests/integration_test/frame.rs
+++ b/lib/dal/tests/integration_test/frame.rs
@@ -198,11 +198,9 @@ async fn convert_component_to_frame_and_attach_no_nesting(ctx: &mut DalContext)
     assert!(starfield_parent_node_id.is_none());
     assert_eq!(
         starfield_component.id(),
-        <std::option::Option<si_events::ComponentId> as std::convert::Into<T>>::into(
-            fallout_parent_node_id
-        )
-        .into()
-        .expect("no parent node id for fallout component")
+        fallout_parent_node_id
+            .expect("fallout should have a parent node")
+            .into()
     );
 }
 
@@ -1964,10 +1962,11 @@ async fn multiple_frames_with_complex_connections_no_nesting(ctx: &mut DalContex
         assert!(new_era_taylor_swift_assembled.0.parent_id.is_none());
         assert_eq!(
             new_era_taylor_swift.id(), // expected
-            <std::option::Option<si_events::ComponentId> as std::convert::Into<T>>::into(
-                travis_kelce_assembled.0.parent_id
-            )
-            .expect("no parent node id")  // actual
+            travis_kelce_assembled
+                .0
+                .parent_id
+                .expect("no parent node id")
+                .into()  // actual
         );
     }
 
@@ -2025,8 +2024,8 @@ async fn multiple_frames_with_complex_connections_no_nesting(ctx: &mut DalContex
             travis_kelce_assembled
                 .0
                 .parent_id
-                .into()
-                .expect("no parent node id")  // actual
+                .expect("no parent node id")
+                .into()  // actual
         );
     }
 
@@ -2095,16 +2094,16 @@ async fn multiple_frames_with_complex_connections_no_nesting(ctx: &mut DalContex
             travis_kelce_assembled
                 .0
                 .parent_id
-                .into()
-                .expect("no parent node id")  // actual
+                .expect("no parent node id")
+                .into()  // actual
         );
         assert_eq!(
             country_era_taylor_swift.id(), // expected
             mama_kelce_assembled
                 .0
                 .parent_id
-                .into()
-                .expect("no parent node id")  // actual
+                .expect("no parent node id")
+                .into()  // actual
         );
     }
 
@@ -2170,24 +2169,24 @@ async fn multiple_frames_with_complex_connections_no_nesting(ctx: &mut DalContex
             country_era_taylor_swift_assembled
                 .0
                 .parent_id
-                .into()
                 .expect("no parent node id")
+                .into()
         );
         assert_eq!(
             new_era_taylor_swift.id(), // expected
             travis_kelce_assembled
                 .0
                 .parent_id
+                .expect("no parent node id") // actual
                 .into()
-                .expect("no parent node id")  // actual
         );
         assert_eq!(
             country_era_taylor_swift.id(), // expected
             mama_kelce_assembled
                 .0
                 .parent_id
+                .expect("no parent node id") // actual
                 .into()
-                .expect("no parent node id")  // actual
         );
     }
     //Scenario 7?! No more Country Era Swift, she wants to break freeeeeee
@@ -2249,16 +2248,16 @@ async fn multiple_frames_with_complex_connections_no_nesting(ctx: &mut DalContex
             travis_kelce_assembled
                 .0
                 .parent_id
-                .into()
-                .expect("no parent node id")  // actual
+                .expect("no parent node id")
+                .into()  // actual
         );
         assert_eq!(
-            country_era_taylor_swift.id(), // expected
+            country_era_taylor_swift.id(), // expectedº
             mama_kelce_assembled
                 .0
                 .parent_id
+                .expect("no parent node id")
                 .into()
-                .expect("no parent node id")  // actual
         );
     }
 }