diff --git a/src/utils/fixtures.rs b/src/utils/fixtures.rs
index ce10294..4c17957 100644
--- a/src/utils/fixtures.rs
+++ b/src/utils/fixtures.rs
@@ -102,7 +102,6 @@ impl TestContext {
         let contract_addr = neutron
             .contract_addrs
             .get(PRICE_ORACLE_NAME)
-            .and_then(|addrs| addrs.get(0))
             .cloned()
             .ok_or(Error::MissingContextVariable(String::from(
                 "contract_addrs::price_oracle",
@@ -144,7 +143,7 @@ impl TestContext {
     }
 
     /// Gets the deployed atroport factory for Neutron.
-    pub fn get_astroport_factory(&self) -> Result<Vec<CosmWasm>, Error> {
+    pub fn get_astroport_factory(&self) -> Result<CosmWasm, Error> {
         let neutron = self.get_chain(NEUTRON_CHAIN_NAME);
 
         let code_id =
@@ -154,7 +153,7 @@ impl TestContext {
                 .ok_or(Error::MissingContextVariable(format!(
                     "contract_codes::{FACTORY_NAME}",
                 )))?;
-        let contract_addrs =
+        let contract_addr =
             neutron
                 .contract_addrs
                 .get(FACTORY_NAME)
@@ -164,19 +163,14 @@ impl TestContext {
 
         let artifacts_path = self.artifacts_dir.as_str();
 
-        Ok(contract_addrs
-            .into_iter()
-            .map(|addr| {
-                CosmWasm::new_from_existing(
-                    &neutron.rb,
-                    Some(PathBuf::from(format!(
-                        "{artifacts_path}/{FACTORY_NAME}.wasm"
-                    ))),
-                    Some(*code_id),
-                    Some(addr.clone()),
-                )
-            })
-            .collect::<Vec<_>>())
+        Ok(CosmWasm::new_from_existing(
+            &neutron.rb,
+            Some(PathBuf::from(format!(
+                "{artifacts_path}/{FACTORY_NAME}.wasm"
+            ))),
+            Some(*code_id),
+            Some(contract_addr.clone()),
+        ))
     }
 
     /// Gets a previously deployed astroport pair.
@@ -185,10 +179,7 @@ impl TestContext {
         denom_a: impl AsRef<str>,
         denom_b: impl AsRef<str>,
     ) -> Result<CosmWasm, Error> {
-        let factories = self.get_astroport_factory()?;
-        let factory = factories
-            .get(0)
-            .ok_or(Error::MissingContextVariable(String::from(FACTORY_NAME)))?;
+        let factory = self.get_astroport_factory()?;
 
         let pair_info = factory.query_value(&serde_json::json!(
             {
diff --git a/src/utils/setup/astroport.rs b/src/utils/setup/astroport.rs
index 1de8b89..882d97e 100644
--- a/src/utils/setup/astroport.rs
+++ b/src/utils/setup/astroport.rs
@@ -246,9 +246,7 @@ impl TestContext {
 
         neutron
             .contract_addrs
-            .entry(TOKEN_REGISTRY_NAME.to_owned())
-            .or_default()
-            .push(addr.clone());
+            .insert(TOKEN_REGISTRY_NAME.to_owned(), addr.clone());
 
         self.astroport_token_registry = Some(DeployedContractInfo {
             code_id,
@@ -305,13 +303,11 @@ impl TestContext {
                     "contract_codes::astroport_whitelist",
                 )))?;
 
-        let native_registry_addr = neutron
-            .contract_addrs
-            .get(TOKEN_REGISTRY_NAME)
-            .and_then(|maybe_addr| maybe_addr.get(0))
-            .ok_or(Error::MissingContextVariable(String::from(
+        let native_registry_addr = neutron.contract_addrs.get(TOKEN_REGISTRY_NAME).ok_or(
+            Error::MissingContextVariable(String::from(
                 "contract_ddrs::astroport_native_coin_registry",
-            )))?;
+            )),
+        )?;
 
         let mut contract_a = self.get_contract(FACTORY_NAME)?;
 
@@ -356,9 +352,7 @@ impl TestContext {
 
         neutron
             .contract_addrs
-            .entry(FACTORY_NAME.to_owned())
-            .or_default()
-            .push(contract.address);
+            .insert(FACTORY_NAME.to_owned(), contract.address);
 
         Ok(())
     }
@@ -383,10 +377,7 @@ impl TestContext {
         denom_b: impl Into<String>,
     ) -> Result<(), Error> {
         // Factory contract instance
-        let contracts = self.get_astroport_factory()?;
-        let contract_a = contracts
-            .get(0)
-            .ok_or(Error::MissingContextVariable(String::from(FACTORY_NAME)))?;
+        let contract_a = self.get_astroport_factory()?;
 
         // Create the pair
         let tx = contract_a.execute(
diff --git a/src/utils/setup/valence.rs b/src/utils/setup/valence.rs
index 9534037..136f5d6 100644
--- a/src/utils/setup/valence.rs
+++ b/src/utils/setup/valence.rs
@@ -437,9 +437,7 @@ impl TestContext {
 
         chain
             .contract_addrs
-            .entry(AUCTIONS_MANAGER_CONTRACT_NAME.to_owned())
-            .or_default()
-            .push(contract.address);
+            .insert(AUCTIONS_MANAGER_CONTRACT_NAME.to_owned(), contract.address);
 
         Ok(())
     }
@@ -488,9 +486,7 @@ impl TestContext {
 
         chain
             .contract_addrs
-            .entry(PRICE_ORACLE_NAME.to_owned())
-            .or_default()
-            .push(contract.address);
+            .insert(PRICE_ORACLE_NAME.to_owned(), contract.address);
 
         Ok(())
     }
@@ -636,13 +632,13 @@ impl TestContext {
         // The auctions manager for this deployment
         let contract_a = self.get_auctions_manager()?;
         let neutron = self.get_chain(NEUTRON_CHAIN_NAME);
-        let oracle = neutron
-            .contract_addrs
-            .get(PRICE_ORACLE_NAME)
-            .and_then(|addrs| addrs.get(0))
-            .ok_or(Error::MissingContextVariable(String::from(
-                "contract_addrs::price_oracle",
-            )))?;
+        let oracle =
+            neutron
+                .contract_addrs
+                .get(PRICE_ORACLE_NAME)
+                .ok_or(Error::MissingContextVariable(String::from(
+                    "contract_addrs::price_oracle",
+                )))?;
 
         let receipt = contract_a.execute(
             sender_key,
diff --git a/src/utils/test_context.rs b/src/utils/test_context.rs
index d2e29a3..a0e83f2 100644
--- a/src/utils/test_context.rs
+++ b/src/utils/test_context.rs
@@ -310,7 +310,7 @@ pub struct LocalChain {
     pub admin_addr: String,
     pub native_denom: String,
     /// contract addresses for deployed instances of contracts
-    pub contract_addrs: HashMap<String, Vec<String>>,
+    pub contract_addrs: HashMap<String, String>,
     /// The name of the chain
     pub chain_name: String,
     pub chain_prefix: String,