diff --git a/scripts/src/tests/deploy/external.rs b/scripts/src/tests/deploy/external.rs
index 8e77267fe..9e518e233 100644
--- a/scripts/src/tests/deploy/external.rs
+++ b/scripts/src/tests/deploy/external.rs
@@ -30,7 +30,7 @@ impl<Chain: CwEnv> cw_orch::contract::Deploy<Chain> for AdminFactorySuite<Chain>
 
     fn deploy_on(chain: Chain, _data: Self::DeployData) -> Result<Self, Self::Error> {
         // ########### Upload ##############
-        let suite: AdminFactorySuite<Chain> = AdminFactorySuite::store_on(chain.clone()).unwrap();
+        let suite: AdminFactorySuite<Chain> = AdminFactorySuite::store_on(chain.clone())?;
         suite.factory.instantiate(
             &cw_admin_factory::msg::InstantiateMsg { admin: None },
             None,
@@ -68,7 +68,7 @@ impl<Chain: CwEnv> cw_orch::contract::Deploy<Chain> for PayrollSuite<Chain> {
 
     fn deploy_on(chain: Chain, _data: Self::DeployData) -> Result<Self, Self::Error> {
         // ########### Upload ##############
-        let suite: PayrollSuite<Chain> = PayrollSuite::store_on(chain.clone()).unwrap();
+        let suite: PayrollSuite<Chain> = PayrollSuite::store_on(chain.clone())?;
         // ########### Instantiate ##############
         let _init = suite.payroll.instantiate(
             &cw_payroll_factory::msg::InstantiateMsg {
@@ -111,7 +111,7 @@ impl<Chain: CwEnv> cw_orch::contract::Deploy<Chain> for TokenSwapSuite<Chain> {
 
     fn deploy_on(chain: Chain, _data: Self::DeployData) -> Result<Self, Self::Error> {
         // ########### Upload ##############
-        let suite: TokenSwapSuite<Chain> = TokenSwapSuite::store_on(chain.clone()).unwrap();
+        let suite: TokenSwapSuite<Chain> = TokenSwapSuite::store_on(chain.clone())?;
         Ok(suite)
     }
 }
@@ -143,12 +143,13 @@ impl<Chain: CwEnv> cw_orch::contract::Deploy<Chain> for TokenFactorySuite<Chain>
 
     fn deploy_on(chain: Chain, _data: Self::DeployData) -> Result<Self, Self::Error> {
         // ########### Upload ##############
-        let suite: TokenFactorySuite<Chain> = TokenFactorySuite::store_on(chain.clone()).unwrap();
+        let suite: TokenFactorySuite<Chain> = TokenFactorySuite::store_on(chain.clone())?;
         // ########### Instantiate ##############
-        let init = TokenfactoryIssuerInit::NewToken {
-            subdenom: "DAOTOKEN".into(),
-        };
-        suite.tokenfactory.instantiate(&init, None, None)?;
+        // let init = TokenfactoryIssuerInit::NewToken {
+        //     subdenom: "DAOTOKEN".into(),
+        // };
+        // suite.tokenfactory.instantiate(&init, None, None)?;
+
         Ok(suite)
     }
 }
@@ -180,7 +181,7 @@ impl<Chain: CwEnv> cw_orch::contract::Deploy<Chain> for VestingSuite<Chain> {
 
     fn deploy_on(chain: Chain, _data: Self::DeployData) -> Result<Self, Self::Error> {
         // ########### Upload ##############
-        let suite: VestingSuite<Chain> = VestingSuite::store_on(chain.clone()).unwrap();
+        let suite: VestingSuite<Chain> = VestingSuite::store_on(chain.clone())?;
         Ok(suite)
     }
 }
@@ -212,7 +213,7 @@ impl<Chain: CwEnv> cw_orch::contract::Deploy<Chain> for Cw721RolesSuite<Chain> {
 
     fn deploy_on(chain: Chain, _data: Self::DeployData) -> Result<Self, Self::Error> {
         // ########### Upload ##############
-        let suite: Cw721RolesSuite<Chain> = Cw721RolesSuite::store_on(chain.clone()).unwrap();
+        let suite: Cw721RolesSuite<Chain> = Cw721RolesSuite::store_on(chain.clone())?;
         // ########### Instantiate ##############
         Ok(suite)
     }
@@ -245,7 +246,7 @@ impl<Chain: CwEnv> cw_orch::contract::Deploy<Chain> for DaoMigrationSuite<Chain>
 
     fn deploy_on(chain: Chain, _data: Self::DeployData) -> Result<Self, Self::Error> {
         // ########### Upload ##############
-        let suite: DaoMigrationSuite<Chain> = DaoMigrationSuite::store_on(chain.clone()).unwrap();
+        let suite: DaoMigrationSuite<Chain> = DaoMigrationSuite::store_on(chain.clone())?;
         // ########### Instantiate ##############
 
         Ok(suite)
@@ -279,8 +280,7 @@ impl<Chain: CwEnv> cw_orch::contract::Deploy<Chain> for FantokenFactorySuite<Cha
 
     fn deploy_on(chain: Chain, _data: Self::DeployData) -> Result<Self, Self::Error> {
         // ########### Upload ##############
-        let suite: FantokenFactorySuite<Chain> =
-            FantokenFactorySuite::store_on(chain.clone()).unwrap();
+        let suite: FantokenFactorySuite<Chain> = FantokenFactorySuite::store_on(chain.clone())?;
         // ########### Instantiate ##############
         suite.factory.instantiate(&InstantiateMsg {}, None, None)?;
         Ok(suite)