diff --git a/server/handler_test.go b/server/handler_test.go
index 67b9af8e5..7c3c024b4 100644
--- a/server/handler_test.go
+++ b/server/handler_test.go
@@ -1505,6 +1505,7 @@ func TestQueryHistory(t *testing.T) {
 	test.Do(t, "POST", cmd.URL()+"/index/i0/query", "Set(0, f0=0)")
 	test.Do(t, "POST", cmd.URL()+"/index/i0/query", "Set(3000000, f0=0)")
 	test.Do(t, "POST", cmd.URL()+"/index/i0/query", "TopN(f0)")
+	// TODO SQL
 
 	h.ServeHTTP(w, test.MustNewHTTPRequest("GET", "/query-history", nil))
 	if w.Code != gohttp.StatusOK {
@@ -1543,8 +1544,8 @@ func TestQueryHistory(t *testing.T) {
 	if ret[0].Node != cluster.GetNode(0).Server.NodeID() {
 		t.Fatalf("response value for 'Node' was '%s', expected '%s'", ret[0].Node, cluster.GetNode(0).Server.NodeID())
 	}
-	if ret[0].Query != "TopN(f0)" {
-		t.Fatalf("response value for 'Query' was '%s', expected 'TopN(f0)'", ret[0].Query)
+	if ret[0].PQL != "TopN(f0)" {
+		t.Fatalf("response value for 'PQL' was '%s', expected 'TopN(f0)'", ret[0].PQL)
 	}
 }
 
diff --git a/tracker_test.go b/tracker_test.go
index a5d8df418..569a7b609 100644
--- a/tracker_test.go
+++ b/tracker_test.go
@@ -47,11 +47,11 @@ func TestRingBuffer(t *testing.T) {
 		}
 
 		for n, q := range buffer.slice() {
-			if q.query != tests[k].queries[n] {
-				t.Fatalf("test[%d], buffer[%d] expected querystring '%s', found '%s'", k, n, tests[k].queries[n], q.query)
+			if q.PQL != tests[k].queries[n] {
+				t.Fatalf("test[%d], buffer[%d] expected querystring '%s', found '%s'", k, n, tests[k].queries[n], q.PQL)
 			}
 		}
-		buffer.add(pastQuery{query: fmt.Sprintf("%d", k)})
+		buffer.add(pastQuery{PQL: fmt.Sprintf("%d", k)})
 	}
 }
 
@@ -63,13 +63,13 @@ func TestQueryTracker(t *testing.T) {
 		t.Fatalf("expected no active queries; found %v", queries)
 	}
 
-	qs := tracker.Start("test query", "node0", "i", time.Now())
+	qs := tracker.Start("test query", "test SQL", "node0", "i", time.Now())
 
 	var queries []ActiveQueryStatus
 	for len(queries) < 1 {
 		queries = tracker.ActiveQueries()
 	}
-	if len(queries) > 1 || queries[0].Query != "test query" {
+	if len(queries) > 1 || queries[0].PQL != "test query" {
 		t.Fatalf("unexpected queries: %v", queries)
 	}