diff --git a/x/oracle/simulation/decoder_test.go b/x/oracle/simulation/decoder_test.go
index 45db80f6..ab7f87ac 100644
--- a/x/oracle/simulation/decoder_test.go
+++ b/x/oracle/simulation/decoder_test.go
@@ -10,10 +10,13 @@ import (
 
 	"github.com/cometbft/cometbft/crypto/ed25519"
 
+	"github.com/cosmos/cosmos-sdk/codec"
+	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
+	"github.com/cosmos/cosmos-sdk/std"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/kv"
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 
-	"github.com/Team-Kujira/core/x/oracle/keeper"
 	sim "github.com/Team-Kujira/core/x/oracle/simulation"
 	"github.com/Team-Kujira/core/x/oracle/types"
 )
@@ -27,7 +30,11 @@ var (
 )
 
 func TestDecodeDistributionStore(t *testing.T) {
-	cdc := keeper.MakeTestCodec(t)
+	interfaceRegistry := codectypes.NewInterfaceRegistry()
+	std.RegisterInterfaces(interfaceRegistry)
+	authtypes.RegisterInterfaces(interfaceRegistry)
+
+	cdc := codec.NewProtoCodec(interfaceRegistry)
 	dec := sim.NewDecodeStore(cdc)
 
 	exchangeRate := math.LegacyNewDecWithPrec(1234, 1)
diff --git a/x/scheduler/keeper/msg_server_test.go b/x/scheduler/keeper/msg_server_test.go
index f6522e25..1f323479 100644
--- a/x/scheduler/keeper/msg_server_test.go
+++ b/x/scheduler/keeper/msg_server_test.go
@@ -14,8 +14,8 @@ func TestCreateHook(t *testing.T) {
 	ms := NewMsgServerImpl(keeper)
 
 	authority := "kujira10d07y265gmmuvt4z0w9aw880jnsr700jt23ame"
-	executor := "kujira1fl48vsnmsdzcv85q5d2q4z5ajdha8yu3ynth5a"
-	contract := "kujira1fl48vsnmsdzcv85q5d2q4z5ajdha8yu3ynth5a"
+	executor := "cosmos1fl48vsnmsdzcv85q5d2q4z5ajdha8yu34mf0eh"
+	contract := "cosmos1fl48vsnmsdzcv85q5d2q4z5ajdha8yu34mf0eh"
 	jsonMsg := wasmtypes.RawContractMessage(`{"foo": 123}`)
 	frequency := int64(1000)
 	funds := sdk.NewCoins(sdk.NewInt64Coin("atom", 100))
@@ -30,7 +30,7 @@ func TestCreateHook(t *testing.T) {
 	})
 	require.NoError(t, err)
 
-	authority = "kujira1fl48vsnmsdzcv85q5d2q4z5ajdha8yu3ynth5a"
+	authority = "cosmos1fl48vsnmsdzcv85q5d2q4z5ajdha8yu34mf0eh"
 
 	_, err = ms.CreateHook(ctx, &types.MsgCreateHook{
 		Authority: authority,
@@ -48,8 +48,8 @@ func TestUpdateHook(t *testing.T) {
 	ms := NewMsgServerImpl(keeper)
 
 	authority := "kujira10d07y265gmmuvt4z0w9aw880jnsr700jt23ame"
-	executor := "kujira1fl48vsnmsdzcv85q5d2q4z5ajdha8yu3ynth5a"
-	contract := "kujira1fl48vsnmsdzcv85q5d2q4z5ajdha8yu3ynth5a"
+	executor := "cosmos1fl48vsnmsdzcv85q5d2q4z5ajdha8yu34mf0eh"
+	contract := "cosmos1fl48vsnmsdzcv85q5d2q4z5ajdha8yu34mf0eh"
 	jsonMsg := wasmtypes.RawContractMessage(`{"foo": 123}`)
 	frequency := int64(1000)
 	funds := sdk.NewCoins(sdk.NewInt64Coin("atom", 100))
@@ -74,7 +74,7 @@ func TestUpdateHook(t *testing.T) {
 	})
 	require.NoError(t, err)
 
-	authority = "kujira1fl48vsnmsdzcv85q5d2q4z5ajdha8yu3ynth5a"
+	authority = "cosmos1fl48vsnmsdzcv85q5d2q4z5ajdha8yu34mf0eh"
 
 	_, err = ms.UpdateHook(ctx, &types.MsgUpdateHook{
 		Authority: authority,
@@ -93,8 +93,8 @@ func TestDeleteHook(t *testing.T) {
 	ms := NewMsgServerImpl(keeper)
 
 	authority := "kujira10d07y265gmmuvt4z0w9aw880jnsr700jt23ame"
-	executor := "kujira1fl48vsnmsdzcv85q5d2q4z5ajdha8yu3ynth5a"
-	contract := "kujira1fl48vsnmsdzcv85q5d2q4z5ajdha8yu3ynth5a"
+	executor := "cosmos1fl48vsnmsdzcv85q5d2q4z5ajdha8yu34mf0eh"
+	contract := "cosmos1fl48vsnmsdzcv85q5d2q4z5ajdha8yu34mf0eh"
 	jsonMsg := wasmtypes.RawContractMessage(`{"foo": 123}`)
 	frequency := int64(1000)
 	funds := sdk.NewCoins(sdk.NewInt64Coin("atom", 100))
@@ -114,7 +114,7 @@ func TestDeleteHook(t *testing.T) {
 	})
 	require.NoError(t, err)
 
-	authority = "kujira1fl48vsnmsdzcv85q5d2q4z5ajdha8yu3ynth5a"
+	authority = "cosmos1fl48vsnmsdzcv85q5d2q4z5ajdha8yu34mf0eh"
 	_, err = ms.DeleteHook(ctx, &types.MsgDeleteHook{
 		Authority: authority,
 		Id:        id,
diff --git a/x/scheduler/types/msgs_test.go b/x/scheduler/types/msgs_test.go
index e2143984..543a574d 100644
--- a/x/scheduler/types/msgs_test.go
+++ b/x/scheduler/types/msgs_test.go
@@ -12,9 +12,9 @@ func TestMsgCreateHook_ValidateBasic(t *testing.T) {
 	jsonMsg := wasmtypes.RawContractMessage(`{"foo": 123}`)
 
 	msg := NewMsgCreateHook(
-		"kujira1fl48vsnmsdzcv85q5d2q4z5ajdha8yu3ynth5a",
-		"kujira1fl48vsnmsdzcv85q5d2q4z5ajdha8yu3ynth5a",
-		"kujira1fl48vsnmsdzcv85q5d2q4z5ajdha8yu3ynth5a",
+		"cosmos1fl48vsnmsdzcv85q5d2q4z5ajdha8yu34mf0eh",
+		"cosmos1fl48vsnmsdzcv85q5d2q4z5ajdha8yu34mf0eh",
+		"cosmos1fl48vsnmsdzcv85q5d2q4z5ajdha8yu34mf0eh",
 		jsonMsg,
 		1000,
 		sdk.NewCoins(sdk.NewInt64Coin("atom", 100)),
@@ -38,10 +38,10 @@ func TestMsgUpdateHook_ValidateBasic(t *testing.T) {
 	jsonMsg := wasmtypes.RawContractMessage(`{"foo": 123}`)
 
 	msg := NewMsgUpdateHook(
-		"kujira1fl48vsnmsdzcv85q5d2q4z5ajdha8yu3ynth5a",
+		"cosmos1fl48vsnmsdzcv85q5d2q4z5ajdha8yu34mf0eh",
 		1,
-		"kujira1fl48vsnmsdzcv85q5d2q4z5ajdha8yu3ynth5a",
-		"kujira1fl48vsnmsdzcv85q5d2q4z5ajdha8yu3ynth5a",
+		"cosmos1fl48vsnmsdzcv85q5d2q4z5ajdha8yu34mf0eh",
+		"cosmos1fl48vsnmsdzcv85q5d2q4z5ajdha8yu34mf0eh",
 		jsonMsg,
 		1000,
 		sdk.NewCoins(sdk.NewInt64Coin("atom", 100)),
@@ -64,7 +64,7 @@ func TestMsgUpdateHook_ValidateBasic_Error(t *testing.T) {
 
 func TestMsgDeleteHook_ValidateBasic(t *testing.T) {
 	msg := NewMsgDeleteHook(
-		"kujira1fl48vsnmsdzcv85q5d2q4z5ajdha8yu3ynth5a",
+		"cosmos1fl48vsnmsdzcv85q5d2q4z5ajdha8yu34mf0eh",
 		1,
 	)
 	require.NoError(t, msg.ValidateBasic())