diff --git a/Cargo.toml b/Cargo.toml
index 789513bd..ccfb6d9e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,47 +32,60 @@ documentation = "https://docs.hyperlane.xyz/"
 keywords = ["hyperlane", "cosmos", "cosmwasm"]
 
 [workspace.dependencies]
+# cosmwasm
 cosmwasm-std = { version = "1.2.7", features = ["stargate", "cosmwasm_1_2"] }
 cosmwasm-storage = "1.2.7"
-schemars = "0.8.12"
+cosmwasm-schema = "1.2.7"
+cosmwasm-crypto = "1.2.7"
+
+# cosmwasm extension
 cw-storage-plus = "1.1.0"
 cw-utils = "1.0.1"
 cw2 = "1.0.0"
 cw20 = "1.1.0"
 cw20-base = { version = "1.1.0", features = ["library"] }
-sha3 = "0.10.8"
-sha2 = { version = "0.10.6", default-features = false }
-ripemd = "0.1.3"
+
+# utilities
+thiserror = { version = "1.0.37" }
+anyhow = { version = "1.0.71", features = ["backtrace"] }
+eyre = { version = "0.6.8" }
+
+# encoding
 bech32 = "0.9.1"
 base64 = "0.21.2"
 serde = { version = "1.0.162", default-features = false, features = ["derive"] }
 serde_json = "1.0.96"
 serde-json-wasm = "1.0.0"
-thiserror = { version = "1.0.37" }
-cw-multi-test = "0.17.0"
-cosmwasm-schema = "1.2.7"
-cosmwasm-crypto = "1.2.7"
+schemars = "0.8.12"
 prost = { version = "0.12.1", default-features = false, features = [
     "prost-derive",
 ] }
 prost-types = { version = "0.12.1", default-features = false }
+hex-literal = { version = "0.4.1" }
 
+# cryptography
+sha3 = "0.10.8"
+sha2 = { version = "0.10.6", default-features = false }
+ripemd = "0.1.3"
 k256 = { version = "0.13.1", default-features = false, features = ["ecdsa"] }
-anyhow = { version = "1.0.71", features = ["backtrace"] }
 digest = { version = "0.10.7" }
-hex-literal = { version = "0.4.1" }
 
+# testing
+cw-multi-test = "0.17.0"
+rstest = "0.18.2"
 test-tube = { version = "0.1.7" }
 osmosis-test-tube = { version = "19.2.0" }
 
 tokio = { version = "1", features = ["full"] }
-eyre = { version = "0.6.8" }
 ethers = "2.0.7"
 
-hpl-router = { path = "./packages/router" }
-hpl-ownable = { path = "./packages/ownable" }
-hpl-interface = { path = "./packages/interface" }
+# workspace aliases (./contracts)
 hpl-hub = { path = "./contracts/hub" }
 hpl-ism-multisig = { path = "./contracts/ism-multisig" }
 hpl-mailbox = { path = "./contracts/mailbox" }
 hpl-multicall = { path = "./contracts/multicall" }
+
+# workspace aliases (./packages)
+hpl-router = { path = "./packages/router" }
+hpl-ownable = { path = "./packages/ownable" }
+hpl-interface = { path = "./packages/interface" }
diff --git a/contracts/default-hook/Cargo.toml b/contracts/default-hook/Cargo.toml
index 474c7256..894b7b50 100644
--- a/contracts/default-hook/Cargo.toml
+++ b/contracts/default-hook/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "hpl-default-hook"
-version = { workspace = true }
-authors = { workspace = true }
-edition = { workspace = true }
-license = { workspace = true }
-repository = { workspace = true }
-homepage = { workspace = true }
-documentation = { workspace = true }
-keywords = { workspace = true }
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+homepage.workspace = true
+documentation.workspace = true
+keywords.workspace = true
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -19,18 +19,21 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cosmwasm-std = { workspace = true }
-cosmwasm-storage = { workspace = true }
-cw-storage-plus = { workspace = true }
-cw2 = { workspace = true }
-cw-utils = { workspace = true }
-schemars = { workspace = true }
-thiserror = { workspace = true }
-cosmwasm-schema = { workspace = true }
-serde-json-wasm = { workspace = true }
-
-hpl-ownable = { workspace = true }
-hpl-interface = { workspace = true }
+cosmwasm-std.workspace = true
+cosmwasm-storage.workspace = true
+cosmwasm-schema.workspace = true
+
+cw-storage-plus.workspace = true
+cw2.workspace = true
+cw-utils.workspace = true
+
+schemars.workspace = true
+serde-json-wasm.workspace = true
+
+thiserror.workspace = true
+
+hpl-ownable.workspace = true
+hpl-interface.workspace = true
 
 [dev-dependencies]
-anyhow = { workspace = true }
+anyhow.workspace = true
diff --git a/contracts/domain-routing-hook/Cargo.toml b/contracts/domain-routing-hook/Cargo.toml
index cf4a4511..a59a5eac 100644
--- a/contracts/domain-routing-hook/Cargo.toml
+++ b/contracts/domain-routing-hook/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "hpl-domain-routing-hook"
-version = { workspace = true }
-authors = { workspace = true }
-edition = { workspace = true }
-license = { workspace = true }
-repository = { workspace = true }
-homepage = { workspace = true }
-documentation = { workspace = true }
-keywords = { workspace = true }
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+homepage.workspace = true
+documentation.workspace = true
+keywords.workspace = true
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -19,19 +19,21 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cosmwasm-std = { workspace = true }
-cosmwasm-storage = { workspace = true }
-cw-storage-plus = { workspace = true }
-cw2 = { workspace = true }
-cw-utils = { workspace = true }
-schemars = { workspace = true }
-serde = { workspace = true }
-thiserror = { workspace = true }
-cosmwasm-schema = { workspace = true }
-serde-json-wasm = { workspace = true }
-
-hpl-ownable = { workspace = true }
-hpl-interface = { workspace = true }
+cosmwasm-std.workspace = true
+cosmwasm-storage.workspace = true
+cosmwasm-schema.workspace = true
+
+cw-storage-plus.workspace = true
+cw2.workspace = true
+cw-utils.workspace = true
+
+schemars.workspace = true
+serde-json-wasm.workspace = true
+
+thiserror.workspace = true
+
+hpl-ownable.workspace = true
+hpl-interface.workspace = true
 
 [dev-dependencies]
-anyhow = { workspace = true }
+anyhow.workspace = true
diff --git a/contracts/hub/Cargo.toml b/contracts/hub/Cargo.toml
index ab4f4c2e..26e0272c 100644
--- a/contracts/hub/Cargo.toml
+++ b/contracts/hub/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "hpl-hub"
-version = { workspace = true }
-authors = { workspace = true }
-edition = { workspace = true }
-license = { workspace = true }
-repository = { workspace = true }
-homepage = { workspace = true }
-documentation = { workspace = true }
-keywords = { workspace = true }
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+homepage.workspace = true
+documentation.workspace = true
+keywords.workspace = true
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -19,16 +19,18 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cosmwasm-std = { workspace = true }
-cosmwasm-storage = { workspace = true }
-cw-storage-plus = { workspace = true }
-cw2 = { workspace = true }
-schemars = { workspace = true }
-serde = { workspace = true }
-thiserror = { workspace = true }
-cosmwasm-schema = { workspace = true }
+cosmwasm-std.workspace = true
+cosmwasm-storage.workspace = true
+cosmwasm-schema.workspace = true
 
-hpl-interface = { workspace = true }
+cw-storage-plus.workspace = true
+cw2.workspace = true
+
+schemars.workspace = true
+
+thiserror.workspace = true
+
+hpl-interface.workspace = true
 
 [dev-dependencies]
-cw-multi-test = { workspace = true }
+cw-multi-test.workspace = true
diff --git a/contracts/igp-core/Cargo.toml b/contracts/igp-core/Cargo.toml
index 6f1a2565..281b49d8 100644
--- a/contracts/igp-core/Cargo.toml
+++ b/contracts/igp-core/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "hpl-igp-core"
-version = { workspace = true }
-authors = { workspace = true }
-edition = { workspace = true }
-license = { workspace = true }
-repository = { workspace = true }
-homepage = { workspace = true }
-documentation = { workspace = true }
-keywords = { workspace = true }
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+homepage.workspace = true
+documentation.workspace = true
+keywords.workspace = true
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -19,18 +19,22 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cosmwasm-std = { workspace = true }
-cosmwasm-storage = { workspace = true }
-cw-storage-plus = { workspace = true }
-cw2 = { workspace = true }
-cw-utils = { workspace = true }
-schemars = { workspace = true }
-serde = { workspace = true }
-thiserror = { workspace = true }
-cosmwasm-schema = { workspace = true }
-
-hpl-ownable = { workspace = true }
-hpl-interface = { workspace = true }
+cosmwasm-std.workspace = true
+cosmwasm-storage.workspace = true
+cosmwasm-schema.workspace = true
+
+cw-storage-plus.workspace = true
+cw2.workspace = true
+cw-utils.workspace = true
+
+schemars.workspace = true
+
+thiserror.workspace = true
+
+hpl-ownable.workspace = true
+hpl-interface.workspace = true
 
 [dev-dependencies]
-anyhow = { workspace = true }
+serde.workspace = true
+
+anyhow.workspace = true
diff --git a/contracts/igp-gas-oracle/Cargo.toml b/contracts/igp-gas-oracle/Cargo.toml
index d55e3e65..22273b75 100644
--- a/contracts/igp-gas-oracle/Cargo.toml
+++ b/contracts/igp-gas-oracle/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "hpl-igp-gas-oracle"
-version = { workspace = true }
-authors = { workspace = true }
-edition = { workspace = true }
-license = { workspace = true }
-repository = { workspace = true }
-homepage = { workspace = true }
-documentation = { workspace = true }
-keywords = { workspace = true }
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+homepage.workspace = true
+documentation.workspace = true
+keywords.workspace = true
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -19,18 +19,23 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cosmwasm-std = { workspace = true }
-cosmwasm-storage = { workspace = true }
-cw-storage-plus = { workspace = true }
-cw2 = { workspace = true }
-schemars = { workspace = true }
-serde = { workspace = true }
-thiserror = { workspace = true }
-cosmwasm-schema = { workspace = true }
-
-hpl-ownable = { workspace = true }
-hpl-interface = { workspace = true }
+cosmwasm-std.workspace = true
+cosmwasm-storage.workspace = true
+cosmwasm-schema.workspace = true
+
+cw-storage-plus.workspace = true
+cw2.workspace = true
+
+schemars.workspace = true
+
+thiserror.workspace = true
+
+hpl-ownable.workspace = true
+hpl-interface.workspace = true
 
 [dev-dependencies]
-cw-multi-test = { workspace = true }
-anyhow = { workspace = true }
+serde.workspace = true
+
+cw-multi-test.workspace = true
+
+anyhow.workspace = true
diff --git a/contracts/ism-multisig/Cargo.toml b/contracts/ism-multisig/Cargo.toml
index 90ab197c..fd95d233 100644
--- a/contracts/ism-multisig/Cargo.toml
+++ b/contracts/ism-multisig/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "hpl-ism-multisig"
-version = { workspace = true }
-authors = { workspace = true }
-edition = { workspace = true }
-license = { workspace = true }
-repository = { workspace = true }
-homepage = { workspace = true }
-documentation = { workspace = true }
-keywords = { workspace = true }
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+homepage.workspace = true
+documentation.workspace = true
+keywords.workspace = true
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -19,18 +19,22 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cosmwasm-std = { workspace = true }
-cosmwasm-storage = { workspace = true }
-cw-storage-plus = { workspace = true }
-cw2 = { workspace = true }
-sha2 = { workspace = true }
-ripemd = { workspace = true }
-bech32 = { workspace = true }
-schemars = { workspace = true }
-serde = { workspace = true }
-thiserror = { workspace = true }
-cosmwasm-schema = { workspace = true }
-hpl-interface = { workspace = true }
+cosmwasm-std.workspace = true
+cosmwasm-storage.workspace = true
+cosmwasm-schema.workspace = true
+
+cw-storage-plus.workspace = true
+cw2.workspace = true
+
+sha2.workspace = true
+ripemd.workspace = true
+
+bech32.workspace = true
+schemars.workspace = true
+
+thiserror.workspace = true
+
+hpl-interface.workspace = true
 
 [dev-dependencies]
-cw-multi-test = { workspace = true }
+cw-multi-test.workspace = true
diff --git a/contracts/ism-routing/Cargo.toml b/contracts/ism-routing/Cargo.toml
index b402b8ba..62f56ffa 100644
--- a/contracts/ism-routing/Cargo.toml
+++ b/contracts/ism-routing/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "hpl-ism-routing"
-version = { workspace = true }
-authors = { workspace = true }
-edition = { workspace = true }
-license = { workspace = true }
-repository = { workspace = true }
-homepage = { workspace = true }
-documentation = { workspace = true }
-keywords = { workspace = true }
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+homepage.workspace = true
+documentation.workspace = true
+keywords.workspace = true
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -19,19 +19,25 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cosmwasm-std = { workspace = true }
-cosmwasm-storage = { workspace = true }
-cw-storage-plus = { workspace = true }
-cw2 = { workspace = true }
-sha2 = { workspace = true }
-ripemd = { workspace = true }
-bech32 = { workspace = true }
-schemars = { workspace = true }
-serde = { workspace = true }
-thiserror = { workspace = true }
-cosmwasm-schema = { workspace = true }
-hpl-interface = { workspace = true }
-hpl-ownable = { workspace = true }
+cosmwasm-std.workspace = true
+cosmwasm-storage.workspace = true
+cosmwasm-schema.workspace = true
+
+cw-storage-plus.workspace = true
+cw2.workspace = true
+
+sha2.workspace = true
+ripemd.workspace = true
+
+bech32.workspace = true
+schemars.workspace = true
+
+thiserror.workspace = true
+
+hpl-interface.workspace = true
+hpl-ownable.workspace = true
 
 [dev-dependencies]
-anyhow = { workspace = true }
+
+serde.workspace = true
+anyhow.workspace = true
diff --git a/contracts/mailbox/Cargo.toml b/contracts/mailbox/Cargo.toml
index 140839c0..e38fd77d 100644
--- a/contracts/mailbox/Cargo.toml
+++ b/contracts/mailbox/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "hpl-mailbox"
-version = { workspace = true }
-authors = { workspace = true }
-edition = { workspace = true }
-license = { workspace = true }
-repository = { workspace = true }
-homepage = { workspace = true }
-documentation = { workspace = true }
-keywords = { workspace = true }
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+homepage.workspace = true
+documentation.workspace = true
+keywords.workspace = true
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -19,17 +19,21 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cosmwasm-std = { workspace = true }
-cosmwasm-storage = { workspace = true }
-cw-storage-plus = { workspace = true }
-cw2 = { workspace = true }
-schemars = { workspace = true }
-serde = { workspace = true }
-thiserror = { workspace = true }
-cosmwasm-schema = { workspace = true }
-bech32 = { workspace = true }
-
-hpl-interface = { workspace = true }
+cosmwasm-std.workspace = true
+cosmwasm-storage.workspace = true
+cosmwasm-schema.workspace = true
+
+cw-storage-plus.workspace = true
+cw2.workspace = true
+
+schemars.workspace = true
+bech32.workspace = true
+
+thiserror.workspace = true
+
+hpl-interface.workspace = true
 
 [dev-dependencies]
-cw-multi-test = { workspace = true }
+serde.workspace = true
+
+cw-multi-test.workspace = true
diff --git a/contracts/mailbox/src/core.rs b/contracts/mailbox/src/core.rs
index 0600f37c..0f755bc6 100644
--- a/contracts/mailbox/src/core.rs
+++ b/contracts/mailbox/src/core.rs
@@ -127,8 +127,6 @@ pub fn process(
 mod tests {
     use cosmwasm_std::testing::{mock_dependencies, mock_info};
 
-    use crate::state::Config;
-
     use super::*;
 
     const DEST_DOMAIN: u32 = 11155111;
diff --git a/contracts/mock-hook/Cargo.toml b/contracts/mock-hook/Cargo.toml
index 022b9a44..ce27480c 100644
--- a/contracts/mock-hook/Cargo.toml
+++ b/contracts/mock-hook/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "hpl-test-mock-hook"
-version = { workspace = true }
-authors = { workspace = true }
-edition = { workspace = true }
-license = { workspace = true }
-repository = { workspace = true }
-homepage = { workspace = true }
-documentation = { workspace = true }
-keywords = { workspace = true }
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+homepage.workspace = true
+documentation.workspace = true
+keywords.workspace = true
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -19,14 +19,14 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cosmwasm-std = { workspace = true }
-cosmwasm-storage = { workspace = true }
-cosmwasm-schema = { workspace = true }
+cosmwasm-std.workspace = true
+cosmwasm-storage.workspace = true
+cosmwasm-schema.workspace = true
 
-cw2 = { workspace = true }
-cw-storage-plus = { workspace = true }
+cw2.workspace = true
+cw-storage-plus.workspace = true
 
-hpl-interface = { workspace = true }
+hpl-interface.workspace = true
 
 [dev-dependencies]
-cw-multi-test = { workspace = true }
+cw-multi-test.workspace = true
diff --git a/contracts/mock-ism/Cargo.toml b/contracts/mock-ism/Cargo.toml
index d71ea9de..439401cb 100644
--- a/contracts/mock-ism/Cargo.toml
+++ b/contracts/mock-ism/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "hpl-test-mock-ism"
-version = { workspace = true }
-authors = { workspace = true }
-edition = { workspace = true }
-license = { workspace = true }
-repository = { workspace = true }
-homepage = { workspace = true }
-documentation = { workspace = true }
-keywords = { workspace = true }
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+homepage.workspace = true
+documentation.workspace = true
+keywords.workspace = true
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -19,19 +19,24 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cosmwasm-std = { workspace = true }
-cosmwasm-storage = { workspace = true }
-cw-storage-plus = { workspace = true }
-cw2 = { workspace = true }
-sha3 = { workspace = true }
-ripemd = { workspace = true }
-bech32 = { workspace = true }
-schemars = { workspace = true }
-serde = { workspace = true }
-thiserror = { workspace = true }
-cosmwasm-schema = { workspace = true }
-
-hpl-interface = { workspace = true }
+cosmwasm-std.workspace = true
+cosmwasm-storage.workspace = true
+cosmwasm-schema.workspace = true
+
+cw-storage-plus.workspace = true
+cw2.workspace = true
+
+sha3.workspace = true
+ripemd.workspace = true
+
+bech32.workspace = true
+schemars.workspace = true
+
+thiserror.workspace = true
+
+hpl-interface.workspace = true
 
 [dev-dependencies]
-cw-multi-test = { workspace = true }
+serde.workspace = true
+
+cw-multi-test.workspace = true
diff --git a/contracts/mock-msg-receiver/Cargo.toml b/contracts/mock-msg-receiver/Cargo.toml
index 3dbf044d..080b4d15 100644
--- a/contracts/mock-msg-receiver/Cargo.toml
+++ b/contracts/mock-msg-receiver/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "hpl-test-mock-msg-receiver"
-version = { workspace = true }
-authors = { workspace = true }
-edition = { workspace = true }
-license = { workspace = true }
-repository = { workspace = true }
-homepage = { workspace = true }
-documentation = { workspace = true }
-keywords = { workspace = true }
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+homepage.workspace = true
+documentation.workspace = true
+keywords.workspace = true
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -19,19 +19,24 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cosmwasm-std = { workspace = true }
-cosmwasm-storage = { workspace = true }
-cw-storage-plus = { workspace = true }
-cw2 = { workspace = true }
-sha3 = { workspace = true }
-ripemd = { workspace = true }
-bech32 = { workspace = true }
-schemars = { workspace = true }
-serde = { workspace = true }
-thiserror = { workspace = true }
-cosmwasm-schema = { workspace = true }
-
-hpl-interface = { workspace = true }
+cosmwasm-std.workspace = true
+cosmwasm-storage.workspace = true
+cosmwasm-schema.workspace = true
+
+cw-storage-plus.workspace = true
+cw2.workspace = true
+
+sha3.workspace = true
+ripemd.workspace = true
+
+bech32.workspace = true
+schemars.workspace = true
+
+thiserror.workspace = true
+
+hpl-interface.workspace = true
 
 [dev-dependencies]
-cw-multi-test = { workspace = true }
+serde.workspace = true
+
+cw-multi-test.workspace = true
diff --git a/contracts/multicall/Cargo.toml b/contracts/multicall/Cargo.toml
index a394cac0..500a152b 100644
--- a/contracts/multicall/Cargo.toml
+++ b/contracts/multicall/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "hpl-multicall"
-version = { workspace = true }
-authors = { workspace = true }
-edition = { workspace = true }
-license = { workspace = true }
-repository = { workspace = true }
-homepage = { workspace = true }
-documentation = { workspace = true }
-keywords = { workspace = true }
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+homepage.workspace = true
+documentation.workspace = true
+keywords.workspace = true
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -19,19 +19,24 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cosmwasm-std = { workspace = true }
-cosmwasm-storage = { workspace = true }
-cw-storage-plus = { workspace = true }
-cw2 = { workspace = true }
-sha2 = { workspace = true }
-ripemd = { workspace = true }
-bech32 = { workspace = true }
-schemars = { workspace = true }
-serde = { workspace = true }
-thiserror = { workspace = true }
-cosmwasm-schema = { workspace = true }
-
-hpl-interface = { workspace = true }
+cosmwasm-std.workspace = true
+cosmwasm-storage.workspace = true
+cosmwasm-schema.workspace = true
+
+cw-storage-plus.workspace = true
+cw2.workspace = true
+
+sha2.workspace = true
+ripemd.workspace = true
+
+bech32.workspace = true
+schemars.workspace = true
+
+thiserror.workspace = true
+
+hpl-interface.workspace = true
 
 [dev-dependencies]
-cw-multi-test = { workspace = true }
+serde.workspace = true
+
+cw-multi-test.workspace = true
diff --git a/contracts/token-cw20/Cargo.toml b/contracts/token-cw20/Cargo.toml
index c6d33a25..5e75f229 100644
--- a/contracts/token-cw20/Cargo.toml
+++ b/contracts/token-cw20/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "hpl-token-cw20"
-version = { workspace = true }
-authors = { workspace = true }
-edition = { workspace = true }
-license = { workspace = true }
-repository = { workspace = true }
-homepage = { workspace = true }
-documentation = { workspace = true }
-keywords = { workspace = true }
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+homepage.workspace = true
+documentation.workspace = true
+keywords.workspace = true
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -19,25 +19,30 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cosmwasm-std = { workspace = true }
-cosmwasm-storage = { workspace = true }
-cw-storage-plus = { workspace = true }
-cw-utils = { workspace = true }
-cw2 = { workspace = true }
-cw20 = { workspace = true }
-cw20-base = { workspace = true }
-sha2 = { workspace = true }
-ripemd = { workspace = true }
-bech32 = { workspace = true }
-schemars = { workspace = true }
-serde = { workspace = true }
-thiserror = { workspace = true }
-cosmwasm-schema = { workspace = true }
-
-hpl-router = { workspace = true }
-hpl-interface = { workspace = true }
+cosmwasm-std.workspace = true
+cosmwasm-storage.workspace = true
+cosmwasm-schema.workspace = true
+
+cw-storage-plus.workspace = true
+cw-utils.workspace = true
+cw2.workspace = true
+cw20.workspace = true
+cw20-base.workspace = true
+
+sha2.workspace = true
+ripemd.workspace = true
+
+serde.workspace = true
+bech32.workspace = true
+schemars.workspace = true
+
+thiserror.workspace = true
+
+hpl-router.workspace = true
+hpl-interface.workspace = true
 
 [dev-dependencies]
-anyhow = { workspace = true }
-k256 = { workspace = true }
-sha3 = { workspace = true }
+
+anyhow.workspace = true
+k256.workspace = true
+sha3.workspace = true
diff --git a/contracts/token-native/Cargo.toml b/contracts/token-native/Cargo.toml
index 49f3e7a3..b119f740 100644
--- a/contracts/token-native/Cargo.toml
+++ b/contracts/token-native/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "hpl-token-native"
-version = { workspace = true }
-authors = { workspace = true }
-edition = { workspace = true }
-license = { workspace = true }
-repository = { workspace = true }
-homepage = { workspace = true }
-documentation = { workspace = true }
-keywords = { workspace = true }
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+homepage.workspace = true
+documentation.workspace = true
+keywords.workspace = true
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -19,25 +19,31 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cosmwasm-std = { workspace = true }
-cosmwasm-storage = { workspace = true }
-cw-storage-plus = { workspace = true }
-cw-utils = { workspace = true }
-cw2 = { workspace = true }
-sha2 = { workspace = true }
-ripemd = { workspace = true }
-bech32 = { workspace = true }
-schemars = { workspace = true }
-serde = { workspace = true }
-thiserror = { workspace = true }
-cosmwasm-schema = { workspace = true }
-prost = { workspace = true }
-prost-types = { workspace = true }
-
-hpl-router = { workspace = true }
-hpl-interface = { workspace = true }
+cosmwasm-std.workspace = true
+cosmwasm-storage.workspace = true
+cosmwasm-schema.workspace = true
+
+cw-storage-plus.workspace = true
+cw-utils.workspace = true
+cw2.workspace = true
+
+sha2.workspace = true
+ripemd.workspace = true
+
+bech32.workspace = true
+schemars.workspace = true
+prost.workspace = true
+prost-types.workspace = true
+serde.workspace = true
+serde-json-wasm.workspace = true
+
+thiserror.workspace = true
+
+hpl-router.workspace = true
+hpl-interface.workspace = true
 
 [dev-dependencies]
-anyhow = { workspace = true }
-k256 = { workspace = true }
-sha3 = { workspace = true }
+rstest.workspace = true
+anyhow.workspace = true
+k256.workspace = true
+sha3.workspace = true
diff --git a/contracts/va/Cargo.toml b/contracts/va/Cargo.toml
index d444d4e5..eb48e8df 100644
--- a/contracts/va/Cargo.toml
+++ b/contracts/va/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "hpl-validator-announce"
-version = { workspace = true }
-authors = { workspace = true }
-edition = { workspace = true }
-license = { workspace = true }
-repository = { workspace = true }
-homepage = { workspace = true }
-documentation = { workspace = true }
-keywords = { workspace = true }
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+homepage.workspace = true
+documentation.workspace = true
+keywords.workspace = true
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -19,22 +19,26 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-k256 = { workspace = true }
-cosmwasm-std = { workspace = true }
-cosmwasm-storage = { workspace = true }
-cw-storage-plus = { workspace = true }
-cw2 = { workspace = true }
-sha2 = { workspace = true }
-ripemd = { workspace = true }
-bech32 = { workspace = true }
-schemars = { workspace = true }
-serde = { workspace = true }
-thiserror = { workspace = true }
-cosmwasm-schema = { workspace = true }
-
-hpl-interface = { workspace = true }
+cosmwasm-std.workspace = true
+cosmwasm-storage.workspace = true
+cosmwasm-schema.workspace = true
+
+cw-storage-plus.workspace = true
+cw2.workspace = true
+
+k256.workspace = true
+sha2.workspace = true
+ripemd.workspace = true
+
+bech32.workspace = true
+schemars.workspace = true
+serde.workspace = true
+
+thiserror.workspace = true
+
+hpl-interface.workspace = true
 
 [dev-dependencies]
-anyhow = { workspace = true }
-sha3 = { workspace = true }
-digest = { workspace = true }
+anyhow.workspace = true
+sha3.workspace = true
+digest.workspace = true
diff --git a/integration-test/Cargo.toml b/integration-test/Cargo.toml
index e9cad0f2..732c995d 100644
--- a/integration-test/Cargo.toml
+++ b/integration-test/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "hpl-tests"
-version = { workspace = true }
-authors = { workspace = true }
-edition = { workspace = true }
-license = { workspace = true }
-repository = { workspace = true }
-homepage = { workspace = true }
-documentation = { workspace = true }
-keywords = { workspace = true }
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+homepage.workspace = true
+documentation.workspace = true
+keywords.workspace = true
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -19,27 +19,27 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cosmwasm-std = { workspace = true }
+cosmwasm-std.workspace = true
 
 [dev_dependencies]
-ethers = { workspace = true }
-test-tube = { workspace = true }
-osmosis-test-tube = { workspace = true }
-serde_json = { workspace = true }
-serde-json-wasm = { workspace = true }
-cosmwasm-schema = { workspace = true }
-base64 = { workspace = true }
-bech32 = { workspace = true }
-tokio = { workspace = true }
-eyre = { workspace = true }
-k256 = { workspace = true }
-sha2 = { workspace = true }
-sha3 = { workspace = true }
-ripemd = { workspace = true }
-hex-literal = { workspace = true }
+ethers.workspace = true
+test-tube.workspace = true
+osmosis-test-tube.workspace = true
+serde_json.workspace = true
+serde-json-wasm.workspace = true
+cosmwasm-schema.workspace = true
+base64.workspace = true
+bech32.workspace = true
+tokio.workspace = true
+eyre.workspace = true
+k256.workspace = true
+sha2.workspace = true
+sha3.workspace = true
+ripemd.workspace = true
+hex-literal.workspace = true
 
-hpl-ism-multisig = { workspace = true }
-hpl-interface = { workspace = true }
+hpl-ism-multisig.workspace = true
+hpl-interface.workspace = true
 
 [build-dependencies]
-ethers = { workspace = true }
+ethers.workspace = true
diff --git a/integration-test/tests/constants.rs b/integration-test/tests/constants.rs
new file mode 100644
index 00000000..fe329769
--- /dev/null
+++ b/integration-test/tests/constants.rs
@@ -0,0 +1,7 @@
+pub const DOMAIN_EVM: u32 = 1;
+
+pub const DOMAIN_OSMO: u32 = 2;
+pub const PREFIX_OSMO: &str = "osmo";
+
+pub const DOMAIN_NTRN: u32 = 3;
+pub const PREFIX_NTRN: &str = "neutron";
diff --git a/integration-test/tests/contracts/cw/setup.rs b/integration-test/tests/contracts/cw/setup.rs
index e64e171f..4aa28e95 100644
--- a/integration-test/tests/contracts/cw/setup.rs
+++ b/integration-test/tests/contracts/cw/setup.rs
@@ -31,6 +31,7 @@ impl<'a, R: Runner<'a>> Env<'a, R> {
             .ok_or(eyre::eyre!("no validator set found"))
     }
 
+    #[allow(dead_code)]
     pub fn gen_account(&'a self, coins: &'a [Coin]) -> SigningAccount {
         (self.acc_gen)(self.app, coins)
     }
diff --git a/integration-test/tests/mailbox.rs b/integration-test/tests/mailbox.rs
index e6dc5d14..d8c9bd0c 100644
--- a/integration-test/tests/mailbox.rs
+++ b/integration-test/tests/mailbox.rs
@@ -1,3 +1,5 @@
+#[allow(dead_code)]
+mod constants;
 mod contracts;
 mod event;
 mod validator;
@@ -9,6 +11,7 @@ use osmosis_test_tube::{Account, Module, OsmosisTestApp, Wasm};
 use hpl_interface::types::{bech32_decode, bech32_encode, bech32_to_h256};
 
 use crate::{
+    constants::*,
     contracts::{
         cw,
         eth::{
@@ -25,14 +28,6 @@ fn sorted(mut attrs: Vec<Attribute>) -> Vec<Attribute> {
     attrs
 }
 
-const DOMAIN_EVM: u32 = 1;
-
-const DOMAIN_OSMO: u32 = 2;
-const PREFIX_OSMO: &str = "osmo";
-
-const DOMAIN_NTRN: u32 = 3;
-const PREFIX_NTRN: &str = "neutron";
-
 #[tokio::test]
 async fn test_mailbox_cw_to_evm() -> eyre::Result<()> {
     // init Osmosis env
diff --git a/packages/interface/Cargo.toml b/packages/interface/Cargo.toml
index e0bb2b73..5c362bc5 100644
--- a/packages/interface/Cargo.toml
+++ b/packages/interface/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "hpl-interface"
-version = { workspace = true }
-authors = { workspace = true }
-edition = { workspace = true }
-license = { workspace = true }
-repository = { workspace = true }
-homepage = { workspace = true }
-documentation = { workspace = true }
-keywords = { workspace = true }
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+homepage.workspace = true
+documentation.workspace = true
+keywords.workspace = true
 description = "Interface definitions for CosmWasm Hyperlane contracts"
 
 [lib]
@@ -20,17 +20,17 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cosmwasm-std = { workspace = true }
-cosmwasm-storage = { workspace = true }
-cw-storage-plus = { workspace = true }
-cw2 = { workspace = true }
-cw20 = { workspace = true }
-bech32 = { workspace = true }
-sha3 = { workspace = true }
-schemars = { workspace = true }
-serde = { workspace = true }
-thiserror = { workspace = true }
-cosmwasm-schema = { workspace = true }
+cosmwasm-std.workspace = true
+cosmwasm-storage.workspace = true
+cw-storage-plus.workspace = true
+cw2.workspace = true
+cw20.workspace = true
+bech32.workspace = true
+sha3.workspace = true
+schemars.workspace = true
+serde.workspace = true
+thiserror.workspace = true
+cosmwasm-schema.workspace = true
 
 [dev-dependencies]
-cw-multi-test = { workspace = true }
+cw-multi-test.workspace = true
diff --git a/packages/ownable/Cargo.toml b/packages/ownable/Cargo.toml
index a9437bfa..fd3c12a2 100644
--- a/packages/ownable/Cargo.toml
+++ b/packages/ownable/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "hpl-ownable"
-version = { workspace = true }
-authors = { workspace = true }
-edition = { workspace = true }
-license = { workspace = true }
-repository = { workspace = true }
-homepage = { workspace = true }
-documentation = { workspace = true }
-keywords = { workspace = true }
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+homepage.workspace = true
+documentation.workspace = true
+keywords.workspace = true
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -19,18 +19,18 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cosmwasm-std = { workspace = true }
-cosmwasm-storage = { workspace = true }
-cw-storage-plus = { workspace = true }
-cw2 = { workspace = true }
-bech32 = { workspace = true }
-sha3 = { workspace = true }
-schemars = { workspace = true }
-serde = { workspace = true }
-thiserror = { workspace = true }
-cosmwasm-schema = { workspace = true }
+cosmwasm-std.workspace = true
+cosmwasm-storage.workspace = true
+cw-storage-plus.workspace = true
+cw2.workspace = true
+bech32.workspace = true
+sha3.workspace = true
+schemars.workspace = true
+serde.workspace = true
+thiserror.workspace = true
+cosmwasm-schema.workspace = true
 
-hpl-interface = { workspace = true }
+hpl-interface.workspace = true
 
 [dev-dependencies]
-anyhow = { workspace = true }
+anyhow.workspace = true
diff --git a/packages/router/Cargo.toml b/packages/router/Cargo.toml
index 2b022215..73ab2bea 100644
--- a/packages/router/Cargo.toml
+++ b/packages/router/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "hpl-router"
-version = { workspace = true }
-authors = { workspace = true }
-edition = { workspace = true }
-license = { workspace = true }
-repository = { workspace = true }
-homepage = { workspace = true }
-documentation = { workspace = true }
-keywords = { workspace = true }
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+homepage.workspace = true
+documentation.workspace = true
+keywords.workspace = true
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -19,19 +19,19 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cosmwasm-std = { workspace = true }
-cosmwasm-storage = { workspace = true }
-cw-storage-plus = { workspace = true }
-cw2 = { workspace = true }
-bech32 = { workspace = true }
-sha3 = { workspace = true }
-schemars = { workspace = true }
-serde = { workspace = true }
-serde-json-wasm = { workspace = true }
-thiserror = { workspace = true }
-cosmwasm-schema = { workspace = true }
+cosmwasm-std.workspace = true
+cosmwasm-storage.workspace = true
+cw-storage-plus.workspace = true
+cw2.workspace = true
+bech32.workspace = true
+sha3.workspace = true
+schemars.workspace = true
+serde.workspace = true
+serde-json-wasm.workspace = true
+thiserror.workspace = true
+cosmwasm-schema.workspace = true
 
-hpl-interface = { workspace = true }
+hpl-interface.workspace = true
 
 [dev-dependencies]
-anyhow = { workspace = true }
+anyhow.workspace = true