diff --git a/x/staking/keeper/delegation_test.go b/x/staking/keeper/delegation_test.go
index a73447cd2..8b963853a 100644
--- a/x/staking/keeper/delegation_test.go
+++ b/x/staking/keeper/delegation_test.go
@@ -802,192 +802,59 @@ func TestRedelegationMaxEntries(t *testing.T) {
 	require.NoError(t, err)
 }
 
-//func TestRedelegationMaxEntries(t *testing.T) {
-//	ctx, _, bk, keeper, _ := CreateTestInput(t, false, 0)
-//	startTokens := sdk.TokensFromConsensusPower(20)
-//	startCoins := sdk.NewCoins(sdk.NewCoin(keeper.BondDenom(ctx), startTokens))
-//
-//	// add bonded tokens to pool for delegations
-//	notBondedPool := keeper.GetNotBondedPool(ctx)
-//	oldNotBonded := bk.GetAllBalances(ctx, notBondedPool.GetAddress())
-//	err := bk.SetBalances(ctx, notBondedPool.GetAddress(), oldNotBonded.Add(startCoins...))
-//	require.NoError(t, err)
-//	keeper.supplyKeeper.SetModuleAccount(ctx, notBondedPool)
-//
-//	// create a validator with a self-delegation
-//	validator := types.NewValidator(addrVals[0], PKs[0], types.Description{})
-//	valTokens := sdk.TokensFromConsensusPower(10)
-//	validator, issuedShares := validator.AddTokensFromDel(valTokens)
-//	require.Equal(t, valTokens, issuedShares.RoundInt())
-//	validator = TestingUpdateValidator(keeper, ctx, validator, true)
-//	val0AccAddr := sdk.AccAddress(addrVals[0].Bytes())
-//	selfDelegation := types.NewDelegation(val0AccAddr, addrVals[0], issuedShares)
-//	keeper.SetDelegation(ctx, selfDelegation)
-//
-//	// create a second validator
-//	validator2 := types.NewValidator(addrVals[1], PKs[1], types.Description{})
-//	validator2, issuedShares = validator2.AddTokensFromDel(valTokens)
-//	require.Equal(t, valTokens, issuedShares.RoundInt())
-//
-//	validator2 = TestingUpdateValidator(keeper, ctx, validator2, true)
-//	require.Equal(t, sdk.Bonded, validator2.Status)
-//
-//	maxEntries := keeper.MaxEntries(ctx)
-//
-//	// redelegations should pass
-//	var completionTime time.Time
-//	for i := uint32(0); i < maxEntries; i++ {
-//		var err error
-//		completionTime, err = keeper.BeginRedelegation(ctx, val0AccAddr, addrVals[0], addrVals[1], sdk.NewDec(1))
-//		require.NoError(t, err)
-//	}
-//
-//	// an additional redelegation should fail due to max entries
-//	_, err = keeper.BeginRedelegation(ctx, val0AccAddr, addrVals[0], addrVals[1], sdk.NewDec(1))
-//	require.Error(t, err)
-//
-//	// mature redelegations
-//	ctx = ctx.WithBlockTime(completionTime)
-//	err = keeper.CompleteRedelegation(ctx, val0AccAddr, addrVals[0], addrVals[1])
-//	require.NoError(t, err)
-//
-//	// redelegation should work again
-//	_, err = keeper.BeginRedelegation(ctx, val0AccAddr, addrVals[0], addrVals[1], sdk.NewDec(1))
-//	require.NoError(t, err)
-//}
-//
-//func TestRedelegateSelfDelegation(t *testing.T) {
-//	ctx, _, bk, keeper, _ := CreateTestInput(t, false, 0)
-//	startTokens := sdk.TokensFromConsensusPower(30)
-//	startCoins := sdk.NewCoins(sdk.NewCoin(keeper.BondDenom(ctx), startTokens))
-//
-//	// add bonded tokens to pool for delegations
-//	notBondedPool := keeper.GetNotBondedPool(ctx)
-//	oldNotBonded := bk.GetAllBalances(ctx, notBondedPool.GetAddress())
-//	err := bk.SetBalances(ctx, notBondedPool.GetAddress(), oldNotBonded.Add(startCoins...))
-//	require.NoError(t, err)
-//	keeper.supplyKeeper.SetModuleAccount(ctx, notBondedPool)
-//
-//	//create a validator with a self-delegation
-//	validator := types.NewValidator(addrVals[0], PKs[0], types.Description{})
-//	valTokens := sdk.TokensFromConsensusPower(10)
-//	validator, issuedShares := validator.AddTokensFromDel(valTokens)
-//	require.Equal(t, valTokens, issuedShares.RoundInt())
-//
-//	validator = TestingUpdateValidator(keeper, ctx, validator, true)
-//
-//	val0AccAddr := sdk.AccAddress(addrVals[0].Bytes())
-//	selfDelegation := types.NewDelegation(val0AccAddr, addrVals[0], issuedShares)
-//	keeper.SetDelegation(ctx, selfDelegation)
-//
-//	// create a second validator
-//	validator2 := types.NewValidator(addrVals[1], PKs[1], types.Description{})
-//	validator2, issuedShares = validator2.AddTokensFromDel(valTokens)
-//	require.Equal(t, valTokens, issuedShares.RoundInt())
-//	validator2 = TestingUpdateValidator(keeper, ctx, validator2, true)
-//	require.Equal(t, sdk.Bonded, validator2.Status)
-//
-//	// create a second delegation to validator 1
-//	delTokens := sdk.TokensFromConsensusPower(10)
-//	validator, issuedShares = validator.AddTokensFromDel(delTokens)
-//	require.Equal(t, delTokens, issuedShares.RoundInt())
-//	validator = TestingUpdateValidator(keeper, ctx, validator, true)
-//
-//	delegation := types.NewDelegation(addrDels[0], addrVals[0], issuedShares)
-//	keeper.SetDelegation(ctx, delegation)
-//
-//	_, err = keeper.BeginRedelegation(ctx, val0AccAddr, addrVals[0], addrVals[1], delTokens.ToDec())
-//	require.NoError(t, err)
-//
-//	// end block
-//	updates := keeper.ApplyAndReturnValidatorSetUpdates(ctx)
-//	require.Equal(t, 2, len(updates))
-//
-//	validator, found := keeper.GetValidator(ctx, addrVals[0])
-//	require.True(t, found)
-//	require.Equal(t, valTokens, validator.Tokens)
-//	require.Equal(t, sdk.Unbonding, validator.Status)
-//}
-//
-//func TestRedelegateFromUnbondingValidator(t *testing.T) {
-//	ctx, _, bk, keeper, _ := CreateTestInput(t, false, 0)
-//	startTokens := sdk.TokensFromConsensusPower(30)
-//	startCoins := sdk.NewCoins(sdk.NewCoin(keeper.BondDenom(ctx), startTokens))
-//
-//	// add bonded tokens to pool for delegations
-//	notBondedPool := keeper.GetNotBondedPool(ctx)
-//	oldNotBonded := bk.GetAllBalances(ctx, notBondedPool.GetAddress())
-//	err := bk.SetBalances(ctx, notBondedPool.GetAddress(), oldNotBonded.Add(startCoins...))
-//	require.NoError(t, err)
-//	keeper.supplyKeeper.SetModuleAccount(ctx, notBondedPool)
-//
-//	//create a validator with a self-delegation
-//	validator := types.NewValidator(addrVals[0], PKs[0], types.Description{})
-//
-//	valTokens := sdk.TokensFromConsensusPower(10)
-//	validator, issuedShares := validator.AddTokensFromDel(valTokens)
-//	require.Equal(t, valTokens, issuedShares.RoundInt())
-//	validator = TestingUpdateValidator(keeper, ctx, validator, true)
-//	val0AccAddr := sdk.AccAddress(addrVals[0].Bytes())
-//	selfDelegation := types.NewDelegation(val0AccAddr, addrVals[0], issuedShares)
-//	keeper.SetDelegation(ctx, selfDelegation)
-//
-//	// create a second delegation to this validator
-//	keeper.DeleteValidatorByPowerIndex(ctx, validator)
-//	delTokens := sdk.TokensFromConsensusPower(10)
-//	validator, issuedShares = validator.AddTokensFromDel(delTokens)
-//	require.Equal(t, delTokens, issuedShares.RoundInt())
-//	validator = TestingUpdateValidator(keeper, ctx, validator, true)
-//	delegation := types.NewDelegation(addrDels[0], addrVals[0], issuedShares)
-//	keeper.SetDelegation(ctx, delegation)
-//
-//	// create a second validator
-//	validator2 := types.NewValidator(addrVals[1], PKs[1], types.Description{})
-//	validator2, issuedShares = validator2.AddTokensFromDel(valTokens)
-//	require.Equal(t, valTokens, issuedShares.RoundInt())
-//	validator2 = TestingUpdateValidator(keeper, ctx, validator2, true)
-//
-//	header := ctx.BlockHeader()
-//	blockHeight := int64(10)
-//	header.Height = blockHeight
-//	blockTime := time.Unix(333, 0)
-//	header.Time = blockTime
-//	ctx = ctx.WithBlockHeader(header)
-//
-//	// unbond the all self-delegation to put validator in unbonding state
-//	_, err = keeper.Undelegate(ctx, val0AccAddr, addrVals[0], delTokens.ToDec())
-//	require.NoError(t, err)
-//
-//	// end block
-//	updates := keeper.ApplyAndReturnValidatorSetUpdates(ctx)
-//	require.Equal(t, 1, len(updates))
-//
-//	validator, found := keeper.GetValidator(ctx, addrVals[0])
-//	require.True(t, found)
-//	require.Equal(t, blockHeight, validator.UnbondingHeight)
-//	params := keeper.GetParams(ctx)
-//	require.True(t, blockTime.Add(params.UnbondingTime).Equal(validator.UnbondingTime))
-//
-//	//change the context
-//	header = ctx.BlockHeader()
-//	blockHeight2 := int64(20)
-//	header.Height = blockHeight2
-//	blockTime2 := time.Unix(444, 0)
-//	header.Time = blockTime2
-//	ctx = ctx.WithBlockHeader(header)
-//
-//	// unbond some of the other delegation's shares
-//	redelegateTokens := sdk.TokensFromConsensusPower(6)
-//	_, err = keeper.BeginRedelegation(ctx, addrDels[0], addrVals[0], addrVals[1], redelegateTokens.ToDec())
-//	require.NoError(t, err)
-//
-//	// retrieve the unbonding delegation
-//	ubd, found := keeper.GetRedelegation(ctx, addrDels[0], addrVals[0], addrVals[1])
-//	require.True(t, found)
-//	require.Len(t, ubd.Entries, 1)
-//	assert.Equal(t, blockHeight, ubd.Entries[0].CreationHeight)
-//	assert.True(t, blockTime.Add(params.UnbondingTime).Equal(ubd.Entries[0].CompletionTime))
-//}
+func TestRedelegateSelfDelegation(t *testing.T) {
+	_, app, ctx := getBaseSimappWithCustomKeeper()
+	startTokens := sdk.TokensFromConsensusPower(30)
+	startCoins := sdk.NewCoins(sdk.NewCoin(app.StakingKeeper.BondDenom(ctx), startTokens))
+
+	// add bonded tokens to pool for delegations
+	notBondedPool := app.StakingKeeper.GetNotBondedPool(ctx)
+	oldNotBonded := app.BankKeeper.GetAllBalances(ctx, notBondedPool.GetAddress())
+	err := app.BankKeeper.SetBalances(ctx, notBondedPool.GetAddress(), oldNotBonded.Add(startCoins...))
+	require.NoError(t, err)
+	app.SupplyKeeper.SetModuleAccount(ctx, notBondedPool)
+
+	//create a validator with a self-delegation
+	validator := types.NewValidator(addrVals[0], PKs[0], types.Description{})
+	valTokens := sdk.TokensFromConsensusPower(10)
+	validator, issuedShares := validator.AddTokensFromDel(valTokens)
+	require.Equal(t, valTokens, issuedShares.RoundInt())
+
+	validator = keeper.TestingUpdateValidator(app.StakingKeeper, ctx, validator, true)
+
+	val0AccAddr := sdk.AccAddress(addrVals[0])
+	selfDelegation := types.NewDelegation(val0AccAddr, addrVals[0], issuedShares)
+	app.StakingKeeper.SetDelegation(ctx, selfDelegation)
+
+	// create a second validator
+	validator2 := types.NewValidator(addrVals[1], PKs[1], types.Description{})
+	validator2, issuedShares = validator2.AddTokensFromDel(valTokens)
+	require.Equal(t, valTokens, issuedShares.RoundInt())
+	validator2 = keeper.TestingUpdateValidator(app.StakingKeeper, ctx, validator2, true)
+	require.Equal(t, sdk.Bonded, validator2.Status)
+
+	// create a second delegation to validator 1
+	delTokens := sdk.TokensFromConsensusPower(10)
+	validator, issuedShares = validator.AddTokensFromDel(delTokens)
+	require.Equal(t, delTokens, issuedShares.RoundInt())
+	validator = keeper.TestingUpdateValidator(app.StakingKeeper, ctx, validator, true)
+
+	delegation := types.NewDelegation(addrDels[0], addrVals[0], issuedShares)
+	app.StakingKeeper.SetDelegation(ctx, delegation)
+
+	_, err = app.StakingKeeper.BeginRedelegation(ctx, val0AccAddr, addrVals[0], addrVals[1], delTokens.ToDec())
+	require.NoError(t, err)
+
+	// end block
+	updates := app.StakingKeeper.ApplyAndReturnValidatorSetUpdates(ctx)
+	require.Equal(t, 2, len(updates))
+
+	validator, found := app.StakingKeeper.GetValidator(ctx, addrVals[0])
+	require.True(t, found)
+	require.Equal(t, valTokens, validator.Tokens)
+	require.Equal(t, sdk.Unbonding, validator.Status)
+}
+
 //
 //func TestRedelegateFromUnbondedValidator(t *testing.T) {
 //	ctx, _, bk, keeper, _ := CreateTestInput(t, false, 0)
diff --git a/x/staking/keeper/old_delegation_test.go b/x/staking/keeper/old_delegation_test.go
index de600a24e..b8d233c24 100644
--- a/x/staking/keeper/old_delegation_test.go
+++ b/x/staking/keeper/old_delegation_test.go
@@ -11,59 +11,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/staking/types"
 )
 
-func TestRedelegateSelfDelegation(t *testing.T) {
-	ctx, _, bk, keeper, _ := CreateTestInput(t, false, 0)
-	startTokens := sdk.TokensFromConsensusPower(30)
-	startCoins := sdk.NewCoins(sdk.NewCoin(keeper.BondDenom(ctx), startTokens))
-
-	// add bonded tokens to pool for delegations
-	notBondedPool := keeper.GetNotBondedPool(ctx)
-	oldNotBonded := bk.GetAllBalances(ctx, notBondedPool.GetAddress())
-	err := bk.SetBalances(ctx, notBondedPool.GetAddress(), oldNotBonded.Add(startCoins...))
-	require.NoError(t, err)
-	keeper.supplyKeeper.SetModuleAccount(ctx, notBondedPool)
-
-	//create a validator with a self-delegation
-	validator := types.NewValidator(addrVals[0], PKs[0], types.Description{})
-	valTokens := sdk.TokensFromConsensusPower(10)
-	validator, issuedShares := validator.AddTokensFromDel(valTokens)
-	require.Equal(t, valTokens, issuedShares.RoundInt())
-
-	validator = TestingUpdateValidator(keeper, ctx, validator, true)
-
-	val0AccAddr := sdk.AccAddress(addrVals[0].Bytes())
-	selfDelegation := types.NewDelegation(val0AccAddr, addrVals[0], issuedShares)
-	keeper.SetDelegation(ctx, selfDelegation)
-
-	// create a second validator
-	validator2 := types.NewValidator(addrVals[1], PKs[1], types.Description{})
-	validator2, issuedShares = validator2.AddTokensFromDel(valTokens)
-	require.Equal(t, valTokens, issuedShares.RoundInt())
-	validator2 = TestingUpdateValidator(keeper, ctx, validator2, true)
-	require.Equal(t, sdk.Bonded, validator2.Status)
-
-	// create a second delegation to validator 1
-	delTokens := sdk.TokensFromConsensusPower(10)
-	validator, issuedShares = validator.AddTokensFromDel(delTokens)
-	require.Equal(t, delTokens, issuedShares.RoundInt())
-	validator = TestingUpdateValidator(keeper, ctx, validator, true)
-
-	delegation := types.NewDelegation(addrDels[0], addrVals[0], issuedShares)
-	keeper.SetDelegation(ctx, delegation)
-
-	_, err = keeper.BeginRedelegation(ctx, val0AccAddr, addrVals[0], addrVals[1], delTokens.ToDec())
-	require.NoError(t, err)
-
-	// end block
-	updates := keeper.ApplyAndReturnValidatorSetUpdates(ctx)
-	require.Equal(t, 2, len(updates))
-
-	validator, found := keeper.GetValidator(ctx, addrVals[0])
-	require.True(t, found)
-	require.Equal(t, valTokens, validator.Tokens)
-	require.Equal(t, sdk.Unbonding, validator.Status)
-}
-
 func TestRedelegateFromUnbondingValidator(t *testing.T) {
 	ctx, _, bk, keeper, _ := CreateTestInput(t, false, 0)
 	startTokens := sdk.TokensFromConsensusPower(30)