diff --git a/docs/docs/detectors/12-soroban-version.md b/docs/docs/detectors/12-soroban-version.md
index e2e340bc..68f73186 100644
--- a/docs/docs/detectors/12-soroban-version.md
+++ b/docs/docs/detectors/12-soroban-version.md
@@ -12,9 +12,9 @@ Using an old version of Soroban can be dangerous, as it may have bugs or securit
 
 ```toml
 [dependencies]
-soroban-sdk = { version = "=20.0.0" }
+soroban-sdk = { version = "=21.4.0" }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { version = "=20.0.0", features = ["testutils"] }
 ```
 
diff --git a/docs/docs/detectors/4-overflow-check.md b/docs/docs/detectors/4-overflow-check.md
index b744ade1..86951d08 100644
--- a/docs/docs/detectors/4-overflow-check.md
+++ b/docs/docs/detectors/4-overflow-check.md
@@ -10,7 +10,6 @@ Integer overflow will trigger a panic in debug builds or will wrap in
 release mode. Division by zero will cause a panic in either mode. In some applications one
 wants explicitly checked, wrapping or saturating arithmetic.
 
-
 ### Example
 
 ```toml
@@ -26,7 +25,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = "20.0.0-rc2"
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { version = "=20.0.0", features = ["testutils"] }
 
 [features]
@@ -62,7 +61,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = "20.0.0-rc2"
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { version = "=20.0.0", features = ["testutils"] }
 
 [features]
@@ -87,4 +86,4 @@ debug-assertions = true
 
 ### Implementation
 
-The detector's implementation can be found at [this link](https://github.com/CoinFabrik/scout-soroban/tree/main/detectors/overflow-check).
\ No newline at end of file
+The detector's implementation can be found at [this link](https://github.com/CoinFabrik/scout-soroban/tree/main/detectors/overflow-check).
diff --git a/docs/docs/vulnerabilities/12-soroban-version.md b/docs/docs/vulnerabilities/12-soroban-version.md
index da149266..25a58d1a 100644
--- a/docs/docs/vulnerabilities/12-soroban-version.md
+++ b/docs/docs/vulnerabilities/12-soroban-version.md
@@ -17,7 +17,7 @@ Consider the following `Cargo.toml`:
     [dependencies]
     soroban-sdk = { version = "=19.0.0" }
 
-    [dev_dependencies]
+    [dev-dependencies]
     soroban-sdk = { version = "=19.0.0", features = ["testutils"] }
 ```
 
@@ -32,7 +32,7 @@ The vulnerable code example can be found [`here`](https://github.com/CoinFabrik/
     // Use the latest version available.
     soroban-sdk = { workspace = true }
 
-    [dev_dependencies]
+    [dev-dependencies]
     soroban-sdk = { workspace = true, features = ["testutils"] }
 ```
 
@@ -41,4 +41,4 @@ The remediated code example can be found [`here`](https://github.com/CoinFabrik/
 ## References
 
 - [Floating Pragma](https://swcregistry.io/docs/SWC-103/)
-- [outdated Compiler Version](https://swcregistry.io/docs/SWC-102/)
\ No newline at end of file
+- [outdated Compiler Version](https://swcregistry.io/docs/SWC-102/)
diff --git a/templates/test-case/Cargo.toml b/templates/test-case/Cargo.toml
index 68b36988..5f4afc5d 100644
--- a/templates/test-case/Cargo.toml
+++ b/templates/test-case/Cargo.toml
@@ -1,30 +1,30 @@
 [package]
+edition = "2021"
 name = "incrementor"
 version = "0.1.0"
-edition = "2021"
 
 [lib]
 crate-type = ["cdylib"]
 
 [dependencies]
-soroban-sdk = { version = "=20.0.0" }
+soroban-sdk = { version = "=21.4.0" }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { version = "=20.0.0", features = ["testutils"] }
 
 [features]
 testutils = ["soroban-sdk/testutils"]
 
 [profile.release]
-opt-level = "z"
-overflow-checks = true
+codegen-units = 1
 debug = 0
-strip = "symbols"
 debug-assertions = false
-panic = "abort"
-codegen-units = 1
 lto = true
+opt-level = "z"
+overflow-checks = true
+panic = "abort"
+strip = "symbols"
 
 [profile.release-with-logs]
+debug-assertions = true
 inherits = "release"
-debug-assertions = true
\ No newline at end of file
diff --git a/test-cases/assert-violation/Cargo.toml b/test-cases/assert-violation/Cargo.toml
index 319daf6b..4aa7883f 100644
--- a/test-cases/assert-violation/Cargo.toml
+++ b/test-cases/assert-violation/Cargo.toml
@@ -4,7 +4,7 @@ members = ["assert-violation-*/*"]
 resolver = "2"
 
 [workspace.dependencies]
-soroban-sdk = { version = "=20.0.0" }
+soroban-sdk = { version = "=21.4.0" }
 
 [profile.release]
 codegen-units = 1
diff --git a/test-cases/assert-violation/assert-violation-1/remediated-example/Cargo.toml b/test-cases/assert-violation/assert-violation-1/remediated-example/Cargo.toml
index aabfe5cc..59fad1e1 100644
--- a/test-cases/assert-violation/assert-violation-1/remediated-example/Cargo.toml
+++ b/test-cases/assert-violation/assert-violation-1/remediated-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/assert-violation/assert-violation-1/vulnerable-example/Cargo.toml b/test-cases/assert-violation/assert-violation-1/vulnerable-example/Cargo.toml
index b3931c94..75f77e38 100644
--- a/test-cases/assert-violation/assert-violation-1/vulnerable-example/Cargo.toml
+++ b/test-cases/assert-violation/assert-violation-1/vulnerable-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/avoid-core-mem-forget/Cargo.toml b/test-cases/avoid-core-mem-forget/Cargo.toml
index 0674889d..9858f1af 100644
--- a/test-cases/avoid-core-mem-forget/Cargo.toml
+++ b/test-cases/avoid-core-mem-forget/Cargo.toml
@@ -4,7 +4,7 @@ members = ["avoid-core-mem-forget-*/*"]
 resolver = "2"
 
 [workspace.dependencies]
-soroban-sdk = { version = "=20.0.0" }
+soroban-sdk = { version = "=21.4.0" }
 
 [profile.release]
 codegen-units = 1
diff --git a/test-cases/avoid-core-mem-forget/avoid-core-mem-forget-1/remediated-example/Cargo.toml b/test-cases/avoid-core-mem-forget/avoid-core-mem-forget-1/remediated-example/Cargo.toml
index d5b11867..36b50a6b 100644
--- a/test-cases/avoid-core-mem-forget/avoid-core-mem-forget-1/remediated-example/Cargo.toml
+++ b/test-cases/avoid-core-mem-forget/avoid-core-mem-forget-1/remediated-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/avoid-core-mem-forget/avoid-core-mem-forget-1/vulnerable-example/Cargo.toml b/test-cases/avoid-core-mem-forget/avoid-core-mem-forget-1/vulnerable-example/Cargo.toml
index 708b9a7f..aa9d8170 100644
--- a/test-cases/avoid-core-mem-forget/avoid-core-mem-forget-1/vulnerable-example/Cargo.toml
+++ b/test-cases/avoid-core-mem-forget/avoid-core-mem-forget-1/vulnerable-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/avoid-panic-error/Cargo.toml b/test-cases/avoid-panic-error/Cargo.toml
index 059f7eca..993a8540 100644
--- a/test-cases/avoid-panic-error/Cargo.toml
+++ b/test-cases/avoid-panic-error/Cargo.toml
@@ -4,7 +4,7 @@ members = ["avoid-panic-error-*/*"]
 resolver = "2"
 
 [workspace.dependencies]
-soroban-sdk = { version = "=20.0.0" }
+soroban-sdk = { version = "=21.4.0" }
 
 [profile.release]
 codegen-units = 1
diff --git a/test-cases/avoid-unsafe-block/Cargo.toml b/test-cases/avoid-unsafe-block/Cargo.toml
index 9abd5348..25ba830e 100644
--- a/test-cases/avoid-unsafe-block/Cargo.toml
+++ b/test-cases/avoid-unsafe-block/Cargo.toml
@@ -4,7 +4,7 @@ members = ["avoid-unsafe-block-*/*"]
 resolver = "2"
 
 [workspace.dependencies]
-soroban-sdk = { version = "=20.0.0" }
+soroban-sdk = { version = "=21.4.0" }
 
 [profile.release]
 codegen-units = 1
diff --git a/test-cases/avoid-unsafe-block/avoid-unsafe-block-1/remediated-example/Cargo.toml b/test-cases/avoid-unsafe-block/avoid-unsafe-block-1/remediated-example/Cargo.toml
index a88a04a5..1405b414 100644
--- a/test-cases/avoid-unsafe-block/avoid-unsafe-block-1/remediated-example/Cargo.toml
+++ b/test-cases/avoid-unsafe-block/avoid-unsafe-block-1/remediated-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/avoid-unsafe-block/avoid-unsafe-block-1/vulnerable-example/Cargo.toml b/test-cases/avoid-unsafe-block/avoid-unsafe-block-1/vulnerable-example/Cargo.toml
index 10b4b428..e29166a3 100644
--- a/test-cases/avoid-unsafe-block/avoid-unsafe-block-1/vulnerable-example/Cargo.toml
+++ b/test-cases/avoid-unsafe-block/avoid-unsafe-block-1/vulnerable-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/divide-before-multiply/Cargo.toml b/test-cases/divide-before-multiply/Cargo.toml
index 5b7f4963..c01e744c 100644
--- a/test-cases/divide-before-multiply/Cargo.toml
+++ b/test-cases/divide-before-multiply/Cargo.toml
@@ -4,7 +4,7 @@ members = ["divide-before-multiply-*/*"]
 resolver = "2"
 
 [workspace.dependencies]
-soroban-sdk = { version = "=20.0.0" }
+soroban-sdk = { version = "=21.4.0" }
 
 [profile.release]
 codegen-units = 1
diff --git a/test-cases/divide-before-multiply/divide-before-multiply-1/remediated-example/Cargo.toml b/test-cases/divide-before-multiply/divide-before-multiply-1/remediated-example/Cargo.toml
index da115e12..8885629d 100644
--- a/test-cases/divide-before-multiply/divide-before-multiply-1/remediated-example/Cargo.toml
+++ b/test-cases/divide-before-multiply/divide-before-multiply-1/remediated-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/divide-before-multiply/divide-before-multiply-1/vulnerable-example/Cargo.toml b/test-cases/divide-before-multiply/divide-before-multiply-1/vulnerable-example/Cargo.toml
index 993b2fcd..bbc78a0e 100644
--- a/test-cases/divide-before-multiply/divide-before-multiply-1/vulnerable-example/Cargo.toml
+++ b/test-cases/divide-before-multiply/divide-before-multiply-1/vulnerable-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/divide-before-multiply/divide-before-multiply-2/remediated-example/Cargo.toml b/test-cases/divide-before-multiply/divide-before-multiply-2/remediated-example/Cargo.toml
index 62d3e70d..1b167005 100644
--- a/test-cases/divide-before-multiply/divide-before-multiply-2/remediated-example/Cargo.toml
+++ b/test-cases/divide-before-multiply/divide-before-multiply-2/remediated-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/divide-before-multiply/divide-before-multiply-2/vulnerable-example/Cargo.toml b/test-cases/divide-before-multiply/divide-before-multiply-2/vulnerable-example/Cargo.toml
index f4f86234..3790a7f4 100644
--- a/test-cases/divide-before-multiply/divide-before-multiply-2/vulnerable-example/Cargo.toml
+++ b/test-cases/divide-before-multiply/divide-before-multiply-2/vulnerable-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/divide-before-multiply/divide-before-multiply-3/remediated-example/Cargo.toml b/test-cases/divide-before-multiply/divide-before-multiply-3/remediated-example/Cargo.toml
index d2d4bf42..f9a4347c 100644
--- a/test-cases/divide-before-multiply/divide-before-multiply-3/remediated-example/Cargo.toml
+++ b/test-cases/divide-before-multiply/divide-before-multiply-3/remediated-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/divide-before-multiply/divide-before-multiply-3/vulnerable-example/Cargo.toml b/test-cases/divide-before-multiply/divide-before-multiply-3/vulnerable-example/Cargo.toml
index 53955cb7..d767b9c2 100644
--- a/test-cases/divide-before-multiply/divide-before-multiply-3/vulnerable-example/Cargo.toml
+++ b/test-cases/divide-before-multiply/divide-before-multiply-3/vulnerable-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/dos-unbounded-operation/Cargo.toml b/test-cases/dos-unbounded-operation/Cargo.toml
index 68a4495c..3bbb7890 100644
--- a/test-cases/dos-unbounded-operation/Cargo.toml
+++ b/test-cases/dos-unbounded-operation/Cargo.toml
@@ -4,7 +4,7 @@ members = ["dos-unbounded-operation-*/*"]
 resolver = "2"
 
 [workspace.dependencies]
-soroban-sdk = { version = "=20.0.0" }
+soroban-sdk = { version = "=21.4.0" }
 
 [profile.release]
 codegen-units = 1
diff --git a/test-cases/dos-unbounded-operation/dos-unbounded-operation-1/remediated-example/Cargo.toml b/test-cases/dos-unbounded-operation/dos-unbounded-operation-1/remediated-example/Cargo.toml
index 73ad69c7..dd523254 100644
--- a/test-cases/dos-unbounded-operation/dos-unbounded-operation-1/remediated-example/Cargo.toml
+++ b/test-cases/dos-unbounded-operation/dos-unbounded-operation-1/remediated-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/dos-unbounded-operation/dos-unbounded-operation-1/vulnerable-example/Cargo.toml b/test-cases/dos-unbounded-operation/dos-unbounded-operation-1/vulnerable-example/Cargo.toml
index 8bdaff6a..8931f7b9 100644
--- a/test-cases/dos-unbounded-operation/dos-unbounded-operation-1/vulnerable-example/Cargo.toml
+++ b/test-cases/dos-unbounded-operation/dos-unbounded-operation-1/vulnerable-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/dos-unbounded-operation/dos-unbounded-operation-2/remediated-example/Cargo.toml b/test-cases/dos-unbounded-operation/dos-unbounded-operation-2/remediated-example/Cargo.toml
index cbe0904b..bf952193 100644
--- a/test-cases/dos-unbounded-operation/dos-unbounded-operation-2/remediated-example/Cargo.toml
+++ b/test-cases/dos-unbounded-operation/dos-unbounded-operation-2/remediated-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/dos-unbounded-operation/dos-unbounded-operation-2/vulnerable-example/Cargo.toml b/test-cases/dos-unbounded-operation/dos-unbounded-operation-2/vulnerable-example/Cargo.toml
index 328d643c..c9389757 100644
--- a/test-cases/dos-unbounded-operation/dos-unbounded-operation-2/vulnerable-example/Cargo.toml
+++ b/test-cases/dos-unbounded-operation/dos-unbounded-operation-2/vulnerable-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/dos-unbounded-operation/dos-unbounded-operation-3/remediated-example/Cargo.toml b/test-cases/dos-unbounded-operation/dos-unbounded-operation-3/remediated-example/Cargo.toml
index d0a065be..00e57279 100644
--- a/test-cases/dos-unbounded-operation/dos-unbounded-operation-3/remediated-example/Cargo.toml
+++ b/test-cases/dos-unbounded-operation/dos-unbounded-operation-3/remediated-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/dos-unbounded-operation/dos-unbounded-operation-3/vulnerable-example/Cargo.toml b/test-cases/dos-unbounded-operation/dos-unbounded-operation-3/vulnerable-example/Cargo.toml
index 37b1b363..09061798 100644
--- a/test-cases/dos-unbounded-operation/dos-unbounded-operation-3/vulnerable-example/Cargo.toml
+++ b/test-cases/dos-unbounded-operation/dos-unbounded-operation-3/vulnerable-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/dos-unexpected-revert-with-vector/Cargo.toml b/test-cases/dos-unexpected-revert-with-vector/Cargo.toml
index 82ef8b11..eb91610f 100644
--- a/test-cases/dos-unexpected-revert-with-vector/Cargo.toml
+++ b/test-cases/dos-unexpected-revert-with-vector/Cargo.toml
@@ -4,7 +4,7 @@ members = ["dos-unexpected-revert-with-vector-*/*"]
 resolver = "2"
 
 [workspace.dependencies]
-soroban-sdk = { version = "=20.0.0" }
+soroban-sdk = { version = "=21.4.0" }
 
 [profile.release]
 codegen-units = 1
@@ -19,4 +19,3 @@ strip = "symbols"
 [profile.release-with-logs]
 debug-assertions = true
 inherits = "release"
-
diff --git a/test-cases/dos-unexpected-revert-with-vector/dos-unexpected-revert-with-vector-1/remediated-example/Cargo.toml b/test-cases/dos-unexpected-revert-with-vector/dos-unexpected-revert-with-vector-1/remediated-example/Cargo.toml
index 6e8aa2ee..b6add2e2 100644
--- a/test-cases/dos-unexpected-revert-with-vector/dos-unexpected-revert-with-vector-1/remediated-example/Cargo.toml
+++ b/test-cases/dos-unexpected-revert-with-vector/dos-unexpected-revert-with-vector-1/remediated-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/dos-unexpected-revert-with-vector/dos-unexpected-revert-with-vector-1/vulnerable-example/Cargo.toml b/test-cases/dos-unexpected-revert-with-vector/dos-unexpected-revert-with-vector-1/vulnerable-example/Cargo.toml
index b0cf5914..17a671e2 100644
--- a/test-cases/dos-unexpected-revert-with-vector/dos-unexpected-revert-with-vector-1/vulnerable-example/Cargo.toml
+++ b/test-cases/dos-unexpected-revert-with-vector/dos-unexpected-revert-with-vector-1/vulnerable-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/dos-unexpected-revert-with-vector/dos-unexpected-revert-with-vector-2/remediated-example/Cargo.toml b/test-cases/dos-unexpected-revert-with-vector/dos-unexpected-revert-with-vector-2/remediated-example/Cargo.toml
index dad1352e..2c803be8 100644
--- a/test-cases/dos-unexpected-revert-with-vector/dos-unexpected-revert-with-vector-2/remediated-example/Cargo.toml
+++ b/test-cases/dos-unexpected-revert-with-vector/dos-unexpected-revert-with-vector-2/remediated-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/dos-unexpected-revert-with-vector/dos-unexpected-revert-with-vector-2/vulnerable-example/Cargo.toml b/test-cases/dos-unexpected-revert-with-vector/dos-unexpected-revert-with-vector-2/vulnerable-example/Cargo.toml
index c75916e5..c250d033 100644
--- a/test-cases/dos-unexpected-revert-with-vector/dos-unexpected-revert-with-vector-2/vulnerable-example/Cargo.toml
+++ b/test-cases/dos-unexpected-revert-with-vector/dos-unexpected-revert-with-vector-2/vulnerable-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/insufficiently-random-values/Cargo.toml b/test-cases/insufficiently-random-values/Cargo.toml
index a5301348..9433190f 100644
--- a/test-cases/insufficiently-random-values/Cargo.toml
+++ b/test-cases/insufficiently-random-values/Cargo.toml
@@ -4,7 +4,7 @@ members = ["insufficiently-random-values-*/*"]
 resolver = "2"
 
 [workspace.dependencies]
-soroban-sdk = { version = "=20.0.0" }
+soroban-sdk = { version = "=21.4.0" }
 
 [profile.release]
 codegen-units = 1
diff --git a/test-cases/insufficiently-random-values/insufficiently-random-values-1/remediated-example/Cargo.toml b/test-cases/insufficiently-random-values/insufficiently-random-values-1/remediated-example/Cargo.toml
index 30b385f4..372f0314 100644
--- a/test-cases/insufficiently-random-values/insufficiently-random-values-1/remediated-example/Cargo.toml
+++ b/test-cases/insufficiently-random-values/insufficiently-random-values-1/remediated-example/Cargo.toml
@@ -10,7 +10,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/insufficiently-random-values/insufficiently-random-values-1/vulnerable-example/Cargo.toml b/test-cases/insufficiently-random-values/insufficiently-random-values-1/vulnerable-example/Cargo.toml
index 8ce272af..72082073 100644
--- a/test-cases/insufficiently-random-values/insufficiently-random-values-1/vulnerable-example/Cargo.toml
+++ b/test-cases/insufficiently-random-values/insufficiently-random-values-1/vulnerable-example/Cargo.toml
@@ -10,7 +10,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/integer-overflow-or-underflow/Cargo.toml b/test-cases/integer-overflow-or-underflow/Cargo.toml
index ca2a186c..aa613703 100644
--- a/test-cases/integer-overflow-or-underflow/Cargo.toml
+++ b/test-cases/integer-overflow-or-underflow/Cargo.toml
@@ -4,7 +4,7 @@ members = ["integer-overflow-or-underflow-*/*"]
 resolver = "2"
 
 [workspace.dependencies]
-soroban-sdk = { version = "=21.3.0" }
+soroban-sdk = { version = "=21.4.0" }
 
 [profile.release]
 codegen-units = 1
diff --git a/test-cases/iterators-over-indexing/Cargo.toml b/test-cases/iterators-over-indexing/Cargo.toml
index a2ed9201..954db6ee 100644
--- a/test-cases/iterators-over-indexing/Cargo.toml
+++ b/test-cases/iterators-over-indexing/Cargo.toml
@@ -4,7 +4,7 @@ members = ["iterators-over-indexing-*/*"]
 resolver = "2"
 
 [workspace.dependencies]
-soroban-sdk = { version = "=20.0.0" }
+soroban-sdk = { version = "=21.4.0" }
 
 [profile.release]
 codegen-units = 1
diff --git a/test-cases/iterators-over-indexing/iterators-over-indexing-1/remediated-example/Cargo.toml b/test-cases/iterators-over-indexing/iterators-over-indexing-1/remediated-example/Cargo.toml
index 20b3cfbf..c695e832 100644
--- a/test-cases/iterators-over-indexing/iterators-over-indexing-1/remediated-example/Cargo.toml
+++ b/test-cases/iterators-over-indexing/iterators-over-indexing-1/remediated-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/iterators-over-indexing/iterators-over-indexing-1/vulnerable-example/Cargo.toml b/test-cases/iterators-over-indexing/iterators-over-indexing-1/vulnerable-example/Cargo.toml
index d03444a9..7ff5c9ba 100644
--- a/test-cases/iterators-over-indexing/iterators-over-indexing-1/vulnerable-example/Cargo.toml
+++ b/test-cases/iterators-over-indexing/iterators-over-indexing-1/vulnerable-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/overflow-check/overflow-check-1/remediated-example/Cargo.toml b/test-cases/overflow-check/overflow-check-1/remediated-example/Cargo.toml
index 891c0f22..2cf77abf 100644
--- a/test-cases/overflow-check/overflow-check-1/remediated-example/Cargo.toml
+++ b/test-cases/overflow-check/overflow-check-1/remediated-example/Cargo.toml
@@ -8,10 +8,10 @@ version = "0.1.0"
 crate-type = ["cdylib"]
 
 [dependencies]
-soroban-sdk = { version = "=20.0.0" }
+soroban-sdk = { version = "=21.4.0" }
 
-[dev_dependencies]
-soroban-sdk = { version = "=20.0.0", features = ["testutils"] }
+[dev-dependencies]
+soroban-sdk = { version = "=21.4.0", features = ["testutils"] }
 
 [features]
 testutils = ["soroban-sdk/testutils"]
diff --git a/test-cases/overflow-check/overflow-check-1/vulnerable-example/Cargo.toml b/test-cases/overflow-check/overflow-check-1/vulnerable-example/Cargo.toml
index 746527ea..51642a65 100644
--- a/test-cases/overflow-check/overflow-check-1/vulnerable-example/Cargo.toml
+++ b/test-cases/overflow-check/overflow-check-1/vulnerable-example/Cargo.toml
@@ -8,10 +8,10 @@ version = "0.1.0"
 crate-type = ["cdylib"]
 
 [dependencies]
-soroban-sdk = { version = "=20.0.0" }
+soroban-sdk = { version = "=21.4.0" }
 
-[dev_dependencies]
-soroban-sdk = { version = "=20.0.0", features = ["testutils"] }
+[dev-dependencies]
+soroban-sdk = { version = "=21.4.0", features = ["testutils"] }
 
 [features]
 testutils = ["soroban-sdk/testutils"]
diff --git a/test-cases/set-contract-storage/Cargo.toml b/test-cases/set-contract-storage/Cargo.toml
index 4ed17155..9b92dc23 100644
--- a/test-cases/set-contract-storage/Cargo.toml
+++ b/test-cases/set-contract-storage/Cargo.toml
@@ -4,7 +4,7 @@ members = ["set-contract-storage-*/*"]
 resolver = "2"
 
 [workspace.dependencies]
-soroban-sdk = { version = "=20.0.0" }
+soroban-sdk = { version = "=21.4.0" }
 
 [profile.release]
 codegen-units = 1
diff --git a/test-cases/set-contract-storage/set-contract-storage-1/remediated-example/Cargo.toml b/test-cases/set-contract-storage/set-contract-storage-1/remediated-example/Cargo.toml
index 2930db92..a509a7e1 100644
--- a/test-cases/set-contract-storage/set-contract-storage-1/remediated-example/Cargo.toml
+++ b/test-cases/set-contract-storage/set-contract-storage-1/remediated-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/set-contract-storage/set-contract-storage-1/vulnerable-example/Cargo.toml b/test-cases/set-contract-storage/set-contract-storage-1/vulnerable-example/Cargo.toml
index 48765b8c..cb945179 100644
--- a/test-cases/set-contract-storage/set-contract-storage-1/vulnerable-example/Cargo.toml
+++ b/test-cases/set-contract-storage/set-contract-storage-1/vulnerable-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/set-contract-storage/set-contract-storage-2/remediated-example/Cargo.toml b/test-cases/set-contract-storage/set-contract-storage-2/remediated-example/Cargo.toml
index 469bce4b..cf9972e9 100644
--- a/test-cases/set-contract-storage/set-contract-storage-2/remediated-example/Cargo.toml
+++ b/test-cases/set-contract-storage/set-contract-storage-2/remediated-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/set-contract-storage/set-contract-storage-2/vulnerable-example/Cargo.toml b/test-cases/set-contract-storage/set-contract-storage-2/vulnerable-example/Cargo.toml
index e588c294..778964f1 100644
--- a/test-cases/set-contract-storage/set-contract-storage-2/vulnerable-example/Cargo.toml
+++ b/test-cases/set-contract-storage/set-contract-storage-2/vulnerable-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/set-contract-storage/set-contract-storage-3/remediated-example/Cargo.toml b/test-cases/set-contract-storage/set-contract-storage-3/remediated-example/Cargo.toml
index bde6f22d..27f877b8 100644
--- a/test-cases/set-contract-storage/set-contract-storage-3/remediated-example/Cargo.toml
+++ b/test-cases/set-contract-storage/set-contract-storage-3/remediated-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/set-contract-storage/set-contract-storage-3/vulnerable-example/Cargo.toml b/test-cases/set-contract-storage/set-contract-storage-3/vulnerable-example/Cargo.toml
index 74b35b64..979457e7 100644
--- a/test-cases/set-contract-storage/set-contract-storage-3/vulnerable-example/Cargo.toml
+++ b/test-cases/set-contract-storage/set-contract-storage-3/vulnerable-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/set-contract-storage/set-contract-storage-4/remediated-example/Cargo.toml b/test-cases/set-contract-storage/set-contract-storage-4/remediated-example/Cargo.toml
index 6a6f8e4f..d8bc3007 100644
--- a/test-cases/set-contract-storage/set-contract-storage-4/remediated-example/Cargo.toml
+++ b/test-cases/set-contract-storage/set-contract-storage-4/remediated-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/set-contract-storage/set-contract-storage-4/vulnerable-example/Cargo.toml b/test-cases/set-contract-storage/set-contract-storage-4/vulnerable-example/Cargo.toml
index 2e010c67..59c47d45 100644
--- a/test-cases/set-contract-storage/set-contract-storage-4/vulnerable-example/Cargo.toml
+++ b/test-cases/set-contract-storage/set-contract-storage-4/vulnerable-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/soroban-version/soroban-version-1/remediated-example/Cargo.toml b/test-cases/soroban-version/soroban-version-1/remediated-example/Cargo.toml
index b82bc0ab..1b1850f3 100644
--- a/test-cases/soroban-version/soroban-version-1/remediated-example/Cargo.toml
+++ b/test-cases/soroban-version/soroban-version-1/remediated-example/Cargo.toml
@@ -7,10 +7,24 @@ version = "0.1.0"
 crate-type = ["cdylib"]
 
 [dependencies]
-soroban-sdk = { workspace = true }
+soroban-sdk = { version = "=21.4.0" }
 
-[dev_dependencies]
-soroban-sdk = { workspace = true, features = ["testutils"] }
+[dev-dependencies]
+soroban-sdk = { version = "=21.4.0", features = ["testutils"] }
 
 [features]
 testutils = ["soroban-sdk/testutils"]
+
+[profile.release]
+codegen-units = 1
+debug = 0
+debug-assertions = false
+lto = true
+opt-level = "z"
+overflow-checks = false
+panic = "abort"
+strip = "symbols"
+
+[profile.release-with-logs]
+debug-assertions = true
+inherits = "release"
diff --git a/test-cases/soroban-version/soroban-version-1/vulnerable-example/Cargo.toml b/test-cases/soroban-version/soroban-version-1/vulnerable-example/Cargo.toml
index 9d9efe06..c91f53e8 100644
--- a/test-cases/soroban-version/soroban-version-1/vulnerable-example/Cargo.toml
+++ b/test-cases/soroban-version/soroban-version-1/vulnerable-example/Cargo.toml
@@ -7,10 +7,24 @@ version = "0.1.0"
 crate-type = ["cdylib"]
 
 [dependencies]
-soroban-sdk = { workspace = true }
+soroban-sdk = { version = "=20.0.0" }
 
-[dev_dependencies]
-soroban-sdk = { workspace = true, features = ["testutils"] }
+[dev-dependencies]
+soroban-sdk = { version = "=20.0.0", features = ["testutils"] }
 
 [features]
 testutils = ["soroban-sdk/testutils"]
+
+[profile.release]
+codegen-units = 1
+debug = 0
+debug-assertions = false
+lto = true
+opt-level = "z"
+overflow-checks = false
+panic = "abort"
+strip = "symbols"
+
+[profile.release-with-logs]
+debug-assertions = true
+inherits = "release"
diff --git a/test-cases/unprotected-mapping-operation/Cargo.toml b/test-cases/unprotected-mapping-operation/Cargo.toml
index 46ee0cfb..42594604 100644
--- a/test-cases/unprotected-mapping-operation/Cargo.toml
+++ b/test-cases/unprotected-mapping-operation/Cargo.toml
@@ -4,7 +4,7 @@ members = ["unprotected-mapping-operation-*/*"]
 resolver = "2"
 
 [workspace.dependencies]
-soroban-sdk = { version = "=20.0.0" }
+soroban-sdk = { version = "=21.4.0" }
 
 [profile.release]
 codegen-units = 1
diff --git a/test-cases/unprotected-mapping-operation/unprotected-mapping-operation-1/remediated-example/Cargo.toml b/test-cases/unprotected-mapping-operation/unprotected-mapping-operation-1/remediated-example/Cargo.toml
index 65936dfe..65cc731b 100644
--- a/test-cases/unprotected-mapping-operation/unprotected-mapping-operation-1/remediated-example/Cargo.toml
+++ b/test-cases/unprotected-mapping-operation/unprotected-mapping-operation-1/remediated-example/Cargo.toml
@@ -10,7 +10,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unprotected-mapping-operation/unprotected-mapping-operation-1/vulnerable-example/Cargo.toml b/test-cases/unprotected-mapping-operation/unprotected-mapping-operation-1/vulnerable-example/Cargo.toml
index f4dd6328..45430a49 100644
--- a/test-cases/unprotected-mapping-operation/unprotected-mapping-operation-1/vulnerable-example/Cargo.toml
+++ b/test-cases/unprotected-mapping-operation/unprotected-mapping-operation-1/vulnerable-example/Cargo.toml
@@ -10,7 +10,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unprotected-mapping-operation/unprotected-mapping-operation-2/remediated-example/Cargo.toml b/test-cases/unprotected-mapping-operation/unprotected-mapping-operation-2/remediated-example/Cargo.toml
index fae91814..82350199 100644
--- a/test-cases/unprotected-mapping-operation/unprotected-mapping-operation-2/remediated-example/Cargo.toml
+++ b/test-cases/unprotected-mapping-operation/unprotected-mapping-operation-2/remediated-example/Cargo.toml
@@ -10,7 +10,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unprotected-mapping-operation/unprotected-mapping-operation-2/vulnerable-example/Cargo.toml b/test-cases/unprotected-mapping-operation/unprotected-mapping-operation-2/vulnerable-example/Cargo.toml
index f3b66e08..a8441538 100644
--- a/test-cases/unprotected-mapping-operation/unprotected-mapping-operation-2/vulnerable-example/Cargo.toml
+++ b/test-cases/unprotected-mapping-operation/unprotected-mapping-operation-2/vulnerable-example/Cargo.toml
@@ -10,7 +10,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unprotected-update-current-contract-wasm/Cargo.toml b/test-cases/unprotected-update-current-contract-wasm/Cargo.toml
index 399bb063..e6c34a02 100644
--- a/test-cases/unprotected-update-current-contract-wasm/Cargo.toml
+++ b/test-cases/unprotected-update-current-contract-wasm/Cargo.toml
@@ -4,7 +4,7 @@ members = ["unprotected-update-current-contract-wasm-*/*"]
 resolver = "2"
 
 [workspace.dependencies]
-soroban-sdk = { version = "=20.0.0" }
+soroban-sdk = { version = "=21.4.0" }
 
 [profile.release]
 codegen-units = 1
diff --git a/test-cases/unprotected-update-current-contract-wasm/unprotected-update-current-contract-wasm-1/remediated-example/Cargo.toml b/test-cases/unprotected-update-current-contract-wasm/unprotected-update-current-contract-wasm-1/remediated-example/Cargo.toml
index 4c498c24..86bf0c36 100644
--- a/test-cases/unprotected-update-current-contract-wasm/unprotected-update-current-contract-wasm-1/remediated-example/Cargo.toml
+++ b/test-cases/unprotected-update-current-contract-wasm/unprotected-update-current-contract-wasm-1/remediated-example/Cargo.toml
@@ -10,7 +10,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unprotected-update-current-contract-wasm/unprotected-update-current-contract-wasm-1/vulnerable-example/Cargo.toml b/test-cases/unprotected-update-current-contract-wasm/unprotected-update-current-contract-wasm-1/vulnerable-example/Cargo.toml
index 23a69ea8..3d281549 100644
--- a/test-cases/unprotected-update-current-contract-wasm/unprotected-update-current-contract-wasm-1/vulnerable-example/Cargo.toml
+++ b/test-cases/unprotected-update-current-contract-wasm/unprotected-update-current-contract-wasm-1/vulnerable-example/Cargo.toml
@@ -10,7 +10,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unprotected-update-current-contract-wasm/unprotected-update-current-contract-wasm-2/remediated-example/Cargo.toml b/test-cases/unprotected-update-current-contract-wasm/unprotected-update-current-contract-wasm-2/remediated-example/Cargo.toml
index e4ba18f1..f45b234e 100644
--- a/test-cases/unprotected-update-current-contract-wasm/unprotected-update-current-contract-wasm-2/remediated-example/Cargo.toml
+++ b/test-cases/unprotected-update-current-contract-wasm/unprotected-update-current-contract-wasm-2/remediated-example/Cargo.toml
@@ -8,24 +8,10 @@ version = "0.1.0"
 crate-type = ["cdylib"]
 
 [dependencies]
-soroban-sdk = "=20.0.0"
+soroban-sdk = { workspace = true }
 
-[dev_dependencies]
-soroban-sdk = { version = "=20.0.0", features = ["testutils"] }
+[dev-dependencies]
+soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
 testutils = ["soroban-sdk/testutils"]
-
-[profile.release]
-codegen-units = 1
-debug = 0
-debug-assertions = false
-lto = true
-opt-level = "z"
-overflow-checks = true
-panic = "abort"
-strip = "symbols"
-
-[profile.release-with-logs]
-debug-assertions = true
-inherits = "release"
diff --git a/test-cases/unprotected-update-current-contract-wasm/unprotected-update-current-contract-wasm-2/vulnerable-example/Cargo.toml b/test-cases/unprotected-update-current-contract-wasm/unprotected-update-current-contract-wasm-2/vulnerable-example/Cargo.toml
index d4d5390d..58531b62 100644
--- a/test-cases/unprotected-update-current-contract-wasm/unprotected-update-current-contract-wasm-2/vulnerable-example/Cargo.toml
+++ b/test-cases/unprotected-update-current-contract-wasm/unprotected-update-current-contract-wasm-2/vulnerable-example/Cargo.toml
@@ -8,24 +8,10 @@ version = "0.1.0"
 crate-type = ["cdylib"]
 
 [dependencies]
-soroban-sdk = "=20.0.0"
+soroban-sdk = { workspace = true }
 
-[dev_dependencies]
-soroban-sdk = { version = "=20.0.0", features = ["testutils"] }
+[dev-dependencies]
+soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
 testutils = ["soroban-sdk/testutils"]
-
-[profile.release]
-codegen-units = 1
-debug = 0
-debug-assertions = false
-lto = true
-opt-level = "z"
-overflow-checks = true
-panic = "abort"
-strip = "symbols"
-
-[profile.release-with-logs]
-debug-assertions = true
-inherits = "release"
diff --git a/test-cases/unrestricted-transfer-from/Cargo.toml b/test-cases/unrestricted-transfer-from/Cargo.toml
index 4e7e2772..54f81f26 100644
--- a/test-cases/unrestricted-transfer-from/Cargo.toml
+++ b/test-cases/unrestricted-transfer-from/Cargo.toml
@@ -4,7 +4,7 @@ members = ["unrestricted-transfer-from-*/*"]
 resolver = "2"
 
 [workspace.dependencies]
-soroban-sdk = { version = "=20.0.0" }
+soroban-sdk = { version = "=21.4.0" }
 
 [profile.release]
 codegen-units = 1
@@ -19,4 +19,3 @@ strip = "symbols"
 [profile.release-with-logs]
 debug-assertions = true
 inherits = "release"
-
diff --git a/test-cases/unrestricted-transfer-from/unrestricted-transfer-from-1/remediated-example/Cargo.toml b/test-cases/unrestricted-transfer-from/unrestricted-transfer-from-1/remediated-example/Cargo.toml
index 6ccfb57a..e70c19a0 100644
--- a/test-cases/unrestricted-transfer-from/unrestricted-transfer-from-1/remediated-example/Cargo.toml
+++ b/test-cases/unrestricted-transfer-from/unrestricted-transfer-from-1/remediated-example/Cargo.toml
@@ -9,9 +9,8 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
 testutils = ["soroban-sdk/testutils"]
-
diff --git a/test-cases/unrestricted-transfer-from/unrestricted-transfer-from-1/vulnerable-example/Cargo.toml b/test-cases/unrestricted-transfer-from/unrestricted-transfer-from-1/vulnerable-example/Cargo.toml
index faed6751..3681345f 100644
--- a/test-cases/unrestricted-transfer-from/unrestricted-transfer-from-1/vulnerable-example/Cargo.toml
+++ b/test-cases/unrestricted-transfer-from/unrestricted-transfer-from-1/vulnerable-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unsafe-expect/Cargo.toml b/test-cases/unsafe-expect/Cargo.toml
index a163f8ba..d220ab60 100644
--- a/test-cases/unsafe-expect/Cargo.toml
+++ b/test-cases/unsafe-expect/Cargo.toml
@@ -4,7 +4,7 @@ members = ["unsafe-expect-*/*"]
 resolver = "2"
 
 [workspace.dependencies]
-soroban-sdk = { version = "=20.0.0" }
+soroban-sdk = { version = "=21.4.0" }
 
 [profile.release]
 codegen-units = 1
diff --git a/test-cases/unsafe-expect/unsafe-expect-1/remediated-example/Cargo.toml b/test-cases/unsafe-expect/unsafe-expect-1/remediated-example/Cargo.toml
index dfd4e0d9..0e7ebf63 100644
--- a/test-cases/unsafe-expect/unsafe-expect-1/remediated-example/Cargo.toml
+++ b/test-cases/unsafe-expect/unsafe-expect-1/remediated-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unsafe-expect/unsafe-expect-1/vulnerable-example/Cargo.toml b/test-cases/unsafe-expect/unsafe-expect-1/vulnerable-example/Cargo.toml
index 6268a10d..7405854d 100644
--- a/test-cases/unsafe-expect/unsafe-expect-1/vulnerable-example/Cargo.toml
+++ b/test-cases/unsafe-expect/unsafe-expect-1/vulnerable-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unsafe-expect/unsafe-expect-2/remediated-example/Cargo.toml b/test-cases/unsafe-expect/unsafe-expect-2/remediated-example/Cargo.toml
index 74d9f3c5..ad51b084 100644
--- a/test-cases/unsafe-expect/unsafe-expect-2/remediated-example/Cargo.toml
+++ b/test-cases/unsafe-expect/unsafe-expect-2/remediated-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unsafe-expect/unsafe-expect-2/vulnerable-example/Cargo.toml b/test-cases/unsafe-expect/unsafe-expect-2/vulnerable-example/Cargo.toml
index c1025367..931400c0 100644
--- a/test-cases/unsafe-expect/unsafe-expect-2/vulnerable-example/Cargo.toml
+++ b/test-cases/unsafe-expect/unsafe-expect-2/vulnerable-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unsafe-expect/unsafe-expect-3/remediated-example/Cargo.toml b/test-cases/unsafe-expect/unsafe-expect-3/remediated-example/Cargo.toml
index 47be8699..0a3cea87 100644
--- a/test-cases/unsafe-expect/unsafe-expect-3/remediated-example/Cargo.toml
+++ b/test-cases/unsafe-expect/unsafe-expect-3/remediated-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unsafe-expect/unsafe-expect-3/vulnerable-example/Cargo.toml b/test-cases/unsafe-expect/unsafe-expect-3/vulnerable-example/Cargo.toml
index 37d22468..8d5efe1a 100644
--- a/test-cases/unsafe-expect/unsafe-expect-3/vulnerable-example/Cargo.toml
+++ b/test-cases/unsafe-expect/unsafe-expect-3/vulnerable-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unsafe-expect/unsafe-expect-4/remediated-example/Cargo.toml b/test-cases/unsafe-expect/unsafe-expect-4/remediated-example/Cargo.toml
index 610f6d0f..afc51b55 100644
--- a/test-cases/unsafe-expect/unsafe-expect-4/remediated-example/Cargo.toml
+++ b/test-cases/unsafe-expect/unsafe-expect-4/remediated-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unsafe-expect/unsafe-expect-4/vulnerable-example/Cargo.toml b/test-cases/unsafe-expect/unsafe-expect-4/vulnerable-example/Cargo.toml
index f84637e9..6769c822 100644
--- a/test-cases/unsafe-expect/unsafe-expect-4/vulnerable-example/Cargo.toml
+++ b/test-cases/unsafe-expect/unsafe-expect-4/vulnerable-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unsafe-expect/unsafe-expect-5/remediated-example/Cargo.toml b/test-cases/unsafe-expect/unsafe-expect-5/remediated-example/Cargo.toml
index 5f3f6c12..12b58fa9 100644
--- a/test-cases/unsafe-expect/unsafe-expect-5/remediated-example/Cargo.toml
+++ b/test-cases/unsafe-expect/unsafe-expect-5/remediated-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unsafe-expect/unsafe-expect-5/vulnerable-example/Cargo.toml b/test-cases/unsafe-expect/unsafe-expect-5/vulnerable-example/Cargo.toml
index 7dd2b61c..11b84d96 100644
--- a/test-cases/unsafe-expect/unsafe-expect-5/vulnerable-example/Cargo.toml
+++ b/test-cases/unsafe-expect/unsafe-expect-5/vulnerable-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unsafe-map-get/Cargo.toml b/test-cases/unsafe-map-get/Cargo.toml
index efc07045..3a88faaa 100644
--- a/test-cases/unsafe-map-get/Cargo.toml
+++ b/test-cases/unsafe-map-get/Cargo.toml
@@ -4,7 +4,7 @@ members = ["unsafe-map-get-*/*"]
 resolver = "2"
 
 [workspace.dependencies]
-soroban-sdk = { version = "=20.0.0" }
+soroban-sdk = { version = "=21.4.0" }
 
 [profile.release]
 codegen-units = 1
diff --git a/test-cases/unsafe-map-get/unsafe-map-get-1/remediated-example/Cargo.toml b/test-cases/unsafe-map-get/unsafe-map-get-1/remediated-example/Cargo.toml
index c70637a3..75c99c5e 100644
--- a/test-cases/unsafe-map-get/unsafe-map-get-1/remediated-example/Cargo.toml
+++ b/test-cases/unsafe-map-get/unsafe-map-get-1/remediated-example/Cargo.toml
@@ -10,7 +10,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unsafe-map-get/unsafe-map-get-1/vulnerable-example/Cargo.toml b/test-cases/unsafe-map-get/unsafe-map-get-1/vulnerable-example/Cargo.toml
index 5c661412..da6ae429 100644
--- a/test-cases/unsafe-map-get/unsafe-map-get-1/vulnerable-example/Cargo.toml
+++ b/test-cases/unsafe-map-get/unsafe-map-get-1/vulnerable-example/Cargo.toml
@@ -10,7 +10,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unsafe-unwrap/Cargo.toml b/test-cases/unsafe-unwrap/Cargo.toml
index d7b45aae..6c67b435 100644
--- a/test-cases/unsafe-unwrap/Cargo.toml
+++ b/test-cases/unsafe-unwrap/Cargo.toml
@@ -4,7 +4,7 @@ members = ["unsafe-unwrap-*/*"]
 resolver = "2"
 
 [workspace.dependencies]
-soroban-sdk = { version = "=20.0.0" }
+soroban-sdk = { version = "=21.4.0" }
 
 [profile.release]
 codegen-units = 1
diff --git a/test-cases/unsafe-unwrap/unsafe-unwrap-1/remediated-example/Cargo.toml b/test-cases/unsafe-unwrap/unsafe-unwrap-1/remediated-example/Cargo.toml
index a33b76ee..0ec7d07d 100644
--- a/test-cases/unsafe-unwrap/unsafe-unwrap-1/remediated-example/Cargo.toml
+++ b/test-cases/unsafe-unwrap/unsafe-unwrap-1/remediated-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unsafe-unwrap/unsafe-unwrap-1/vulnerable-example/Cargo.toml b/test-cases/unsafe-unwrap/unsafe-unwrap-1/vulnerable-example/Cargo.toml
index 42f74d39..efd522fb 100644
--- a/test-cases/unsafe-unwrap/unsafe-unwrap-1/vulnerable-example/Cargo.toml
+++ b/test-cases/unsafe-unwrap/unsafe-unwrap-1/vulnerable-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unsafe-unwrap/unsafe-unwrap-2/remediated-example/Cargo.toml b/test-cases/unsafe-unwrap/unsafe-unwrap-2/remediated-example/Cargo.toml
index bb0d0f36..5fd2052e 100644
--- a/test-cases/unsafe-unwrap/unsafe-unwrap-2/remediated-example/Cargo.toml
+++ b/test-cases/unsafe-unwrap/unsafe-unwrap-2/remediated-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unsafe-unwrap/unsafe-unwrap-2/vulnerable-example/Cargo.toml b/test-cases/unsafe-unwrap/unsafe-unwrap-2/vulnerable-example/Cargo.toml
index 32ba2f01..2bb1b256 100644
--- a/test-cases/unsafe-unwrap/unsafe-unwrap-2/vulnerable-example/Cargo.toml
+++ b/test-cases/unsafe-unwrap/unsafe-unwrap-2/vulnerable-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unsafe-unwrap/unsafe-unwrap-3/remediated-example/Cargo.toml b/test-cases/unsafe-unwrap/unsafe-unwrap-3/remediated-example/Cargo.toml
index 52be41f1..e1d600fa 100644
--- a/test-cases/unsafe-unwrap/unsafe-unwrap-3/remediated-example/Cargo.toml
+++ b/test-cases/unsafe-unwrap/unsafe-unwrap-3/remediated-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unsafe-unwrap/unsafe-unwrap-3/vulnerable-example/Cargo.toml b/test-cases/unsafe-unwrap/unsafe-unwrap-3/vulnerable-example/Cargo.toml
index 6570b63c..3d61879e 100644
--- a/test-cases/unsafe-unwrap/unsafe-unwrap-3/vulnerable-example/Cargo.toml
+++ b/test-cases/unsafe-unwrap/unsafe-unwrap-3/vulnerable-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unsafe-unwrap/unsafe-unwrap-4/remediated-example/Cargo.toml b/test-cases/unsafe-unwrap/unsafe-unwrap-4/remediated-example/Cargo.toml
index f583d6b1..1b913f69 100644
--- a/test-cases/unsafe-unwrap/unsafe-unwrap-4/remediated-example/Cargo.toml
+++ b/test-cases/unsafe-unwrap/unsafe-unwrap-4/remediated-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unsafe-unwrap/unsafe-unwrap-4/vulnerable-example/Cargo.toml b/test-cases/unsafe-unwrap/unsafe-unwrap-4/vulnerable-example/Cargo.toml
index 06bbb0c3..473a4853 100644
--- a/test-cases/unsafe-unwrap/unsafe-unwrap-4/vulnerable-example/Cargo.toml
+++ b/test-cases/unsafe-unwrap/unsafe-unwrap-4/vulnerable-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unsafe-unwrap/unsafe-unwrap-5/remediated-example/Cargo.toml b/test-cases/unsafe-unwrap/unsafe-unwrap-5/remediated-example/Cargo.toml
index 0b51ce12..dfa84315 100644
--- a/test-cases/unsafe-unwrap/unsafe-unwrap-5/remediated-example/Cargo.toml
+++ b/test-cases/unsafe-unwrap/unsafe-unwrap-5/remediated-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unsafe-unwrap/unsafe-unwrap-5/vulnerable-example/Cargo.toml b/test-cases/unsafe-unwrap/unsafe-unwrap-5/vulnerable-example/Cargo.toml
index 5af85e08..916ac985 100644
--- a/test-cases/unsafe-unwrap/unsafe-unwrap-5/vulnerable-example/Cargo.toml
+++ b/test-cases/unsafe-unwrap/unsafe-unwrap-5/vulnerable-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unsafe-unwrap/unsafe-unwrap-6/remediated-example/Cargo.toml b/test-cases/unsafe-unwrap/unsafe-unwrap-6/remediated-example/Cargo.toml
index 32e823c1..82d8f95b 100644
--- a/test-cases/unsafe-unwrap/unsafe-unwrap-6/remediated-example/Cargo.toml
+++ b/test-cases/unsafe-unwrap/unsafe-unwrap-6/remediated-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unsafe-unwrap/unsafe-unwrap-6/vulnerable-example/Cargo.toml b/test-cases/unsafe-unwrap/unsafe-unwrap-6/vulnerable-example/Cargo.toml
index b09b504d..b29afba1 100644
--- a/test-cases/unsafe-unwrap/unsafe-unwrap-6/vulnerable-example/Cargo.toml
+++ b/test-cases/unsafe-unwrap/unsafe-unwrap-6/vulnerable-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unused-return-enum/Cargo.toml b/test-cases/unused-return-enum/Cargo.toml
index f5202497..08340fe4 100644
--- a/test-cases/unused-return-enum/Cargo.toml
+++ b/test-cases/unused-return-enum/Cargo.toml
@@ -4,7 +4,7 @@ members = ["unused-return-enum-*/*"]
 resolver = "2"
 
 [workspace.dependencies]
-soroban-sdk = { version = "=20.0.0" }
+soroban-sdk = { version = "=21.4.0" }
 
 [profile.release]
 codegen-units = 1
diff --git a/test-cases/unused-return-enum/unused-return-enum-1/remediated-example/Cargo.toml b/test-cases/unused-return-enum/unused-return-enum-1/remediated-example/Cargo.toml
index 80a5dec2..8446627a 100644
--- a/test-cases/unused-return-enum/unused-return-enum-1/remediated-example/Cargo.toml
+++ b/test-cases/unused-return-enum/unused-return-enum-1/remediated-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unused-return-enum/unused-return-enum-1/vulnerable-example/Cargo.toml b/test-cases/unused-return-enum/unused-return-enum-1/vulnerable-example/Cargo.toml
index 529f902f..fd1739bd 100644
--- a/test-cases/unused-return-enum/unused-return-enum-1/vulnerable-example/Cargo.toml
+++ b/test-cases/unused-return-enum/unused-return-enum-1/vulnerable-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unused-return-enum/unused-return-enum-2/remediated-example/Cargo.toml b/test-cases/unused-return-enum/unused-return-enum-2/remediated-example/Cargo.toml
index 01337627..1dd7140f 100644
--- a/test-cases/unused-return-enum/unused-return-enum-2/remediated-example/Cargo.toml
+++ b/test-cases/unused-return-enum/unused-return-enum-2/remediated-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/unused-return-enum/unused-return-enum-2/vulnerable-example/Cargo.toml b/test-cases/unused-return-enum/unused-return-enum-2/vulnerable-example/Cargo.toml
index d0496327..a9ac9fe0 100644
--- a/test-cases/unused-return-enum/unused-return-enum-2/vulnerable-example/Cargo.toml
+++ b/test-cases/unused-return-enum/unused-return-enum-2/vulnerable-example/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [features]
diff --git a/test-cases/vec-could-be-mapping/Cargo.toml b/test-cases/vec-could-be-mapping/Cargo.toml
new file mode 100644
index 00000000..c105dde9
--- /dev/null
+++ b/test-cases/vec-could-be-mapping/Cargo.toml
@@ -0,0 +1,21 @@
+[workspace]
+exclude = [".cargo", "target"]
+members = ["vec-could-be-mapping-*/*"]
+resolver = "2"
+
+[workspace.dependencies]
+soroban-sdk = { version = "=21.4.0" }
+
+[profile.release]
+codegen-units = 1
+debug = 0
+debug-assertions = false
+lto = true
+opt-level = "z"
+overflow-checks = true
+panic = "abort"
+strip = "symbols"
+
+[profile.release-with-logs]
+debug-assertions = true
+inherits = "release"
diff --git a/test-cases/vec-could-be-mapping/vec-could-be-mapping-1/remediated-example/Cargo.toml b/test-cases/vec-could-be-mapping/vec-could-be-mapping-1/remediated-example/Cargo.toml
index 8d726cb7..1af4e7bb 100644
--- a/test-cases/vec-could-be-mapping/vec-could-be-mapping-1/remediated-example/Cargo.toml
+++ b/test-cases/vec-could-be-mapping/vec-could-be-mapping-1/remediated-example/Cargo.toml
@@ -1,30 +1,16 @@
 [package]
+edition = "2021"
 name = "vec-could-be-mapping-remediated-1"
 version = "0.1.0"
-edition = "2021"
 
 [lib]
 crate-type = ["cdylib"]
 
 [dependencies]
-soroban-sdk = "20.0.0-rc2"
+soroban-sdk = { workspace = true }
 
-[dev_dependencies]
-soroban-sdk = { version = "=20.0.0", features = ["testutils"] }
+[dev-dependencies]
+soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [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
\ No newline at end of file
diff --git a/test-cases/vec-could-be-mapping/vec-could-be-mapping-1/remediated-example/rust-toolchain b/test-cases/vec-could-be-mapping/vec-could-be-mapping-1/remediated-example/rust-toolchain
deleted file mode 100644
index 8811e92c..00000000
--- a/test-cases/vec-could-be-mapping/vec-could-be-mapping-1/remediated-example/rust-toolchain
+++ /dev/null
@@ -1,3 +0,0 @@
-[toolchain]
-channel = "nightly-2023-09-29"
-components = ["llvm-tools-preview", "rustc-dev"]
diff --git a/test-cases/vec-could-be-mapping/vec-could-be-mapping-1/vulnerable-example/Cargo.toml b/test-cases/vec-could-be-mapping/vec-could-be-mapping-1/vulnerable-example/Cargo.toml
index f6d61396..4ba1dbdc 100644
--- a/test-cases/vec-could-be-mapping/vec-could-be-mapping-1/vulnerable-example/Cargo.toml
+++ b/test-cases/vec-could-be-mapping/vec-could-be-mapping-1/vulnerable-example/Cargo.toml
@@ -1,30 +1,16 @@
 [package]
+edition = "2021"
 name = "vec-could-be-mapping-vulnerable-1"
 version = "0.1.0"
-edition = "2021"
 
 [lib]
 crate-type = ["cdylib"]
 
 [dependencies]
-soroban-sdk = "20.0.0-rc2"
+soroban-sdk = { workspace = true }
 
-[dev_dependencies]
-soroban-sdk = { version = "=20.0.0", features = ["testutils"] }
+[dev-dependencies]
+soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [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
\ No newline at end of file
diff --git a/test-cases/vec-could-be-mapping/vec-could-be-mapping-1/vulnerable-example/rust-toolchain b/test-cases/vec-could-be-mapping/vec-could-be-mapping-1/vulnerable-example/rust-toolchain
deleted file mode 100644
index 8811e92c..00000000
--- a/test-cases/vec-could-be-mapping/vec-could-be-mapping-1/vulnerable-example/rust-toolchain
+++ /dev/null
@@ -1,3 +0,0 @@
-[toolchain]
-channel = "nightly-2023-09-29"
-components = ["llvm-tools-preview", "rustc-dev"]
diff --git a/test-cases/soroban-version/Cargo.toml b/test-cases/zero-address/Cargo.toml
similarity index 81%
rename from test-cases/soroban-version/Cargo.toml
rename to test-cases/zero-address/Cargo.toml
index de5686c5..cedd9259 100644
--- a/test-cases/soroban-version/Cargo.toml
+++ b/test-cases/zero-address/Cargo.toml
@@ -1,10 +1,10 @@
 [workspace]
 exclude = [".cargo", "target"]
-members = ["soroban-version-*/*"]
+members = ["zero-address-*/*"]
 resolver = "2"
 
 [workspace.dependencies]
-soroban-sdk = { version = "=20.0.0" }
+soroban-sdk = { version = "=21.4.0" }
 
 [profile.release]
 codegen-units = 1
diff --git a/test-cases/zero-address/zero-address-1/remediated-example/Cargo.toml b/test-cases/zero-address/zero-address-1/remediated-example/Cargo.toml
index 7694d9af..3a1c35b8 100644
--- a/test-cases/zero-address/zero-address-1/remediated-example/Cargo.toml
+++ b/test-cases/zero-address/zero-address-1/remediated-example/Cargo.toml
@@ -1,30 +1,16 @@
 [package]
+edition = "2021"
 name = "zero-address-remediated-1"
 version = "0.1.0"
-edition = "2021"
 
 [lib]
 crate-type = ["cdylib"]
 
 [dependencies]
-soroban-sdk = "20.0.0-rc2"
+soroban-sdk = { workspace = true }
 
-[dev_dependencies]
-soroban-sdk = { version = "=20.0.0", features = ["testutils"] }
+[dev-dependencies]
+soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [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
\ No newline at end of file
diff --git a/test-cases/zero-address/zero-address-1/remediated-example/rust-toolchain b/test-cases/zero-address/zero-address-1/remediated-example/rust-toolchain
deleted file mode 100644
index 8811e92c..00000000
--- a/test-cases/zero-address/zero-address-1/remediated-example/rust-toolchain
+++ /dev/null
@@ -1,3 +0,0 @@
-[toolchain]
-channel = "nightly-2023-09-29"
-components = ["llvm-tools-preview", "rustc-dev"]
diff --git a/test-cases/zero-address/zero-address-1/vulnerable-example/Cargo.toml b/test-cases/zero-address/zero-address-1/vulnerable-example/Cargo.toml
index 6e04a7c0..15be1e68 100644
--- a/test-cases/zero-address/zero-address-1/vulnerable-example/Cargo.toml
+++ b/test-cases/zero-address/zero-address-1/vulnerable-example/Cargo.toml
@@ -1,30 +1,16 @@
 [package]
+edition = "2021"
 name = "zero-address-vulnerable-1"
 version = "0.1.0"
-edition = "2021"
 
 [lib]
 crate-type = ["cdylib"]
 
 [dependencies]
-soroban-sdk = "20.0.0-rc2"
+soroban-sdk = { workspace = true }
 
-[dev_dependencies]
-soroban-sdk = { version = "=20.0.0", features = ["testutils"] }
+[dev-dependencies]
+soroban-sdk = { workspace = true, features = ["testutils"] }
 
 [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
\ No newline at end of file
diff --git a/test-cases/zero-address/zero-address-1/vulnerable-example/rust-toolchain b/test-cases/zero-address/zero-address-1/vulnerable-example/rust-toolchain
deleted file mode 100644
index 8811e92c..00000000
--- a/test-cases/zero-address/zero-address-1/vulnerable-example/rust-toolchain
+++ /dev/null
@@ -1,3 +0,0 @@
-[toolchain]
-channel = "nightly-2023-09-29"
-components = ["llvm-tools-preview", "rustc-dev"]