diff --git a/contracts/vault_l12/src/lib.rs b/contracts/vault_l12/src/lib.rs
index 2b5c405..2cbbdba 100644
--- a/contracts/vault_l12/src/lib.rs
+++ b/contracts/vault_l12/src/lib.rs
@@ -16,10 +16,6 @@ pub enum VaultError {
 #[derive(Clone)]
 #[contracttype]
 pub enum DataKey {
-    LockUntil(Address),
-    Balance(Address),
-    Shares(Address),
-    Checkpoint(Address),
     TotalShares,
     TotalBalance,
     Admin,
@@ -27,6 +23,10 @@ pub enum DataKey {
     Strategy,
     Usdc,
     MaxTvl,
+    Balance(Address),
+    Shares(Address),
+    LockUntil(Address),
+    Checkpoint(Address),
 }
 
 const FP_MULTIPLIER: i128 = 1_000_000_0;
@@ -234,5 +234,3 @@ impl VaultL12 {
         env.storage().instance().get(&DataKey::TotalBalance).unwrap_or(0)
     }
 }
-
-mod test;
diff --git a/contracts/vault_l3/src/lib.rs b/contracts/vault_l3/src/lib.rs
index 314644a..1dd6969 100644
--- a/contracts/vault_l3/src/lib.rs
+++ b/contracts/vault_l3/src/lib.rs
@@ -16,10 +16,6 @@ pub enum VaultError {
 #[derive(Clone)]
 #[contracttype]
 pub enum DataKey {
-    LockUntil(Address),
-    Balance(Address),
-    Shares(Address),
-    Checkpoint(Address),
     TotalShares,
     TotalBalance,
     Admin,
@@ -28,6 +24,10 @@ pub enum DataKey {
     Strategy,
     Usdc,
     MaxTvl,
+    Balance(Address),
+    Shares(Address),
+    LockUntil(Address),
+    Checkpoint(Address),
     /// Emergency unlock flag — when true, early_exit and withdraw skip
     /// lock and fee enforcement so depositors can exit safely.
     EmergencyUnlock,
@@ -298,5 +298,3 @@ impl VaultL3 {
         env.storage().instance().get(&DataKey::TotalBalance).unwrap_or(0)
     }
 }
-
-mod test;
diff --git a/contracts/vault_l6/src/lib.rs b/contracts/vault_l6/src/lib.rs
index 5168094..624bf8d 100644
--- a/contracts/vault_l6/src/lib.rs
+++ b/contracts/vault_l6/src/lib.rs
@@ -16,10 +16,6 @@ pub enum VaultError {
 #[derive(Clone)]
 #[contracttype]
 pub enum DataKey {
-    LockUntil(Address),
-    Balance(Address),
-    Shares(Address),
-    Checkpoint(Address),
     TotalShares,
     TotalBalance,
     Admin,
@@ -27,6 +23,10 @@ pub enum DataKey {
     Strategy,
     Usdc,
     MaxTvl,
+    Balance(Address),
+    Shares(Address),
+    LockUntil(Address),
+    Checkpoint(Address),
 }
 
 const FP_MULTIPLIER: i128 = 1_000_000_0;
@@ -234,5 +234,3 @@ impl VaultL6 {
         env.storage().instance().get(&DataKey::TotalBalance).unwrap_or(0)
     }
 }
-
-mod test;
diff --git a/contracts/vault_router/src/lib.rs b/contracts/vault_router/src/lib.rs
index e35c6fb..b32c7ed 100644
--- a/contracts/vault_router/src/lib.rs
+++ b/contracts/vault_router/src/lib.rs
@@ -515,6 +515,17 @@ mod test {
         client.initialize(&admin, &vault, &vault, &vault, &vault, &vault, &vec![&env, usdc]);
     }
 
+    // ── Vault getter ────────────────────────────────────────────────────────
+
+    #[test]
+    fn test_get_vault_returns_registered_address() {
+        let (env, client, vault_id) = setup();
+        assert_eq!(client.get_vault(&Tier::Flex), vault_id);
+        assert_eq!(client.get_vault(&Tier::L3), vault_id);
+        assert_eq!(client.get_vault(&Tier::L6), vault_id);
+        assert_eq!(client.get_vault(&Tier::L12), vault_id);
+    }
+
     // ── Min deposit helper ──────────────────────────────────────────────────
 
     #[test]