diff --git a/cmd/gaia/cmd/app_test.go b/cmd/gaia/cmd/app_test.go
deleted file mode 100644
index 98cf2a0d2..000000000
--- a/cmd/gaia/cmd/app_test.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package common
-
-import (
-	"encoding/json"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/cosmos/cosmos-sdk/tests"
-)
-
-func TestGaiaCLI(t *testing.T) {
-
-	_, out := tests.ExecuteT(t, "gaiad init")
-	var initRes map[string]interface{}
-	outCut := "{" + strings.SplitN(out, "{", 2)[1]
-	err := json.Unmarshal([]byte(outCut), &initRes)
-	require.NoError(t, err, "out %v outCut %v err %v", out, outCut, err)
-	masterKey := (initRes["secret"]).(string)
-	_ = masterKey
-
-	//wc1, _ := tests.GoExecuteT(t, "gaiacli keys add foo --recover")
-	//time.Sleep(time.Second)
-	//_, err = wc1.Write([]byte("1234567890\n"))
-	//time.Sleep(time.Second)
-	//_, err = wc1.Write([]byte(masterKey + "\n"))
-	//time.Sleep(time.Second)
-	//out = <-outChan
-	//wc1.Close()
-	//fmt.Println(out)
-
-	//_, out = tests.ExecuteT(t, "gaiacli keys show foo")
-	//fooAddr := strings.TrimLeft(out, "foo\t")
-
-	//wc2, _ := tests.GoExecuteT(t, "gaiad start")
-	//defer wc2.Close()
-	//time.Sleep(time.Second)
-
-	//_, out = tests.ExecuteT(t, fmt.Sprintf("gaiacli account %v", fooAddr))
-	//fmt.Println(fooAddr)
-}
diff --git a/cmd/gaia/cmd/cli_test.go b/cmd/gaia/cmd/cli_test.go
new file mode 100644
index 000000000..db5e272c1
--- /dev/null
+++ b/cmd/gaia/cmd/cli_test.go
@@ -0,0 +1,83 @@
+package common
+
+import (
+	"encoding/json"
+	"fmt"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/cosmos/cosmos-sdk/tests"
+)
+
+func TestGaiaCLI(t *testing.T) {
+
+	// clear genesis/keys
+	_ = tests.ExecuteT(t, "gaiad unsafe_reset_all")
+	_, wc0, _ := tests.GoExecuteT(t, "gaiacli keys delete foo")
+	defer wc0.Close()
+	_, err := wc0.Write([]byte("1234567890\n"))
+	require.NoError(t, err)
+	_, wc1, _ := tests.GoExecuteT(t, "gaiacli keys delete bar")
+	defer wc1.Close()
+	_, err = wc1.Write([]byte("1234567890\n"))
+	require.NoError(t, err)
+	time.Sleep(time.Second)
+
+	// init genesis get master key
+	out := tests.ExecuteT(t, "gaiad init")
+	var initRes map[string]interface{}
+	outCut := "{" + strings.SplitN(out, "{", 2)[1]
+	err = json.Unmarshal([]byte(outCut), &initRes)
+	require.NoError(t, err, "out %v outCut %v err %v", out, outCut, err)
+	masterKey := (initRes["secret"]).(string)
+	chainID := (initRes["chain_id"]).(string)
+
+	// start gaiad server
+	_, wc2, _ := tests.GoExecuteT(t, "gaiad start")
+	defer wc2.Close()
+	time.Sleep(time.Second)
+
+	// add the master key
+	_, wc3, _ := tests.GoExecuteT(t, "gaiacli keys add foo --recover")
+	defer wc3.Close()
+	_, err = wc3.Write([]byte("1234567890\n"))
+	require.NoError(t, err)
+	_, err = wc3.Write([]byte(masterKey + "\n"))
+	require.NoError(t, err)
+	time.Sleep(time.Second)
+
+	// add a secondary key
+	_, wc4, _ := tests.GoExecuteT(t, "gaiacli keys add bar")
+	time.Sleep(time.Second * 5)
+	_, err = wc4.Write([]byte("1234567890\n"))
+	require.NoError(t, err)
+	time.Sleep(time.Second * 5)
+
+	// get addresses
+	out = tests.ExecuteT(t, "gaiacli keys show foo")
+	fooAddr := strings.TrimLeft(out, "foo\t")
+	out = tests.ExecuteT(t, "gaiacli keys show bar")
+	barAddr := strings.TrimLeft(out, "bar\t")
+	fmt.Printf("debug barAddr: %v\n", barAddr)
+
+	// send money from foo to bar
+	cmdStr := fmt.Sprintf("gaiacli send --sequence=0 --chain-id=%v --amount=10fermion --to=%v --name=foo", chainID, barAddr)
+	_, wc5, rc5 := tests.GoExecuteT(t, cmdStr)
+	_, err = wc5.Write([]byte("1234567890\n"))
+	require.NoError(t, err)
+	fmt.Printf("debug outCh: %v\n", out)
+	time.Sleep(time.Second)
+	bz := make([]byte, 1000000)
+	rc5.Read(bz)
+	fmt.Printf("debug ex: %v\n", string(bz))
+
+	// verify money sent to bar
+	time.Sleep(time.Second)
+	out = tests.ExecuteT(t, fmt.Sprintf("gaiacli account %v", fooAddr))
+	fmt.Printf("debug out: %v\n", out)
+	out = tests.ExecuteT(t, fmt.Sprintf("gaiacli account %v", barAddr))
+	require.Fail(t, "debug out: %v\n", out)
+}
diff --git a/tests/gobash.go b/tests/gobash.go
index edef7ccd5..8095a7d90 100644
--- a/tests/gobash.go
+++ b/tests/gobash.go
@@ -2,6 +2,7 @@ package tests
 
 import (
 	"io"
+	"os"
 	"os/exec"
 	"strings"
 	"testing"
@@ -25,25 +26,27 @@ func getCmd(t *testing.T, command string) *exec.Cmd {
 }
 
 // Execute the command, return standard output and error
-func ExecuteT(t *testing.T, command string) (pipe io.WriteCloser, out string) {
+func ExecuteT(t *testing.T, command string) (out string) {
 	cmd := getCmd(t, command)
-	pipe, err := cmd.StdinPipe()
-	require.NoError(t, err)
 	bz, err := cmd.CombinedOutput()
-	require.NoError(t, err)
+	require.NoError(t, err, string(bz))
 	out = strings.Trim(string(bz), "\n") //trim any new lines
-	return pipe, out
+	return out
 }
 
 // Asynchronously execute the command, return standard output and error
-func GoExecuteT(t *testing.T, command string) (pipe io.WriteCloser, outChan chan string) {
+func GoExecuteT(t *testing.T, command string) (proc *os.Process, pipeIn io.WriteCloser, pipeOut io.ReadCloser) {
 	cmd := getCmd(t, command)
-	pipe, err := cmd.StdinPipe()
+	pipeIn, err := cmd.StdinPipe()
 	require.NoError(t, err)
+	pipeOut, err = cmd.StdoutPipe()
+	require.NoError(t, err)
+
 	go func() {
-		bz, err := cmd.CombinedOutput()
-		require.NoError(t, err)
-		outChan <- strings.Trim(string(bz), "\n") //trim any new lines
+		cmd.Start()
+		//bz, _ := cmd.CombinedOutput()
+		//require.NoError(t, err, string(bz))
+		//outChan <- strings.Trim(string(bz), "\n") //trim any new lines
 	}()
-	return pipe, outChan
+	return nil, pipeIn, pipeOut
 }