diff --git a/simapp/app_v2.go b/simapp/app_v2.go
index 2537da28..c972920b 100644
--- a/simapp/app_v2.go
+++ b/simapp/app_v2.go
@@ -248,7 +248,7 @@ func NewSimApp(
 	// register streaming services
 	if err := app.RegisterStreamingServices(appOpts, app.kvStoreKeys()); err != nil {
 		logger.Error("failed to register streaming services", "err", err)
-		os.Exit(1)
+		panic(err)
 	}
 
 	// initParamsKeeper(app.ParamsKeeper)
diff --git a/simapp/test_helpers.go b/simapp/test_helpers.go
index 73a91212..7cc88828 100644
--- a/simapp/test_helpers.go
+++ b/simapp/test_helpers.go
@@ -435,11 +435,11 @@ func AddTestAddrsFromPubKeys(
 	pubKeys []cryptotypes.PubKey,
 	accAmt math.Int,
 ) {
-	bondDemo, err := app.StakingKeeper.BondDenom(ctx)
+	bondDenom, err := app.StakingKeeper.BondDenom(ctx)
 	if err != nil {
 		panic(err)
 	}
-	initCoins := sdk.NewCoins(sdk.NewCoin(bondDemo, accAmt))
+	initCoins := sdk.NewCoins(sdk.NewCoin(bondDenom, accAmt))
 
 	for _, pk := range pubKeys {
 		initAccountWithCoins(app, ctx, sdk.AccAddress(pk.Address()), initCoins)
@@ -471,11 +471,11 @@ func addTestAddrs(
 	strategy GenerateAccountStrategy,
 ) []sdk.AccAddress {
 	testAddrs := strategy(accNum)
-	bondDemon, err := app.StakingKeeper.BondDenom(ctx)
+	bondDenom, err := app.StakingKeeper.BondDenom(ctx)
 	if err != nil {
 		panic(err)
 	}
-	initCoins := sdk.NewCoins(sdk.NewCoin(bondDemon, accAmt))
+	initCoins := sdk.NewCoins(sdk.NewCoin(bondDenom, accAmt))
 
 	for _, addr := range testAddrs {
 		initAccountWithCoins(app, ctx, addr, initCoins)