diff --git a/broken/client_test.go b/client_test.go
similarity index 93%
rename from broken/client_test.go
rename to client_test.go
index 49d7ffdd..f0336c15 100644
--- a/broken/client_test.go
+++ b/client_test.go
@@ -71,7 +71,7 @@ func TestClientTsigAXFR(t *testing.T) {
 	m := new(Msg)
 	m.SetAxfr("miek.nl.")
 
-	m.SetTsig("axfr.", HmacMD5, 300, uint64(time.Now()))
+	m.SetTsig("axfr.", HmacMD5, 300, uint64(time.Now().Unix()))
 	TsigGenerate(m, "so6ZGir4GPAqINNh9U5c3A==", "", false)
 	secrets := make(map[string]string)
 	secrets["axfr."] = "so6ZGir4GPAqINNh9U5c3A=="
@@ -81,7 +81,7 @@ func TestClientTsigAXFR(t *testing.T) {
 	c.TsigSecret = secrets
 
 	if err := c.XfrReceive(m, "85.223.71.124:53"); err != nil {
-		t.Log("Failed to setup axfr" + err.String())
+		t.Log("Failed to setup axfr" + err.Error())
 		t.Fail()
 	}
 	for {
@@ -101,7 +101,7 @@ func TestClientAXFRMultipleMessages(t *testing.T) {
 	c.Net = "tcp"
 
 	if err := c.XfrReceive(m, "85.223.71.124:53"); err != nil {
-		t.Log("Failed to setup axfr" + err.String())
+		t.Log("Failed to setup axfr" + err.Error())
 		t.Fail()
 	}
 	for {
diff --git a/broken/server_test.go b/server_test.go
similarity index 95%
rename from broken/server_test.go
rename to server_test.go
index d6d09a13..d98180b5 100644
--- a/broken/server_test.go
+++ b/server_test.go
@@ -20,7 +20,7 @@ func TestServing(t *testing.T) {
 	go func() {
 		err := ListenAndServe(":8053", "udp", nil)
 		if err != nil {
-			t.Log("ListenAndServe: ", err.String())
+			t.Log("ListenAndServe: ", err.Error())
 			t.Fail()
 		}
 	}()