diff --git a/app/test_common.go b/app/test_common.go
new file mode 100644
index 00000000..75c163b9
--- /dev/null
+++ b/app/test_common.go
@@ -0,0 +1,129 @@
+package app
+
+import (
+	"math/rand"
+
+	abci "github.com/tendermint/tendermint/abci/types"
+	"github.com/tendermint/tendermint/crypto"
+	"github.com/tendermint/tendermint/crypto/ed25519"
+	"github.com/tendermint/tendermint/crypto/secp256k1"
+	"github.com/tendermint/tendermint/libs/log"
+	tmdb "github.com/tendermint/tm-db"
+
+	"github.com/cosmos/cosmos-sdk/codec"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/x/auth"
+	authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
+	"github.com/cosmos/cosmos-sdk/x/bank"
+	"github.com/cosmos/cosmos-sdk/x/crisis"
+	"github.com/cosmos/cosmos-sdk/x/distribution"
+	"github.com/cosmos/cosmos-sdk/x/gov"
+	"github.com/cosmos/cosmos-sdk/x/mint"
+	"github.com/cosmos/cosmos-sdk/x/params"
+	"github.com/cosmos/cosmos-sdk/x/slashing"
+	"github.com/cosmos/cosmos-sdk/x/staking"
+	"github.com/cosmos/cosmos-sdk/x/supply"
+
+	"github.com/kava-labs/kava/x/auction"
+	"github.com/kava-labs/kava/x/cdp"
+	"github.com/kava-labs/kava/x/liquidator"
+	"github.com/kava-labs/kava/x/pricefeed"
+	validatorvesting "github.com/kava-labs/kava/x/validator-vesting"
+)
+
+// TestApp is a simple wrapper around an App. It exposes internal keepers for use in integration tests.
+// This file also contains test helpers. Ideally they would be in separate package.
+// Basic Usage:
+// Create a test app with NewTestApp, then all keepers and their methods can be accessed for test setup and execution.
+// Advanced Usage:
+// Some tests call for an app to be initialized with some state. This can be achieved through keeper method calls (ie keeper.SetParams(...)).
+// However this leads to a lot of duplicated logic similar to InitGenesis methods.
+// So TestApp.InitializeFromGenesisStates() will call InitGenesis with the default genesis state.
+//and TestApp.InitializeFromGenesisStates(authState, cdpState) will do the same but overwrite the auth and cdp sections of the default genesis state
+// Creating the genesis states can be combersome, but helper methods can make it easier such as NewAuthGenStateFromAccounts below.
+type TestApp struct {
+	App
+}
+
+func NewTestApp() TestApp {
+	db := tmdb.NewMemDB()
+	app := NewApp(log.NewNopLogger(), db, nil, true, 0)
+	return TestApp{App: *app}
+}
+
+func (tApp TestApp) GetAccountKeeper() auth.AccountKeeper   { return tApp.accountKeeper }
+func (tApp TestApp) GetBankKeeper() bank.Keeper             { return tApp.bankKeeper }
+func (tApp TestApp) GetSupplyKeeper() supply.Keeper         { return tApp.supplyKeeper }
+func (tApp TestApp) GetStakingKeeper() staking.Keeper       { return tApp.stakingKeeper }
+func (tApp TestApp) GetSlashingKeeper() slashing.Keeper     { return tApp.slashingKeeper }
+func (tApp TestApp) GetMintKeeper() mint.Keeper             { return tApp.mintKeeper }
+func (tApp TestApp) GetDistrKeeper() distribution.Keeper    { return tApp.distrKeeper }
+func (tApp TestApp) GetGovKeeper() gov.Keeper               { return tApp.govKeeper }
+func (tApp TestApp) GetCrisisKeeper() crisis.Keeper         { return tApp.crisisKeeper }
+func (tApp TestApp) GetParamsKeeper() params.Keeper         { return tApp.paramsKeeper }
+func (tApp TestApp) GetVVKeeper() validatorvesting.Keeper   { return tApp.vvKeeper }
+func (tApp TestApp) GetAuctionKeeper() auction.Keeper       { return tApp.auctionKeeper }
+func (tApp TestApp) GetCDPKeeper() cdp.Keeper               { return tApp.cdpKeeper }
+func (tApp TestApp) GetLiquidatorKeeper() liquidator.Keeper { return tApp.liquidatorKeeper }
+func (tApp TestApp) GetPriceFeedKeeper() pricefeed.Keeper   { return tApp.pricefeedKeeper }
+
+// Create a new auth genesis state from some addresses and coins. The state is returned marshalled into a map.
+// TODO this is only a TestApp method because it needs access to the codec, could be another way to structure it
+func (tApp TestApp) NewAuthGenStateFromAccounts(addresses []sdk.AccAddress, coins []sdk.Coins) GenesisState {
+	// Create GenAccounts
+	accounts := authexported.GenesisAccounts{}
+	for i := range addresses {
+		accounts = append(accounts, auth.NewBaseAccount(addresses[i], coins[i], nil, 0, 0))
+	}
+	// Create the auth genesis state
+	authGenesis := auth.NewGenesisState(auth.DefaultParams(), accounts)
+	return GenesisState{auth.ModuleName: tApp.cdc.MustMarshalJSON(authGenesis)}
+}
+
+// This calls InitChain on the app using the default genesis state, overwitten with any passed in genesis states
+func (tApp TestApp) InitializeFromGenesisStates(genesisStates ...GenesisState) TestApp {
+	// Create a default genesis state and overwrite with provided values
+	genesisState := NewDefaultGenesisState()
+	for _, state := range genesisStates {
+		for k, v := range state {
+			genesisState[k] = v
+		}
+	}
+
+	// Initialize the chain
+	stateBytes, err := codec.MarshalJSONIndent(tApp.cdc, genesisState)
+	if err != nil {
+		panic(err)
+	}
+	tApp.InitChain(
+		abci.RequestInitChain{
+			Validators:    []abci.ValidatorUpdate{},
+			AppStateBytes: stateBytes,
+		},
+	)
+	tApp.Commit()
+	tApp.BeginBlock(abci.RequestBeginBlock{Header: abci.Header{Height: tApp.LastBlockHeight() + 1}})
+	return tApp
+}
+
+// GeneratePrivKeyAddressPairsFromRand generates (deterministically) a total of n private keys and addresses.
+// TODO only generate secp256 keys?
+func GeneratePrivKeyAddressPairs(n int) (keys []crypto.PrivKey, addrs []sdk.AccAddress) {
+	r := rand.New(rand.NewSource(12345)) // make the generation deterministic
+	keys = make([]crypto.PrivKey, n)
+	addrs = make([]sdk.AccAddress, n)
+	for i := 0; i < n; i++ {
+		secret := make([]byte, 32)
+		_, err := r.Read(secret)
+		if err != nil {
+			panic("Could not read randomness")
+		}
+		if r.Int63()%2 == 0 {
+			keys[i] = secp256k1.GenPrivKeySecp256k1(secret)
+		} else {
+			keys[i] = ed25519.GenPrivKeyFromSecret(secret)
+		}
+		addrs[i] = sdk.AccAddress(keys[i].PubKey().Address())
+	}
+	return
+}