diff --git a/Makefile b/Makefile
index 786771d580..ea93496b7c 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ tests/cli/shunit2:
 		-q -O tests/cli/shunit2
 
 tools:
-	go get -u -v $(GOTOOLS)
+	@go get $(GOTOOLS)
 
 clean:
 	# maybe cleaning up cache and vendor is overkill, but sometimes
diff --git a/glide.lock b/glide.lock
index 79207b4f95..461e15df80 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,12 +1,14 @@
 hash: 6eb1119dccf2ab4d0adb870a14cb4408047119be53c8ec4afeaa281bd1d2b457
-updated: 2017-06-20T20:55:16.122030554-04:00
+updated: 2017-06-21T19:51:10.330315159+02:00
 imports:
 - name: github.com/bgentry/speakeasy
   version: 4aabc24848ce5fd31929f7d1e4ea74d3709c14cd
 - name: github.com/btcsuite/btcd
-  version: 1ae306021e323ae11c71ffb8546fbd9019e6cb6f
+  version: b8df516b4b267acf2de46be593a9d948d1d2c420
   subpackages:
   - btcec
+- name: github.com/btcsuite/fastsha256
+  version: 637e656429416087660c84436a2a035d69d54e2e
 - name: github.com/BurntSushi/toml
   version: b26d9c308763d68093482582cea63d69be07a0f0
 - name: github.com/ebuchman/fail-test
@@ -28,7 +30,7 @@ imports:
 - name: github.com/go-playground/universal-translator
   version: 71201497bace774495daed26a3874fd339e0b538
 - name: github.com/go-stack/stack
-  version: 7a2f19628aabfe68f0766b59e74d6315f8347d22
+  version: 100eb0c0a9c5b306ca2fb4f165df21d80ada4b82
 - name: github.com/golang/protobuf
   version: b50ceb1fa9818fa4d78b016c2d4ae025593a7ce3
   subpackages:
@@ -45,7 +47,7 @@ imports:
 - name: github.com/gorilla/websocket
   version: a91eba7f97777409bc2c443f5534d41dd20c5720
 - name: github.com/hashicorp/hcl
-  version: 392dba7d905ed5d04a5794ba89f558b27e2ba1ca
+  version: a4b07c25de5ff55ad3b8936cea69a79a3d95a855
   subpackages:
   - hcl/ast
   - hcl/parser
@@ -63,6 +65,8 @@ imports:
   version: b84e30acd515aadc4b783ad4ff83aff3299bdfe0
 - name: github.com/magiconair/properties
   version: 51463bfca2576e06c62a8504b5c0f06d61312647
+- name: github.com/mattn/go-isatty
+  version: 9622e0cc9d8f9be434ca605520ff9a16808fee47
 - name: github.com/mitchellh/mapstructure
   version: cc8532a8e9a55ea36402aa21efdf403a60d34096
 - name: github.com/pelletier/go-buffruneio
@@ -78,11 +82,11 @@ imports:
 - name: github.com/spf13/cast
   version: acbeb36b902d72a7a4c18e8f3241075e7ab763e4
 - name: github.com/spf13/cobra
-  version: 3454e0e28e69c1b8effa6b5123c8e4185e20d696
+  version: db6b9a8b3f3f400c8ecb4a4d7d02245b8facad66
 - name: github.com/spf13/jwalterweatherman
-  version: 8f07c835e5cc1450c082fe3a439cf87b0cbb2d99
+  version: fa7ca7e836cf3a8bb4ebf799f472c12d7e903d66
 - name: github.com/spf13/pflag
-  version: e57e3eeb33f795204c1ca35f56c44f83227c6e66
+  version: 80fe0fb4eba54167e2ccae1c6c950e72abf61b73
 - name: github.com/spf13/viper
   version: 0967fc9aceab2ce9da34061253ac10fb99bba5b2
 - name: github.com/syndtr/goleveldb
@@ -113,7 +117,7 @@ imports:
   - edwards25519
   - extra25519
 - name: github.com/tendermint/go-crypto
-  version: 7dff40942a64cdeefefa9446b2d104750b349f8a
+  version: ad70b2222698a2018c4bf18bab86f3727621f492
   subpackages:
   - cmd
   - keys
@@ -121,13 +125,14 @@ imports:
   - keys/server
   - keys/server/types
   - keys/storage/filestorage
+  - keys/wordlist
 - name: github.com/tendermint/go-wire
   version: 5f88da3dbc1a72844e6dfaf274ce87f851d488eb
   subpackages:
   - data
   - data/base58
 - name: github.com/tendermint/light-client
-  version: 5ba3d0bce406b4b4ce694ca4387b9d086ac0c10f
+  version: b66b57d193d2fdeda7b999aebfdc9531cbee39b0
   subpackages:
   - certifiers
   - certifiers/client
@@ -139,7 +144,7 @@ imports:
   - commands/txs
   - proofs
 - name: github.com/tendermint/merkleeyes
-  version: 5df9e851e1af64b4fbc7ecab89a9735010ed30fa
+  version: ce7de05896f560ddcc9207f65fea9901835dd238
   subpackages:
   - app
   - client
@@ -185,7 +190,7 @@ imports:
   - logger
   - merkle
 - name: golang.org/x/crypto
-  version: ab89591268e0c8b748cbe4047b00197516011af5
+  version: c7af5bf2638a1164f2eb5467c39c6cffbd13a02e
   subpackages:
   - curve25519
   - nacl/box
@@ -206,7 +211,7 @@ imports:
   - lex/httplex
   - trace
 - name: golang.org/x/sys
-  version: 9c9d83fe39ed3fd2d9249fcf6b755891fff54b03
+  version: 9ccfe848b9db8435a24c424abbc07a921adf1df5
   subpackages:
   - unix
 - name: golang.org/x/text
@@ -242,7 +247,7 @@ imports:
   version: cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b
 testImports:
 - name: github.com/davecgh/go-spew
-  version: 04cdfd42973bb9c8589fd6a731800cf222fde1a9
+  version: 6d212800a42e8ab5c146b8ace3490ee17e5225f9
   subpackages:
   - spew
 - name: github.com/pmezard/go-difflib
@@ -250,7 +255,7 @@ testImports:
   subpackages:
   - difflib
 - name: github.com/stretchr/testify
-  version: 4d4bfba8f1d1027c4fdbe371823030df51419987
+  version: 69483b4bd14f5845b5a1e55bca19e954e827f1d0
   subpackages:
   - assert
   - require
diff --git a/tests/cli/basictx.sh b/tests/cli/basictx.sh
index 4297bffa01..58f27ceba7 100755
--- a/tests/cli/basictx.sh
+++ b/tests/cli/basictx.sh
@@ -31,11 +31,10 @@ test01SendTx() {
   SENDER=$(getAddr $RICH)
   RECV=$(getAddr $POOR)
 
-  assertFalse "missing dest" "${CLIENT_EXE} tx send --amount=992mycoin --sequence=1 2>/dev/null"
-  assertFalse "bad password" "echo foo | ${CLIENT_EXE} tx send --amount=992mycoin --sequence=1 --to=$RECV --name=$RICH 2>/dev/null"
-  RES=$(echo qwertyuiop | ${CLIENT_EXE} tx send --amount=992mycoin --sequence=1 --to=$RECV --name=$RICH 2>/dev/null)
-  txSucceeded $? "$RES"
-  TX=`echo $RES | cut -d: -f2-`
+  assertFalse "missing dest" "${CLIENT_EXE} tx send --amount=992mycoin --sequence=1"
+  assertFalse "bad password" "echo foo | ${CLIENT_EXE} tx send --amount=992mycoin --sequence=1 --to=$RECV --name=$RICH"
+  TX=$(echo qwertyuiop | ${CLIENT_EXE} tx send --amount=992mycoin --sequence=1 --to=$RECV --name=$RICH)
+  txSucceeded $? "$TX"
   HASH=$(echo $TX | jq .hash | tr -d \")
   TX_HEIGHT=$(echo $TX | jq .height)
 
diff --git a/tests/cli/common.sh b/tests/cli/common.sh
index 4ceacd2226..576bef0a48 100644
--- a/tests/cli/common.sh
+++ b/tests/cli/common.sh
@@ -137,11 +137,11 @@ checkAccount() {
   return $?
 }
 
-# XXX Ex Usage: txSucceeded $? "$RES"
+# XXX Ex Usage: txSucceeded $? "$TX"
 # Desc: Must be called right after the `tx` command, makes sure it got a success response
 txSucceeded() {
   if (assertTrue "sent tx: $2" $1); then
-    TX=`echo $2 | cut -d: -f2-` # strip off first line asking for password
+    TX=$2
     assertEquals "good check: $TX" "0" $(echo $TX | jq .check_tx.code)
     assertEquals "good deliver: $TX" "0" $(echo $TX | jq .deliver_tx.code)
   else
diff --git a/tests/cli/counter.sh b/tests/cli/counter.sh
index e819fef81f..28ade7466c 100755
--- a/tests/cli/counter.sh
+++ b/tests/cli/counter.sh
@@ -33,9 +33,8 @@ test01SendTx() {
 
   assertFalse "missing dest" "${CLIENT_EXE} tx send --amount=992mycoin --sequence=1 2>/dev/null"
   assertFalse "bad password" "echo foo | ${CLIENT_EXE} tx send --amount=992mycoin --sequence=1 --to=$RECV --name=$RICH 2>/dev/null"
-  RES=$(echo qwertyuiop | ${CLIENT_EXE} tx send --amount=992mycoin --sequence=1 --to=$RECV --name=$RICH 2>/dev/null)
-  txSucceeded $? "$RES"
-  TX=`echo $RES | cut -d: -f2-`
+  TX=$(echo qwertyuiop | ${CLIENT_EXE} tx send --amount=992mycoin --sequence=1 --to=$RECV --name=$RICH 2>/dev/null)
+  txSucceeded $? "$TX"
   HASH=$(echo $TX | jq .hash | tr -d \")
   TX_HEIGHT=$(echo $TX | jq .height)
 
@@ -65,9 +64,8 @@ test03AddCount() {
   SENDER=$(getAddr $RICH)
   assertFalse "bad password" "echo hi | ${CLIENT_EXE} tx counter --amount=1000mycoin --sequence=2 --name=${RICH} 2>/dev/null"
 
-  RES=$(echo qwertyuiop | ${CLIENT_EXE} tx counter --amount=10mycoin --sequence=2 --name=${RICH} --valid --countfee=5mycoin 2>/dev/null)
-  txSucceeded $? "$RES"
-  TX=`echo $RES | cut -d: -f2-`
+  TX=$(echo qwertyuiop | ${CLIENT_EXE} tx counter --amount=10mycoin --sequence=2 --name=${RICH} --valid --countfee=5mycoin)
+  txSucceeded $? "$TX"
   HASH=$(echo $TX | jq .hash | tr -d \")
   TX_HEIGHT=$(echo $TX | jq .height)
 
diff --git a/tests/cli/ibc.sh b/tests/cli/ibc.sh
index 7afda2d8f6..9819f5d87d 100755
--- a/tests/cli/ibc.sh
+++ b/tests/cli/ibc.sh
@@ -89,15 +89,13 @@ test01SendIBCTx() {
   SENDER=$(BC_HOME=${CLIENT_1} getAddr $RICH)
   RECV=$(BC_HOME=${CLIENT_2} getAddr $POOR)
 
-  # we have to remove the password request from stdout, to just get the json
   export BC_HOME=${CLIENT_1}
-  RES=$(echo qwertyuiop | ${CLIENT_EXE} tx send --amount=20002mycoin \
-      --sequence=1 --to=${CHAIN_ID_2}/${RECV} --name=$RICH 2>/dev/null)
-  txSucceeded $? "$RES"
+  TX=$(echo qwertyuiop | ${CLIENT_EXE} tx send --amount=20002mycoin \
+      --sequence=1 --to=${CHAIN_ID_2}/${RECV} --name=$RICH)
+  txSucceeded $? "$TX"
   # an example to quit early if there is no point in more tests
   if [ $? != 0 ]; then echo "aborting!"; return 1; fi
 
-  TX=`echo $RES | cut -d: -f2-`
   HASH=$(echo $TX | jq .hash | tr -d \")
   TX_HEIGHT=$(echo $TX | jq .height)
 
@@ -142,7 +140,7 @@ startRelay() {
   export BC_HOME=${CLIENT_1}
   SENDER=$(getAddr $RICH)
   RES=$(echo qwertyuiop | ${CLIENT_EXE} tx send --amount=100000mycoin \
-      --sequence=$1 --to=$RELAY_ADDR --name=$RICH 2>/dev/null)
+      --sequence=$1 --to=$RELAY_ADDR --name=$RICH)
   txSucceeded $? "$RES"
   if [ $? != 0 ]; then echo "can't pay chain1!"; return 1; fi
 
@@ -150,7 +148,7 @@ startRelay() {
   export BC_HOME=${CLIENT_2}
   SENDER=$(getAddr $RICH)
   RES=$(echo qwertyuiop | ${CLIENT_EXE} tx send --amount=100000mycoin \
-      --sequence=$2 --to=$RELAY_ADDR --name=$RICH 2>/dev/null)
+      --sequence=$2 --to=$RELAY_ADDR --name=$RICH)
   txSucceeded $? "$RES"
   if [ $? != 0 ]; then echo "can't pay chain2!"; return 1; fi
 
diff --git a/tests/cli/restart.sh b/tests/cli/restart.sh
index 90ce98e94e..fb387a7014 100755
--- a/tests/cli/restart.sh
+++ b/tests/cli/restart.sh
@@ -19,9 +19,8 @@ test00PreRestart() {
   SENDER=$(getAddr $RICH)
   RECV=$(getAddr $POOR)
 
-  RES=$(echo qwertyuiop | ${CLIENT_EXE} tx send --amount=992mycoin --sequence=1 --to=$RECV --name=$RICH 2>/dev/null)
-  txSucceeded $? "$RES"
-  TX=`echo $RES | cut -d: -f2-`
+  TX=$(echo qwertyuiop | ${CLIENT_EXE} tx send --amount=992mycoin --sequence=1 --to=$RECV --name=$RICH)
+  txSucceeded $? "$TX"
   HASH=$(echo $TX | jq .hash | tr -d \")
   TX_HEIGHT=$(echo $TX | jq .height)
 
@@ -37,11 +36,10 @@ test01OnRestart() {
   SENDER=$(getAddr $RICH)
   RECV=$(getAddr $POOR)
 
-  RES=$(echo qwertyuiop | ${CLIENT_EXE} tx send --amount=10000mycoin --sequence=2 --to=$RECV --name=$RICH 2>/dev/null)
-  txSucceeded $? "$RES"
+  TX=$(echo qwertyuiop | ${CLIENT_EXE} tx send --amount=10000mycoin --sequence=2 --to=$RECV --name=$RICH)
+  txSucceeded $? "$TX"
   if [ $? != 0 ]; then echo "can't make tx!"; return 1; fi
 
-  TX=`echo $RES | cut -d: -f2-`
   HASH=$(echo $TX | jq .hash | tr -d \")
   TX_HEIGHT=$(echo $TX | jq .height)
 
@@ -52,8 +50,8 @@ test01OnRestart() {
   echo "done waiting!"
 
   # last minute tx just at the block cut-off...
-  RES=$(echo qwertyuiop | ${CLIENT_EXE} tx send --amount=20000mycoin --sequence=3 --to=$RECV --name=$RICH 2>/dev/null)
-  txSucceeded $? "$RES"
+  TX=$(echo qwertyuiop | ${CLIENT_EXE} tx send --amount=20000mycoin --sequence=3 --to=$RECV --name=$RICH)
+  txSucceeded $? "$TX"
   if [ $? != 0 ]; then echo "can't make second tx!"; return 1; fi
 
   # now we do a restart...