diff --git a/x/ccv/provider/handler_test.go b/x/ccv/provider/handler_test.go
index 8782a42d5f..c3f7524f68 100644
--- a/x/ccv/provider/handler_test.go
+++ b/x/ccv/provider/handler_test.go
@@ -1,6 +1,7 @@
-package provider_test
+package provider
 
 import (
+	"crypto"
 	"strings"
 	"testing"
 
@@ -8,47 +9,95 @@ import (
 	"github.com/stretchr/testify/require"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
+	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
+	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
+	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	"github.com/cosmos/cosmos-sdk/testutil/testdata"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	testkeeper "github.com/cosmos/interchain-security/testutil/keeper"
-	"github.com/cosmos/interchain-security/x/ccv/provider"
-	"github.com/cosmos/interchain-security/x/ccv/provider/keeper"
+	testutil "github.com/cosmos/interchain-security/testutil/sample"
 	"github.com/cosmos/interchain-security/x/ccv/provider/types"
 )
 
-type Helper struct {
-	t       *testing.T
-	keeper  keeper.Keeper
-	ctx     sdk.Context
-	ctrl    *gomock.Controller
-	mocks   testkeeper.MockedKeepers
-	handler sdk.Handler
-}
-
-func MakeHelper(t *testing.T) Helper {
-	k, ctx, ctrl, mocks := testkeeper.GetProviderKeeperAndCtx(t, testkeeper.NewInMemKeeperParams(t))
-	defer ctrl.Finish()
-	return Helper{
-		t,
-		k,
-		ctx,
-		ctrl,
-		mocks,
-		provider.NewHandler(k),
-	}
-}
-
 func TestInvalidMsg(t *testing.T) {
-	h := MakeHelper(t)
-	res, err := h.handler(sdk.NewContext(nil, tmproto.Header{}, false, nil), testdata.NewTestMsg())
+	k, _, _, _ := testkeeper.GetProviderKeeperAndCtx(t, testkeeper.NewInMemKeeperParams(t))
+	handler := NewHandler(k)
+	res, err := handler(sdk.NewContext(nil, tmproto.Header{}, false, nil), testdata.NewTestMsg())
 	require.Error(t, err)
 	require.Nil(t, res)
 	require.True(t, strings.Contains(err.Error(), "unrecognized provider message type"))
 }
 
-func TestDesignateConsensusKeyForConsumerChainHappy(t *testing.T) {
-	h := MakeHelper(t)
-	msg, err := types.NewMsgDesignateConsensusKeyForConsumerChain()
+func key(k uint64) crypto.PublicKey {
+	_, pubKey := testutil.GetTMCryptoPublicKeyFromSeed(k)
+	return pubKey
+}
+
+func TestDesignateConsensusKeyForConsumerChain(t *testing.T) {
+
+	// cpk0 := key(0)
+	_, cpk0 := testutil.GetTMCryptoPublicKeyFromSeed(0)
+	sdkk, err := cryptocodec.FromTmProtoPublicKey(cpk0)
 	require.NoError(t, err)
-	h.handler(h.ctx, msg)
+
+	testCases := []struct {
+		name string
+		// State-mutating setup specific to this test case
+		mockSetup                func(sdk.Context, testkeeper.MockedKeepers, sdk.ValAddress, stakingtypes.Validator)
+		expError                 bool
+		chainID                  string
+		providerValidatorAddress sdk.ValAddress
+		consumerValidatorPubKey  cryptotypes.PubKey
+	}{
+		{
+			name: "success",
+			mockSetup: func(ctx sdk.Context, mocks testkeeper.MockedKeepers, pva sdk.ValAddress, val stakingtypes.Validator) {
+				gomock.InOrder(
+					mocks.MockStakingKeeper.EXPECT().GetValidator(
+						ctx, pva,
+					).Return(val, true).Times(1),
+				)
+			},
+			expError:                 false,
+			chainID:                  "chainid",
+			providerValidatorAddress: sdk.ValAddress{},
+			consumerValidatorPubKey:  sdkk,
+		},
+	}
+
+	for _, tc := range testCases {
+
+		// TODO: I've done the types now I need to do the tests
+
+		k, ctx, ctrl, mocks := testkeeper.GetProviderKeeperAndCtx(t, testkeeper.NewInMemKeeperParams(t))
+
+		handler := NewHandler(k)
+
+		_, pubKey := testutil.GetTMCryptoPublicKeyFromSeed(0)
+		ppkAny, err := codectypes.NewAnyWithValue(&pubKey)
+		require.NoError(t, err)
+
+		// Specific mock setup
+		tc.mockSetup(ctx, mocks, tc.providerValidatorAddress, stakingtypes.Validator{ConsensusPubkey: ppkAny})
+
+		// Common actions
+
+		msg, err := types.NewMsgDesignateConsensusKeyForConsumerChain("chainId",
+			tc.providerValidatorAddress, tc.consumerValidatorPubKey,
+		)
+		require.NoError(t, err)
+
+		res, err := handler(ctx, msg)
+
+		_ = res
+		// TODO: do something with res
+
+		if tc.expError {
+			require.Error(t, err, "invalid case did not return error")
+		} else {
+			require.NoError(t, err, "valid case returned error")
+		}
+		ctrl.Finish()
+	}
 }