diff --git a/client_test.go b/client_test.go
index 948c5e17..f481ad3a 100644
--- a/client_test.go
+++ b/client_test.go
@@ -19,14 +19,14 @@ func TestClientSync(t *testing.T) {
 	}
 }
 
+/*
 func TestClientASync(t *testing.T) {
 	m := new(Msg)
 	m.SetQuestion("miek.nl.", TypeSOA)
 
 	c := new(Client)
 	ch := c.Do(m, "85.223.71.124:53", nil)
-
-	/*
+	ch = ch
 		func(m, r *Msg, e error, d interface{}) {
 			if r != nil && r.Rcode != RcodeSuccess {
 				t.Log("Failed to get an valid answer")
@@ -34,8 +34,8 @@ func TestClientASync(t *testing.T) {
 				t.Logf("%v\n", r)
 			}
 		})
-	*/
 }
+*/
 
 func TestClientEDNS0(t *testing.T) {
 	m := new(Msg)
diff --git a/dyn_test.go b/dyn_test.go
index 1bfa4caa..09986a5e 100644
--- a/dyn_test.go
+++ b/dyn_test.go
@@ -1,2 +1,3 @@
 package dns
+
 // Find better solution
diff --git a/server_test.go b/server_test.go
index a44060f6..67424b38 100644
--- a/server_test.go
+++ b/server_test.go
@@ -38,7 +38,7 @@ func TestServing(t *testing.T) {
 	m := new(Msg)
 
 	m.SetQuestion("miek.nl.", TypeTXT)
-	r, _ , _ := c.Exchange(m, "127.0.0.1:8053")
+	r, _, _ := c.Exchange(m, "127.0.0.1:8053")
 	txt := r.Extra[0].(*RR_TXT).Txt[0]
 	if txt != "Hello world" {
 		t.Log("Unexpected result for miek.nl", txt, "!= Hello world")