diff --git a/testutil/network/network_setup.go b/testutil/network/network_setup.go
index 7fe4855de9..0a942aa83b 100644
--- a/testutil/network/network_setup.go
+++ b/testutil/network/network_setup.go
@@ -553,7 +553,7 @@ func (n *Network) LatestHeight() (int64, error) {
 	for {
 		select {
 		case <-timeout.C:
-			return latestHeight, errors.New("timeout exceeded waiting for block")
+			return latestHeight, errors.New("LatestHeight: timeout exceeded waiting for block")
 		case <-ticker.C:
 			res, err := queryClient.GetLatestBlock(context.Background(), &tmservice.GetLatestBlockRequest{})
 			if err == nil && res != nil {
@@ -590,7 +590,7 @@ func (n *Network) WaitForHeightWithTimeout(h int64, t time.Duration) (int64, err
 	for {
 		select {
 		case <-timeout.C:
-			return latestHeight, errors.New("timeout exceeded waiting for block")
+			return latestHeight, errors.New("WaitForHeightWithTimeout: timeout exceeded waiting for block")
 		case <-ticker.C:
 
 			res, err := queryClient.GetLatestBlock(context.Background(), &tmservice.GetLatestBlockRequest{})
diff --git a/x/crosschain/client/querytests/suite.go b/x/crosschain/client/querytests/suite.go
index 9d57b6ce79..36eb7c1d34 100644
--- a/x/crosschain/client/querytests/suite.go
+++ b/x/crosschain/client/querytests/suite.go
@@ -9,7 +9,7 @@ import (
 	cmdcfg "github.com/zeta-chain/zetacore/cmd/zetacored/config"
 	"github.com/zeta-chain/zetacore/testutil/network"
 	"github.com/zeta-chain/zetacore/x/crosschain/types"
-	observerTypes "github.com/zeta-chain/zetacore/x/observer/types"
+	observertypes "github.com/zeta-chain/zetacore/x/observer/types"
 )
 
 type CliTestSuite struct {
@@ -18,7 +18,7 @@ type CliTestSuite struct {
 	cfg             network.Config
 	network         *network.Network
 	crosschainState *types.GenesisState
-	observerState   *observerTypes.GenesisState
+	observerState   *observertypes.GenesisState
 }
 
 func NewCLITestSuite(cfg network.Config) *CliTestSuite {