diff --git a/detectors/token-interface-inference/Cargo.toml b/detectors/token-interface-inference/Cargo.toml
index 4ad4c023..30dd542a 100644
--- a/detectors/token-interface-inference/Cargo.toml
+++ b/detectors/token-interface-inference/Cargo.toml
@@ -7,11 +7,10 @@ version = "0.1.0"
 crate-type = ["cdylib"]
 
 [dependencies]
-clippy_utils = { workspace = true }
+clippy_wrappers = { workspace = true }
 dylint_linting = { workspace = true }
-if_chain = { workspace = true }
-utils = { workspace = true }
 edit-distance = "=2.1.2"
+if_chain = { workspace = true }
 
 [package.metadata.rust-analyzer]
 rustc_private = true
diff --git a/detectors/token-interface-inference/src/lib.rs b/detectors/token-interface-inference/src/lib.rs
index 85b8782b..63f0b553 100644
--- a/detectors/token-interface-inference/src/lib.rs
+++ b/detectors/token-interface-inference/src/lib.rs
@@ -4,7 +4,7 @@ extern crate rustc_errors;
 extern crate rustc_hir;
 extern crate rustc_span;
 
-use clippy_utils::diagnostics::span_lint;
+use clippy_wrappers::span_lint;
 use edit_distance::edit_distance;
 use if_chain::if_chain;
 use rustc_errors::MultiSpan;
diff --git a/test-cases/Cargo.toml b/test-cases/Cargo.toml
index 6c2532ea..bf6cbdb8 100644
--- a/test-cases/Cargo.toml
+++ b/test-cases/Cargo.toml
@@ -1,6 +1,6 @@
 [workspace]
 exclude = [".cargo", "soroban-version", "target"]
-members = ["*/*/vulnerable-example", "*/*/remediated-example"]
+members = ["*/*/remediated-example", "*/*/vulnerable-example"]
 resolver = "2"
 
 [workspace.package]
diff --git a/test-cases/storage-change-events/storage-change-events-1/remediated-example/Cargo.toml b/test-cases/storage-change-events/storage-change-events-1/remediated-example/Cargo.toml
index da62685c..58948f28 100644
--- a/test-cases/storage-change-events/storage-change-events-1/remediated-example/Cargo.toml
+++ b/test-cases/storage-change-events/storage-change-events-1/remediated-example/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
+edition = "2021"
 name = "storage-change-events-remediated-1"
 version = "0.1.0"
-edition = "2021"
 
 [lib]
 crate-type = ["cdylib"]
@@ -10,9 +10,5 @@ crate-type = ["cdylib"]
 soroban-sdk = { workspace = true }
 soroban-token-sdk = { workspace = true }
 
-[dev_dependencies]
-soroban-sdk = { workspace = true, features = ["testutils"] }
-soroban-token-sdk = { workspace = true }
-
 [features]
 testutils = ["soroban-sdk/testutils"]
diff --git a/test-cases/storage-change-events/storage-change-events-1/vulnerable-example/Cargo.toml b/test-cases/storage-change-events/storage-change-events-1/vulnerable-example/Cargo.toml
index 10659104..87743fa2 100644
--- a/test-cases/storage-change-events/storage-change-events-1/vulnerable-example/Cargo.toml
+++ b/test-cases/storage-change-events/storage-change-events-1/vulnerable-example/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
+edition = "2021"
 name = "storage-change-events-vulnerable-1"
 version = "0.1.0"
-edition = "2021"
 
 [lib]
 crate-type = ["cdylib"]
@@ -10,9 +10,5 @@ crate-type = ["cdylib"]
 soroban-sdk = { workspace = true }
 soroban-token-sdk = { workspace = true }
 
-[dev_dependencies]
-soroban-sdk = { workspace = true, features = ["testutils"] }
-soroban-token-sdk = { workspace = true }
-
 [features]
 testutils = ["soroban-sdk/testutils"]
diff --git a/test-cases/token-interface-events/token-interface-events-1/remediated-example/Cargo.toml b/test-cases/token-interface-events/token-interface-events-1/remediated-example/Cargo.toml
index 5cdc2f09..ecc88ac4 100644
--- a/test-cases/token-interface-events/token-interface-events-1/remediated-example/Cargo.toml
+++ b/test-cases/token-interface-events/token-interface-events-1/remediated-example/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
+edition = "2021"
 name = "token-interface-events-remediated-1"
 version = "0.1.0"
-edition = "2021"
 
 [lib]
 crate-type = ["cdylib"]
@@ -10,26 +10,5 @@ crate-type = ["cdylib"]
 soroban-sdk = { workspace = true }
 soroban-token-sdk = { workspace = true }
 
-
-[dev_dependencies]
-soroban-sdk = { workspace = true, features = ["testutils"] }
-soroban-token-sdk = { workspace = true }
-
-
 [features]
 testutils = ["soroban-sdk/testutils"]
-
-[profile.release]
-opt-level = "z"
-overflow-checks = true
-debug = 0
-strip = "symbols"
-debug-assertions = false
-panic = "abort"
-codegen-units = 1
-lto = true
-
-[profile.release-with-logs]
-inherits = "release"
-debug-assertions = true
-
diff --git a/test-cases/token-interface-events/token-interface-events-1/vulnerable-example/Cargo.toml b/test-cases/token-interface-events/token-interface-events-1/vulnerable-example/Cargo.toml
index 3f0dc267..e507348e 100644
--- a/test-cases/token-interface-events/token-interface-events-1/vulnerable-example/Cargo.toml
+++ b/test-cases/token-interface-events/token-interface-events-1/vulnerable-example/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
+edition = "2021"
 name = "token-interface-events-vulnerable-1"
 version = "0.1.0"
-edition = "2021"
 
 [lib]
 crate-type = ["cdylib"]
@@ -10,26 +10,5 @@ crate-type = ["cdylib"]
 soroban-sdk = { workspace = true }
 soroban-token-sdk = { workspace = true }
 
-
-[dev_dependencies]
-soroban-sdk = { workspace = true, features = ["testutils"] }
-soroban-token-sdk = { workspace = true }
-
-
 [features]
 testutils = ["soroban-sdk/testutils"]
-
-[profile.release]
-opt-level = "z"
-overflow-checks = true
-debug = 0
-strip = "symbols"
-debug-assertions = false
-panic = "abort"
-codegen-units = 1
-lto = true
-
-[profile.release-with-logs]
-inherits = "release"
-debug-assertions = true
-