diff --git a/.github/workflows/deploy-contract.yml b/.github/workflows/deploy-contract.yml
index dcd0bbb7ae..a0e2e9a8dc 100644
--- a/.github/workflows/deploy-contract.yml
+++ b/.github/workflows/deploy-contract.yml
@@ -34,5 +34,5 @@ jobs:
       - name: Test contract
         run: |
           sudo make contract-tools
-          sudo make test-contract
+          sudo make test-solidity
         if: env.GIT_DIFF
diff --git a/Makefile b/Makefile
index 5286c1df9d..ef6c4a1b29 100644
--- a/Makefile
+++ b/Makefile
@@ -241,7 +241,7 @@ endif
 
 ifeq (, $(shell which go-bindata))
 	@echo "Installing go-bindata..."
-	@go get github.com/kevinburke/go-bindata/go-bindata
+	@go get github.com/kevinburke/go-bindata
 else
 	@echo "go-bindata already installed; skipping..."
 endif
@@ -357,7 +357,7 @@ test-solidity:
 	./scripts/run-solidity-tests.sh
 
 
-.PHONY: run-tests test test-all test-import test-rpc test-contract test-solidity $(TEST_TARGETS)
+.PHONY: run-tests test test-all test-import test-rpc test-solidity $(TEST_TARGETS)
 
 
 benchmark:
diff --git a/app/app.go b/app/app.go
index 570518e7c0..566dff20f9 100644
--- a/app/app.go
+++ b/app/app.go
@@ -374,7 +374,7 @@ func NewEthermintApp(
 		runtime.NewKVStoreService(keys[authtypes.StoreKey]),
 		ethermint.ProtoAccount,
 		maccPerms,
-		authcodec.NewBech32Codec(sdk.Bech32MainPrefix),
+		authcodec.NewBech32Codec(sdk.GetConfig().GetBech32AccountAddrPrefix()),
 		sdk.Bech32MainPrefix,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
@@ -392,8 +392,8 @@ func NewEthermintApp(
 		app.AccountKeeper,
 		app.BankKeeper,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
-		authcodec.NewBech32Codec(sdk.Bech32PrefixValAddr),
-		authcodec.NewBech32Codec(sdk.Bech32PrefixConsAddr),
+		authcodec.NewBech32Codec(sdk.GetConfig().GetBech32ValidatorAddrPrefix()),
+		authcodec.NewBech32Codec(sdk.GetConfig().GetBech32ConsensusAddrPrefix()),
 	)
 	app.MintKeeper = mintkeeper.NewKeeper(
 		appCodec,