diff --git a/packages/starship/__tests__/v0/token.test.ts b/packages/starship/__tests__/v0/token.test.ts
index b241dd5ee..2f41a6769 100644
--- a/packages/starship/__tests__/v0/token.test.ts
+++ b/packages/starship/__tests__/v0/token.test.ts
@@ -90,12 +90,12 @@ describe('Token transfers', () => {
     const cosmosAddress = (await cosmosWallet.getAccounts())[0].address;
 
     const ibcInfos = chainInfo.fetcher.getChainIbcData(
-      chainInfo.chain.chain_id
+      chainInfo.chain.chain_name
     );
     const ibcInfo = ibcInfos.find(
       (i) =>
-        i.chain_1.chain_name === chainInfo.chain.chain_id &&
-        i.chain_2.chain_name === cosmosChainInfo.chain.chain_id
+        i.chain_1.chain_name === chainInfo.chain.chain_name &&
+        i.chain_2.chain_name === cosmosChainInfo.chain.chain_name
     );
 
     expect(ibcInfo).toBeTruthy();
diff --git a/packages/starship/__tests__/v1/staking.test.ts b/packages/starship/__tests__/v1/staking.test.ts
index c12225d49..f85597638 100644
--- a/packages/starship/__tests__/v1/staking.test.ts
+++ b/packages/starship/__tests__/v1/staking.test.ts
@@ -2,7 +2,7 @@ import { assertIsDeliverTxSuccess } from '@cosmjs/stargate';
 import { DirectSecp256k1HdWallet } from '@cosmjs/proto-signing';
 
 import { BigNumber } from 'bignumber.js';
-import { cosmos, getSigningCosmosTxRpc } from '../../src/codegen1';
+import { cosmos, getSigningOsmosisClient } from '../../src/codegen1';
 import { useChain, generateMnemonic } from 'starshipjs';
 import './setup.test';
 import { MsgDelegate } from '../../src/codegen1/cosmos/staking/v1beta1/tx';
@@ -34,11 +34,6 @@ describe('Staking tokens testing', () => {
     });
     address1 = (await wallet1.getAccounts())[0].address;
 
-    msgClient1 = await cosmos.ClientFactory.createRPCMsgExtensions({
-      rpcEndpoint: await getRpcEndpoint(),
-      signer: wallet1
-    });
-
     // Create custom cosmos interchain client
     queryClient = await cosmos.ClientFactory.createRPCQueryClient({
       rpcEndpoint: await getRpcEndpoint()
@@ -77,6 +72,10 @@ describe('Staking tokens testing', () => {
   });
 
   it('stake tokens to genesis validator', async () => {
+    const signingClient = await getSigningOsmosisClient({
+      rpcEndpoint: await getRpcEndpoint(),
+      signer: wallet1
+    });
     const { balance } = await queryClient.cosmos.bank.v1beta1.balance({
       address: address1,
       denom
@@ -105,12 +104,7 @@ describe('Staking tokens testing', () => {
       gas: '550000'
     };
 
-    const result = await msgClient1.cosmos.staking.v1beta1.delegate(
-      address1,
-      msg,
-      fee
-    );
-
+    const result = await signingClient.signAndBroadcast(address1, [msg], fee);
     assertIsDeliverTxSuccess(result);
   });
 
diff --git a/packages/starship/__tests__/v1/token.test.ts b/packages/starship/__tests__/v1/token.test.ts
index 052b2bec7..ac23c1e08 100644
--- a/packages/starship/__tests__/v1/token.test.ts
+++ b/packages/starship/__tests__/v1/token.test.ts
@@ -110,12 +110,12 @@ describe("Token transfers", () => {
     const cosmosAddress = (await cosmosWallet.getAccounts())[0].address;
 
     const ibcInfos = chainInfo.fetcher.getChainIbcData(
-      chainInfo.chain.chain_id
+      chainInfo.chain.chain_name
     );
     const ibcInfo = ibcInfos.find(
       (i) =>
-        i.chain_1.chain_name === chainInfo.chain.chain_id &&
-        i.chain_2.chain_name === cosmosChainInfo.chain.chain_id
+        i.chain_1.chain_name === chainInfo.chain.chain_name &&
+        i.chain_2.chain_name === cosmosChainInfo.chain.chain_name
     );
 
     expect(ibcInfo).toBeTruthy();