diff --git a/go/master/client.go b/go/master/client.go
index 73c945ddc5a616a46a83ad9c704f492341344663..db6b17d2f0d1dcb1dfc6eba2546a0e2d10c4012e 100644
--- a/go/master/client.go
+++ b/go/master/client.go
@@ -34,6 +34,8 @@ func (c *Client) getRecords() {
 	for {
 		t, err := c.getTask()
 		if err != nil {
+			// TODO(helin): wait before move on with next
+			// getTask call.
 			log.Println(err)
 			continue
 		}
@@ -125,7 +127,7 @@ func (c *Client) taskFinished(taskID int) error {
 
 // NextRecord returns next record in the dataset.
 //
-// NextRecord will block until next record is available. It is
+// NextRecord will block until the next record is available. It is
 // thread-safe.
 func (c *Client) NextRecord() []byte {
 	return <-c.ch
diff --git a/go/master/client_internal_test.go b/go/master/client_internal_test.go
index 362668202a7eb3f7f04a9d93c3e8eeb9a63c2619..00fcca0e2cf44d0f4855fd366a8f80895abf8865 100644
--- a/go/master/client_internal_test.go
+++ b/go/master/client_internal_test.go
@@ -75,6 +75,7 @@ func TestGetFinishTask(t *testing.T) {
 	}
 	f.Close()
 
+	// Manually intialize client to avoid calling c.getRecords()
 	c := &Client{}
 	c.conn = connection.New()
 	go c.monitorMaster(TestAddresser(fmt.Sprintf(":%d", p)))
@@ -85,19 +86,19 @@ func TestGetFinishTask(t *testing.T) {
 		for idx := 0; idx < totalTask; idx++ {
 			task, err := c.getTask()
 			if err != nil {
-				t.Fatal(err, " pass:", i)
+				t.Fatalf("Error: %v, pass: %d\n", err, i)
 			}
 			tasks = append(tasks, task)
 		}
 
 		_, err = c.getTask()
 		if err == nil {
-			t.Fatal("Should get error. Pass:", i)
+			t.Fatalf("Should get error, pass: %d\n", i)
 		}
 
 		err = c.taskFinished(tasks[0].ID)
 		if err != nil {
-			t.Fatal(err, "pass:", i)
+			t.Fatalf("Error: %v, pass: %d\n", err, i)
 		}
 		tasks = tasks[1:]
 		task, err := c.getTask()
@@ -109,7 +110,7 @@ func TestGetFinishTask(t *testing.T) {
 		for _, task := range tasks {
 			err = c.taskFinished(task.ID)
 			if err != nil {
-				t.Fatal(err, " pass:", i)
+				t.Fatalf("Error: %v, pass: %d\n", err, i)
 			}
 		}
 	}
diff --git a/go/master/service.go b/go/master/service.go
index 2e165138fb896ab5e43ec792e0b8110aa4834e85..55e1e2d1a4a5cd6f5d5797b247e2ebe433607576 100644
--- a/go/master/service.go
+++ b/go/master/service.go
@@ -207,12 +207,12 @@ func (s *Service) checkTimeoutFunc(taskID int, epoch int) func() {
 
 		t.NumTimeout++
 		if t.NumTimeout > s.timeoutMax {
-			log.Warningf("Task %v failed %d times, discard.\n", t.Task, t.NumTimeout)
+			log.Warningf("Task %v timed out %d times, discard.\n", t.Task, t.NumTimeout)
 			s.taskQueues.Failed = append(s.taskQueues.Failed, t.Task)
 			return
 		}
 
-		log.Warningf("Task %v failed %d times, retry.\n", t.Task, t.NumTimeout)
+		log.Warningf("Task %v timed out %d times, retry.\n", t.Task, t.NumTimeout)
 		s.taskQueues.Todo = append(s.taskQueues.Todo, t)
 	}
 }
diff --git a/go/pserver/cclient/test/main.c b/go/pserver/cclient/test/main.c
index 07e1b86b43299f72e24bb83621847980eaaaf06e..03f749d4e46c4890c6dcfa25af572dab4a053c86 100644
--- a/go/pserver/cclient/test/main.c
+++ b/go/pserver/cclient/test/main.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "libpaddle_pserver_cclient.h"