diff --git a/scripts/contrib/local/02-contracts.sh b/scripts/contrib/local/02-contracts.sh
index 5e886fc29c..55175e0d98 100755
--- a/scripts/contrib/local/02-contracts.sh
+++ b/scripts/contrib/local/02-contracts.sh
@@ -5,7 +5,7 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 
 echo "-----------------------"
 echo "## Add new CosmWasm contract"
-RESP=$(wasmd tx wasm store "$DIR/../../x/wasm/keeper/testdata/hackatom.wasm" \
+RESP=$(wasmd tx wasm store "$DIR/../../../x/wasm/keeper/testdata/hackatom.wasm" \
   --from validator --gas 1500000 -y --chain-id=testing --node=http://localhost:26657 -b sync -o json --keyring-backend=test)
 sleep 6
 RESP=$(wasmd q tx $(echo "$RESP"| jq -r '.txhash') -o json)
@@ -44,8 +44,8 @@ sleep 6
 wasmd q tx $(echo "$RESP"| jq -r '.txhash') -o json | jq
 
 
-predictedAdress=$(wasmd q wasm build-address "$CODE_HASH" $(wasmd keys show validator -a --keyring-backend=test) $(echo -n "testing" | xxd -ps) "$INIT")
-wasmd q wasm contract "$predictedAdress" -o json | jq
+predictedAddress=$(wasmd q wasm build-address "$CODE_HASH" $(wasmd keys show validator -a --keyring-backend=test) $(echo -n "testing" | xxd -ps) "$INIT" | awk '{print $2}')
+wasmd q wasm contract "$predictedAddress" -o json | jq
 
 echo "### Query all"
 RESP=$(wasmd query wasm contract-state all "$CONTRACT" -o json)
@@ -80,7 +80,7 @@ echo "### Query new admin: $(wasmd q wasm contract "$CONTRACT" -o json | jq -r '
 echo "-----------------------"
 echo "## Migrate contract"
 echo "### Upload new code"
-RESP=$(wasmd tx wasm store "$DIR/../../x/wasm/keeper/testdata/burner.wasm" \
+RESP=$(wasmd tx wasm store "$DIR/../../../x/wasm/keeper/testdata/burner.wasm" \
   --from validator --gas 1100000 -y --chain-id=testing --node=http://localhost:26657 -b sync -o json --keyring-backend=test)
 sleep 6
 RESP=$(wasmd q tx $(echo "$RESP"| jq -r '.txhash') -o json)
diff --git a/scripts/contrib/local/04-gov.sh b/scripts/contrib/local/04-gov.sh
index 5c9325c0f0..81b4b88ebd 100755
--- a/scripts/contrib/local/04-gov.sh
+++ b/scripts/contrib/local/04-gov.sh
@@ -5,7 +5,7 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 
 sleep 1
 echo "## Submit a CosmWasm gov proposal"
-RESP=$(wasmd tx wasm submit-proposal store-instantiate "$DIR/../../x/wasm/keeper/testdata/reflect.wasm" \
+RESP=$(wasmd tx wasm submit-proposal store-instantiate "$DIR/../../../x/wasm/keeper/testdata/reflect_2_0.wasm" \
   '{}' --label="testing" \
   --title "testing" --summary "Testing" --deposit "1000000000ustake" \
   --admin $(wasmd keys show -a validator --keyring-backend=test) \
diff --git a/x/wasm/types/iavl_range_test.go b/x/wasm/types/iavl_range_test.go
index cbe2e13c9f..f734561504 100644
--- a/x/wasm/types/iavl_range_test.go
+++ b/x/wasm/types/iavl_range_test.go
@@ -3,8 +3,8 @@ package types
 import (
 	"testing"
 
-	dbm "github.com/cosmos/cosmos-db"
 	iavl2 "github.com/cosmos/iavl"
+	dbm "github.com/cosmos/iavl/db"
 	"github.com/stretchr/testify/require"
 
 	"cosmossdk.io/log"