diff --git a/contracts/provider/external-staking/src/multitest.rs b/contracts/provider/external-staking/src/multitest.rs
index 803e7c9b..deaf3769 100644
--- a/contracts/provider/external-staking/src/multitest.rs
+++ b/contracts/provider/external-staking/src/multitest.rs
@@ -17,6 +17,7 @@ use crate::contract::cross_staking::test_utils::CrossStakingApi;
 use crate::contract::multitest_utils::{CodeId, ExternalStakingContractProxy};
 use crate::error::ContractError;
 use crate::msg::{AuthorizedEndpoint, ReceiveVirtualStake, StakeInfo, ValidatorPendingRewards};
+use crate::state::Stake;
 
 const OSMO: &str = "osmo";
 const STAR: &str = "star";
@@ -286,16 +287,8 @@ fn staking() {
     assert_eq!(
         stakes.stakes,
         [
-            StakeInfo {
-                owner: users[0].to_owned(),
-                validator: validators[0].to_owned(),
-                stake: 200u128.into()
-            },
-            StakeInfo {
-                owner: users[0].to_owned(),
-                validator: validators[1].to_owned(),
-                stake: 100u128.into()
-            },
+            StakeInfo::new(users[0], validators[0], &Stake::from_amount(200u128.into())),
+            StakeInfo::new(users[0], validators[1], &Stake::from_amount(100u128.into()))
         ]
     );
 
@@ -303,16 +296,8 @@ fn staking() {
     assert_eq!(
         stakes.stakes,
         [
-            StakeInfo {
-                owner: users[1].to_owned(),
-                validator: validators[0].to_owned(),
-                stake: 100u128.into()
-            },
-            StakeInfo {
-                owner: users[1].to_owned(),
-                validator: validators[1].to_owned(),
-                stake: 200u128.into()
-            },
+            StakeInfo::new(users[1], validators[0], &Stake::from_amount(100u128.into())),
+            StakeInfo::new(users[1], validators[1], &Stake::from_amount(200u128.into()))
         ]
     );
 }
diff --git a/contracts/provider/native-staking/src/multitest.rs b/contracts/provider/native-staking/src/multitest.rs
index 1ea614f5..c376837e 100644
--- a/contracts/provider/native-staking/src/multitest.rs
+++ b/contracts/provider/native-staking/src/multitest.rs
@@ -271,7 +271,7 @@ fn releasing_proxy_stake() {
     let claims = vault.account_claims(user.to_owned(), None, None).unwrap();
     assert_eq!(
         claims.claims,
-        [mesh_vault::msg::LienResponse {
+        [mesh_vault::msg::MaybeLienResponse::Lien {
             lienholder: staking_addr.to_owned(),
             amount: Uint128::new(100)
         }]
@@ -300,7 +300,7 @@ fn releasing_proxy_stake() {
     let claims = vault.account_claims(user.to_owned(), None, None).unwrap();
     assert_eq!(
         claims.claims,
-        [mesh_vault::msg::LienResponse {
+        [mesh_vault::msg::MaybeLienResponse::Lien {
             lienholder: staking_addr.to_owned(),
             amount: Uint128::zero() // TODO? Clean-up empty liens
         }]