diff --git a/main.go b/main.go
index db8a5cd..cf66d82 100644
--- a/main.go
+++ b/main.go
@@ -8,7 +8,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/interchainberlin/slackbot/testserver"
 	"io/ioutil"
 	"log"
 	"net/http"
@@ -205,9 +204,13 @@ func Shellout(command string) (error, string, string) {
 	return err, stdout.String(), stderr.String()
 }
 
+<<<<<<< HEAD
 // Aadd a slack user to the pooltoy blockchain using the admin user alice and giving the new user non-admin permissions
 // wait 5 seconds so that the transactions is completed
 // return an error if the transaction failed
+=======
+// working directory is not the directory keeps the key, the~/.pooltoy/keyring_test is? however, the key info is stored in file with suffix .info rathter than .json
+>>>>>>> 199f573 (test edge cases and change confirmUser function)
 func createNewUserAccount(user, username string) error {
 	fmt.Printf("createNewUserAccount(%s, %s)\n", user, username)
 	username = strings.ReplaceAll(username, " ", "_")
@@ -221,9 +224,12 @@ func createNewUserAccount(user, username string) error {
 	return nil
 }
 
+<<<<<<< HEAD
 // Add a local key representing this slack user.
 // Return an error if this fails
 // Do not return an error, if the user key already exists
+=======
+>>>>>>> 199f573 (test edge cases and change confirmUser function)
 func createNewUserKey(user, username string) error {
 	fmt.Printf("createNewUserKey(%s, %s)\n", user, username)
 	err, out, errout := Shellout(fmt.Sprintf("pooltoy keys add %s --keyring-backend test", user))
@@ -259,6 +265,7 @@ func confirmUser(user, username string) error {
 	}
 
 	if err != nil {
+<<<<<<< HEAD
 		// there's an error, find out if it's just that the key doesn't exist
 		if user != "" {
 			err = createNewUserKey(user, username)
@@ -276,6 +283,22 @@ func confirmUser(user, username string) error {
 	fmt.Println("errout", errout)
 	if err != nil && strings.Index(errout, "Error: rpc error: code = NotFound") != -1 {
 		return createNewUserAccount(user, username)
+=======
+
+			return errors.New(fmt.Sprintf("%s is not found", user))
+
+	} else {
+		err, out, errout = Shellout(fmt.Sprintf("pooltoy q bank -o json balances $(pooltoy keys show %s -a --keyring-backend test) | jq \".balances\"", user))
+		fmt.Println(fmt.Sprintf("pooltoy q bank -o json balances $(pooltoy keys show %s -a --keyring-backend test) | jq \".balances\"", user))
+		if err!= nil{
+			fmt.Println("err", err)
+			fmt.Println("out", out)
+			fmt.Println("confirmUser errout", errout)
+		}
+		if err != nil && strings.Index(errout, "ERROR: unknown address: bank") != -1 {
+			return createNewUserAccount(user, username)
+		}
+>>>>>>> 199f573 (test edge cases and change confirmUser function)
 	}
 	return nil
 }
@@ -336,6 +359,7 @@ func parseTxResult(out string) (map[string]string, error) {
 	return tx, nil
 }
 
+// temporal solution for the cosmos sdk issue #9663, output format issue
 func txErr(out string) bool {
 	txMap, err := parseTxResult(out)
 	if err != nil {
@@ -566,7 +590,7 @@ func balance(userid string, text []string, getUserID UserGetter) string {
 	err = confirmUser(senderID, senderUsername)
 	if err != nil {
 		return fmt.Sprintf("ERROR: %s (%s)", err.Error(), userid)
-	}
+		}
 
 	if len(text) != 1 || text[0] == "" {
 		return fmt.Sprintf("Sorry %s, I don't understand that command. Please follow the format '/balance [user]'", senderUsername)
@@ -583,7 +607,6 @@ func balance(userid string, text []string, getUserID UserGetter) string {
 	if err != nil {
 		return fmt.Sprintf("ERROR: %s (%s)", err.Error(), userid)
 	}
-
 	command := fmt.Sprintf("pooltoy q bank -o json balances $(pooltoy keys show %s -a --keyring-backend test) | jq \".balances\"", queriedID)
 	fmt.Printf("Try command '%s\n", command)
 
@@ -623,8 +646,6 @@ func balance(userid string, text []string, getUserID UserGetter) string {
 
 func main() {
 
-	go testserver.ForwardServer()
-
 	http.HandleFunc("/", botHandler)
 
 	crt := os.Getenv("LETSENCRYPT_CRT")
@@ -634,5 +655,6 @@ func main() {
 	} else {
 		log.Fatalln(http.ListenAndServeTLS(":"+port, crt, key, nil))
 	}
-
 }
+
+
diff --git a/main_test.go b/main_test.go
index fae1beb..e4ab0e5 100644
--- a/main_test.go
+++ b/main_test.go
@@ -69,6 +69,7 @@ func startChain() {
 		fmt.Println("out", out)
 		fmt.Println("errout", errout)
 	}
+	fmt.Println("after init")
 	Shellout(`pooltoy start`)
 }
 
@@ -86,12 +87,21 @@ var GetUserID = func(userID string) (string, string, error) {
 		return UserID2, UserName2, nil
 	case UserID3:
 		return UserID3, UserName3, nil
+	case UserID4:
+		return UserID4, UserName4, nil
+	case UserID5:
+		return UserID5, UserName5, nil
+	case UserID6:
+		return UserID6, UserName6, nil
 	default:
 		return "", "", errors.New(fmt.Sprintf("user id (%s) not found", userID))
 	}
 }
 
-func TestConfirmUser(t *testing.T){
+// -----------------------------------------------------------------------------
+// test ConfirmUser
+// -----------------------------------------------------------------------------
+func TestConfirmUser_ExistentUser(t *testing.T) {
 	go startChain()
 	time.Sleep(20 * time.Second)
 
@@ -101,6 +111,75 @@ func TestConfirmUser(t *testing.T){
 	}
 }
 
+func TestConfirmUser_NonExistentUser(t *testing.T) {
+	go startChain()
+	time.Sleep(20 * time.Second)
+
+	err := confirmUser(UserID4, UserName4)
+	if errors.Is(err, errors.New(fmt.Sprintf("%s is not found", UserID4))){
+		t.Fatal(err)
+	}
+}
+
+// -----------------------------------------------------------------------------
+// test createNewUser
+// -----------------------------------------------------------------------------
+// todo check why failed
+//func TestCreateNewUserAccount(t *testing.T){
+//	go startChain()
+//	time.Sleep(20 * time.Second)
+//
+//	var userID ="U01JT5U5WL0"
+//	var userName = "newuser"
+//	err := confirmUser(userID, userName)
+//	//if !errors.Is(err, errors.New(fmt.Sprintf("%s is not found", userID))){
+//	//	t.Fatal(err)
+//	//}
+//	if err == nil{
+//		t.Fatal(err)
+//	}
+//	err = createNewUserAccount(userID, userName)
+//	if err!= nil{
+//		t.Fatal(err)
+//	}
+//	err = confirmUser(userID, userName)
+//	if errors.Is(err, errors.New(fmt.Sprintf("%s is not found", userID))){
+//		fmt.Println("=======created user is not found==")
+//		t.Fatal(err)
+//	}
+//}
+//
+//func TestCreateNewUserKey(t *testing.T){
+//	go startChain()
+//	time.Sleep(20 * time.Second)
+//
+//	var userID ="U01JT5U5WL0"
+//	var userName = "newuser"
+//	err := confirmUser(userID, userName)
+//	//if !errors.Is(err, errors.New(fmt.Sprintf("%s is not found", userID))){
+//	//	t.Fatal(err)
+//	//}
+//	if err == nil{
+//		t.Fatal(err)
+//	}
+//	err = createNewUserKey(userID, userName)
+//	if err!= nil{
+//		t.Fatal(err)
+//	}
+//	err = confirmUser(userID, userName)
+//	if errors.Is(err, errors.New(fmt.Sprintf("%s is not found", userID))){
+//		fmt.Println("=======created user is not found==")
+//		t.Fatal(err)
+//	}
+//	balance1 := balance(userID,[]string{"@<U01JT5U5WL0|newuser"} , GetUserID)
+//	fmt.Println("balance of new user", balance1)
+//}
+
+
+
+// -----------------------------------------------------------------------------
+// test Brrr
+// -----------------------------------------------------------------------------
 func TestBrrr(t *testing.T) {
 	go startChain()
 	time.Sleep(20 * time.Second)
@@ -110,26 +189,103 @@ func TestBrrr(t *testing.T) {
 	fmt.Println("brResp", brResp)
 	var testCommand2 = []string{User3}
 	balanceResp := balance(UserID1, testCommand2, GetUserID)
-	if balanceResp != "Onur's balance:\n1 🆗\n2 🍍\n1 🎙️\n1 🎬\n1 👋\n1 🥅\n1 🥞\n"{
+	if balanceResp != fmt.Sprintf("%s's balance:\n1 🆗\n2 🍍\n1 🎙️\n1 🎬\n1 👋\n1 🥅\n1 🥞\n", UserName3) {
+		t.Fatal(balanceResp)
+	}
+
+	stopChain()
+}
+
+func TestBrrr_TwiceWithin1Day(t *testing.T) {
+	go startChain()
+	time.Sleep(20 * time.Second)
+
+	var testCommand1 = []string{User3, ":wave:"}
+	var testCommand2 = []string{User3}
+
+	// first Brrr and check balance
+	brResp := brrr(UserID1, testCommand1, GetUserID)
+	fmt.Println("first brrr response", brResp)
+	balanceResp := balance(UserID1, testCommand2, GetUserID)
+	if balanceResp != fmt.Sprintf("%s's balance:\n1 🆗\n2 🍍\n1 🎙️\n1 🎬\n1 👋\n1 🥅\n1 🥞\n", UserName3) {
 		t.Fatal(balanceResp)
 	}
-	//not sure stopchain is needed
+
+	// second Brrr
+	brResp = brrr(UserID1, testCommand1, GetUserID)
+	fmt.Println("second brrr response", brResp)
+	if brResp != fmt.Sprintf("Sorry %s, you can only send an emoji once a day. Please try again tomorrow 📆", UserName1) {
+		t.Fatal(brResp)
+	}
 	stopChain()
 }
 
+func TestTilBrrr(t *testing.T) {
+	go startChain()
+	time.Sleep(20 * time.Second)
+
+	til := tilbrrr(UserID1, []string{User3}, GetUserID)
+	if til != fmt.Sprintf("🖨 %s is ready to brrr right now!", UserName3) {
+		t.Fatal(til)
+	}
+
+	brrr(UserID1, []string{User3, ":wave:"}, GetUserID)
+	til = tilbrrr(UserID1, []string{User1}, GetUserID)
+	fmt.Println(til)
+	if til != fmt.Sprintf("⏳ 1 day til %s can brrr again.", UserName1) {
+		t.Fatal(til)
+	}
+
+	stopChain()
+}
+
+// -----------------------------------------------------------------------------
+// test Balance
+// -----------------------------------------------------------------------------
 func TestBalance(t *testing.T) {
 	go startChain()
 	time.Sleep(20 * time.Second)
 
 	var testCommand = []string{User3}
 	balanceResp := balance(UserID1, testCommand, GetUserID)
-	if balanceResp != "Onur's balance:\n1 🆗\n2 🍍\n1 🎙️\n1 🎬\n1 🥅\n1 🥞\n" {
+	if balanceResp != fmt.Sprintf("%s's balance:\n1 🆗\n2 🍍\n1 🎙️\n1 🎬\n1 🥅\n1 🥞\n", UserName3) {
+		t.Fatal(balanceResp)
+	}
+
+	stopChain()
+}
+
+//  existent user checks nonexistent user's balance
+func TestBalance_UserNotExist(t *testing.T) {
+	go startChain()
+	time.Sleep(20 * time.Second)
+
+	var testCommand = []string{User4}
+	balanceResp := balance(UserID1, testCommand, GetUserID)
+	if balanceResp != fmt.Sprintf("ERROR: %s is not found (%s)", UserID4, UserID1) {
 		t.Fatal(balanceResp)
 	}
 
 	stopChain()
 }
 
+//non-existent user checks nonexistent user's balance
+func TestBalance_UserNotExist1(t *testing.T) {
+	go startChain()
+	time.Sleep(15 * time.Second)
+
+	var testCommand = []string{User6}
+	balanceResp := balance(UserID4, testCommand, GetUserID)
+	if balanceResp != fmt.Sprintf("ERROR: %s is not found (%s)", UserID4, UserID4) {
+		t.Fatal(balanceResp)
+	}
+
+	stopChain()
+}
+
+// -----------------------------------------------------------------------------
+// test send
+// -----------------------------------------------------------------------------
 func TestSend(t *testing.T) {
 	go startChain()
 	time.Sleep(20 * time.Second)
@@ -138,29 +294,68 @@ func TestSend(t *testing.T) {
 	fmt.Println("sendResp:", sendResp)
 	var testCommand2 = []string{User3}
 	balances := balance(UserID1, testCommand2, GetUserID)
-	if balances != "Onur's balance:\n1 🆗\n2 🍍\n1 🎙️\n1 🎬\n1 🥅\n1 🥑\n1 🥞\n"{
+	if balances != fmt.Sprintf("%s's balance:\n1 🆗\n2 🍍\n1 🎙️\n1 🎬\n1 🥅\n1 🥑\n1 🥞\n", UserName3) {
 		t.Fatal(balances)
 	}
 
 	stopChain()
 }
 
-func TestTilBrrr(t *testing.T){
+func TestSend_OutOfBalance(t *testing.T) {
 	go startChain()
 	time.Sleep(20 * time.Second)
 
-	til :=tilbrrr(UserID1,[]string{User3}, GetUserID)
-	if til != "🖨 Onur is ready to brrr right now!"{
-		t.Fatal(til)
+	var testCommand = []string{User1, "🍍"}
+	sendResp := send(UserID3, testCommand, GetUserID)
+	fmt.Println("sendResp:", sendResp)
+	if sendResp != "No emoji found while parsing 🍍"{
+		t.Fatal(sendResp)
 	}
 
-	brrr(UserID1, []string{User3, ":wave:"}, GetUserID)
-	til =tilbrrr(UserID1,[]string{User1}, GetUserID)
-	fmt.Println(til)
-	if til != "⏳ 1 day til billy can brrr again."{
-		t.Fatal(til)
+	stopChain()
+}
+
+//// can we send 2 ????
+//func TestSend_MoreEmoji(t *testing.T) {
+//	go startChain()
+//	time.Sleep(25 * time.Second)
+//
+//	var testCommand = []string{User1, "2:birthday_cake:"}
+//	sendResp := send(UserID5, testCommand, GetUserID)
+//	fmt.Println("sendResp:", sendResp)
+//	if sendResp != "No emoji found while parsing 2🎂"{
+//		t.Fatal(sendResp)
+//	}
+//
+//	stopChain()
+//}
+
+func TestSend_FromNonExistentUser(t *testing.T) {
+	go startChain()
+	time.Sleep(20 * time.Second)
+
+	var testCommand = []string{User1, ":avocado:"}
+	sendResp := send(UserID4, testCommand, GetUserID)
+	fmt.Println("sendResp:", sendResp)
+	if sendResp != fmt.Sprintf("ERROR: %s is not found (%s)",UserID4, UserID4) {
+		t.Fatal(sendResp)
+	}
+
+	stopChain()
+}
+
+func TestSendTo_NonExistentUser(t *testing.T) {
+	go startChain()
+	time.Sleep(20 * time.Second)
+
+	var testCommand = []string{User4, ":avocado:"}
+	sendResp := send(UserID1, testCommand, GetUserID)
+	fmt.Println("sendResp:", sendResp)
+	if sendResp != fmt.Sprintf("ERROR: %s is not found (%s)",UserID4, UserID1) {
+		t.Fatal(sendResp)
 	}
 
 	stopChain()
 }
 
+
diff --git a/testserver/testserver.go b/testserver/testserver.go
deleted file mode 100644
index f9233a8..0000000
--- a/testserver/testserver.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package testserver
-
-import (
-	"fmt"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"net/url"
-)
-
-
-func ForwardServer() {
-	mux := http.NewServeMux()
-
-	mux.HandleFunc("/", ReadCheckReq)
-	if err := http.ListenAndServe(":9090", mux); err != nil {
-		log.Fatal(err)
-	}
-	fmt.Println("forward server starts")
-}
-
-func ReadCheckReq(w http.ResponseWriter, r *http.Request){
-	fmt.Println("forwarding received")
-	reqData, err := ioutil.ReadAll(r.Body)
-	if err != nil {
-		fmt.Println("err", err)
-	}
-
-	w.Write([]byte("forward received"))
-	fmt.Printf("forward data: %s",string(reqData))
-
-
-}
-
-// TestClient sends request to slackbot server
-func TestClient(visitURL string, form url.Values) (*http.Response, error){
-	//visit, err := url.Parse(visitURL)
-	//if err != nil {
-	//	return nil, err
-	//}
-	//req := http.Request{
-	//	Method: "POST",
-	//	URL: visit,
-	//	PostForm: form,
-	//}
-
-	//client := &http.Client{}
-	//res, err := client.Do(&req)
-
-	resp, err := http.PostForm(visitURL, form)
-	if err != nil {
-		fmt.Println(err)
-	}
-	bytes, err := ioutil.ReadAll(resp.Body)
-	fmt.Printf("test client: %s\n", string(bytes))
-
-	return resp, err
-}
-