diff --git a/tests/e2e/dao/asset_distribution_suite.go b/tests/e2e/dao/asset_distribution_suite.go
index 165c7db..3aad073 100644
--- a/tests/e2e/dao/asset_distribution_suite.go
+++ b/tests/e2e/dao/asset_distribution_suite.go
@@ -67,7 +67,7 @@ func (s *AssetDistributionE2ETestSuite) TestAssetDistribution() {
 			break
 		}
 	}
-
+	errmsg := "rpc error: code = NotFound desc = distribution not found: key not found"
 	testCases := []struct {
 		name          string
 		requestHeight int64
@@ -76,17 +76,17 @@ func (s *AssetDistributionE2ETestSuite) TestAssetDistribution() {
 		{
 			"request height too low",
 			s.distributionOffset,
-			"rpc error: code = NotFound desc = distribution not found: key not found",
+			errmsg,
 		},
 		{
 			"wrong request height",
 			height,
-			"rpc error: code = NotFound desc = distribution not found: key not found",
+			errmsg,
 		},
 		{
 			"request height too high",
 			2*s.reissaunceEpochs + s.distributionOffset,
-			"rpc error: code = NotFound desc = distribution not found: key not found",
+			errmsg,
 		},
 		{
 			"valid distribution request",
diff --git a/util/mocks/mqtt.go b/util/mocks/mqtt.go
index a4ae06e..e6fcba3 100644
--- a/util/mocks/mqtt.go
+++ b/util/mocks/mqtt.go
@@ -24,6 +24,7 @@ func GetConnectFunc() mqtt.Token {
 
 // GetDisconnectFunc fetches the mock client's `Disconnect` func
 func GetDisconnectFunc(_ uint) {
+	// not implemented at this point in time
 }
 
 // GetPublishFunc fetches the mock client's `Publish` func
diff --git a/x/dao/types/message_init_pop_test.go b/x/dao/types/message_init_pop_test.go
index 1b1119f..59ac7aa 100644
--- a/x/dao/types/message_init_pop_test.go
+++ b/x/dao/types/message_init_pop_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestMsgInitPop_ValidateBasic(t *testing.T) {
+func TestMsgInitPopValidateBasic(t *testing.T) {
 	t.Parallel()
 	tests := []struct {
 		name string
@@ -16,7 +16,7 @@ func TestMsgInitPop_ValidateBasic(t *testing.T) {
 		err  error
 	}{
 		{
-			name: "invalid address",
+			name: sdkerrors.ErrInvalidAddress.Error(),
 			msg: MsgInitPop{
 				Creator: errormsg.ErrorInvalidAddress,
 			},
diff --git a/x/dao/types/message_mint_token_test.go b/x/dao/types/message_mint_token_test.go
index 436f3f1..0be4f1a 100644
--- a/x/dao/types/message_mint_token_test.go
+++ b/x/dao/types/message_mint_token_test.go
@@ -16,7 +16,7 @@ func TestMsgMintToken_ValidateBasic(t *testing.T) {
 		err  error
 	}{
 		{
-			name: "invalid address",
+			name: sdkerrors.ErrInvalidAddress.Error(),
 			msg: MsgMintToken{
 				Creator: errormsg.ErrorInvalidAddress,
 			},
diff --git a/x/dao/types/message_update_params_test.go b/x/dao/types/message_update_params_test.go
index 90f4217..cb2c2e5 100644
--- a/x/dao/types/message_update_params_test.go
+++ b/x/dao/types/message_update_params_test.go
@@ -16,7 +16,7 @@ func TestMsgUpdateParams_ValidateBasic(t *testing.T) {
 		err  error
 	}{
 		{
-			name: "invalid address",
+			name: sdkerrors.ErrInvalidAddress.Error(),
 			msg: MsgUpdateParams{
 				Authority: errormsg.ErrorInvalidAddress,
 			},
diff --git a/x/dao/types/messages_redeem_claim_test.go b/x/dao/types/messages_redeem_claim_test.go
index 88f0dab..a43f13d 100644
--- a/x/dao/types/messages_redeem_claim_test.go
+++ b/x/dao/types/messages_redeem_claim_test.go
@@ -16,7 +16,7 @@ func TestMsgCreateRedeemClaim_ValidateBasic(t *testing.T) {
 		err  error
 	}{
 		{
-			name: "invalid address",
+			name: sdkerrors.ErrInvalidAddress.Error(),
 			msg: MsgCreateRedeemClaim{
 				Creator: errormsg.ErrorInvalidAddress,
 			},
@@ -45,7 +45,7 @@ func TestMsgUpdateRedeemClaim_ValidateBasic(t *testing.T) {
 		err  error
 	}{
 		{
-			name: "invalid address",
+			name: sdkerrors.ErrInvalidAddress.Error(),
 			msg: MsgUpdateRedeemClaim{
 				Creator: errormsg.ErrorInvalidAddress,
 			},
@@ -74,7 +74,7 @@ func TestMsgConfirmRedeemClaim_ValidateBasic(t *testing.T) {
 		err  error
 	}{
 		{
-			name: "invalid address",
+			name: sdkerrors.ErrInvalidAddress.Error(),
 			msg: MsgConfirmRedeemClaim{
 				Creator: errormsg.ErrorInvalidAddress,
 			},
diff --git a/x/machine/types/message_attest_machine_test.go b/x/machine/types/message_attest_machine_test.go
index 3eb2f51..66a2427 100644
--- a/x/machine/types/message_attest_machine_test.go
+++ b/x/machine/types/message_attest_machine_test.go
@@ -16,7 +16,7 @@ func TestMsgAttestMachineValidateBasic(t *testing.T) {
 		err  error
 	}{
 		{
-			name: "invalid address",
+			name: sdkerrors.ErrInvalidAddress.Error(),
 			msg: MsgAttestMachine{
 				Creator: errormsg.ErrorInvalidAddress,
 			},
diff --git a/x/machine/types/message_register_trust_anchor_test.go b/x/machine/types/message_register_trust_anchor_test.go
index f348711..7ed28df 100644
--- a/x/machine/types/message_register_trust_anchor_test.go
+++ b/x/machine/types/message_register_trust_anchor_test.go
@@ -16,7 +16,7 @@ func TestMsgRegisterTrustAnchor_ValidateBasic(t *testing.T) {
 		err  error
 	}{
 		{
-			name: "invalid address",
+			name: sdkerrors.ErrInvalidAddress.Error(),
 			msg: MsgRegisterTrustAnchor{
 				Creator: errormsg.ErrorInvalidAddress,
 			},
diff --git a/x/machine/types/message_update_params_test.go b/x/machine/types/message_update_params_test.go
index 90f4217..cb2c2e5 100644
--- a/x/machine/types/message_update_params_test.go
+++ b/x/machine/types/message_update_params_test.go
@@ -16,7 +16,7 @@ func TestMsgUpdateParams_ValidateBasic(t *testing.T) {
 		err  error
 	}{
 		{
-			name: "invalid address",
+			name: sdkerrors.ErrInvalidAddress.Error(),
 			msg: MsgUpdateParams{
 				Authority: errormsg.ErrorInvalidAddress,
 			},