diff --git a/app/app.go b/app/app.go
index 78a73a1d5..fe7815ceb 100644
--- a/app/app.go
+++ b/app/app.go
@@ -42,9 +42,8 @@ import (
 	"github.com/classic-terra/core/v2/app/keepers"
 	terraappparams "github.com/classic-terra/core/v2/app/params"
 
-	ibckeeper "github.com/cosmos/ibc-go/v6/modules/core/keeper"
 	capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper"
-
+	ibckeeper "github.com/cosmos/ibc-go/v6/modules/core/keeper"
 
 	// upgrades
 	"github.com/classic-terra/core/v2/app/upgrades"
@@ -442,4 +441,4 @@ func (app *TerraApp) GetScopedIBCKeeper() capabilitykeeper.ScopedKeeper {
 
 func (app *TerraApp) GetTxConfig() client.TxConfig {
 	return MakeEncodingConfig().TxConfig
-}
\ No newline at end of file
+}
diff --git a/app/test_helpers.go b/app/test_helpers.go
index be41495e3..8e729b6bf 100644
--- a/app/test_helpers.go
+++ b/app/test_helpers.go
@@ -24,19 +24,19 @@ import (
 	tmtypes "github.com/tendermint/tendermint/types"
 )
 
-var defaultGenesisBz []byte
-
-func getDefaultGenesisStateBytes() []byte {
-	if len(defaultGenesisBz) == 0 {
-		genesisState := NewDefaultGenesisState()
-		stateBytes, err := json.MarshalIndent(genesisState, "", " ")
-		if err != nil {
-			panic(err)
-		}
-		defaultGenesisBz = stateBytes
-	}
-	return defaultGenesisBz
-}
+// var defaultGenesisBz []byte
+
+// func getDefaultGenesisStateBytes() []byte {
+// 	if len(defaultGenesisBz) == 0 {
+// 		genesisState := NewDefaultGenesisState()
+// 		stateBytes, err := json.MarshalIndent(genesisState, "", " ")
+// 		if err != nil {
+// 			panic(err)
+// 		}
+// 		defaultGenesisBz = stateBytes
+// 	}
+// 	return defaultGenesisBz
+// }
 
 // interBlockCacheOpt returns a BaseApp option function that sets the persistent
 // inter-block write-through cache.
diff --git a/tests/ibc-hooks/ibc_middleware_test.go b/tests/ibc-hooks/ibc_middleware_test.go
index 3575f49f8..88e07be4b 100644
--- a/tests/ibc-hooks/ibc_middleware_test.go
+++ b/tests/ibc-hooks/ibc_middleware_test.go
@@ -190,6 +190,7 @@ func (suite *HooksTestSuite) receivePacketWithSequence(receiver, memo string, pr
 
 	// recv in chain a
 	res, err := suite.path.EndpointA.RecvPacketWithResult(packet)
+	suite.Require().NoError(err)
 
 	// get the ack from the chain a's response
 	ack, err := ibctesting.ParseAckFromEvents(res.GetEvents())
@@ -306,7 +307,7 @@ func (suite *HooksTestSuite) TestPacketsThatShouldBeSkipped() {
 		} else {
 			suite.Require().Contains(ackStr, "error", tc.memo)
 		}
-		sequence += 1
+		sequence++
 	}
 }
 
@@ -458,7 +459,6 @@ func (suite *HooksTestSuite) TestAcks() {
 		&suite.Suite, addr,
 		[]byte(fmt.Sprintf(`{"get_count": {"addr": "%s"}}`, addr)))
 	suite.Require().Equal(`{"count":2}`, state)
-
 }
 
 func (suite *HooksTestSuite) TestTimeouts() {
@@ -491,7 +491,6 @@ func (suite *HooksTestSuite) TestTimeouts() {
 		&suite.Suite, addr,
 		[]byte(fmt.Sprintf(`{"get_count": {"addr": "%s"}}`, addr)))
 	suite.Require().Equal(`{"count":10}`, state)
-
 }
 
 func (suite *HooksTestSuite) TestSendWithoutMemo() {
@@ -530,15 +529,13 @@ func (suite *HooksTestSuite) SetupIBCRouteOnChainB(swaprouterAddr, owner sdk.Acc
 	suite.Require().NoError(err)
 	err = suite.path.EndpointB.UpdateClient()
 	suite.Require().NoError(err)
-
 }
 
 func (suite *HooksTestSuite) GetChain(name Chain) *terraibctesting.TestChain {
 	if name == ChainA {
 		return suite.chainA
-	} else {
-		return suite.chainB
 	}
+	return suite.chainB
 }
 
 // MustExtractDenomFromPacketOnRecv takes a packet with a valid ICS20 token data in the Data field and returns the
diff --git a/tests/terraibctesting/wasm.go b/tests/terraibctesting/wasm.go
index f78f3888f..61435077a 100644
--- a/tests/terraibctesting/wasm.go
+++ b/tests/terraibctesting/wasm.go
@@ -67,7 +67,7 @@ func (chain *TestChain) QueryContract(suite *suite.Suite, contract sdk.AccAddres
 	return string(state)
 }
 
-func (chain *TestChain) QueryContractJson(suite *suite.Suite, contract sdk.AccAddress, key []byte) gjson.Result {
+func (chain *TestChain) QueryContractJSON(suite *suite.Suite, contract sdk.AccAddress, key []byte) gjson.Result {
 	terraApp := chain.GetTerraApp()
 	state, err := terraApp.WasmKeeper.QuerySmart(chain.GetContext(), contract, key)
 	suite.Require().NoError(err)