HTRACE-22. Fix golang unit tests (cmccabe)
diff --git a/htrace-core/src/go/gobuild.sh b/htrace-core/src/go/gobuild.sh
index c0b2268..c689dac 100755
--- a/htrace-core/src/go/gobuild.sh
+++ b/htrace-core/src/go/gobuild.sh
@@ -80,4 +80,4 @@
     fi
 fi
 
-go "${ACTION}" -v org/apache/htrace/htraced org/apache/htrace/htrace "$@"
+go "${ACTION}" -v org/apache/htrace/... "$@"
diff --git a/htrace-core/src/go/src/org/apache/htrace/common/span_test.go b/htrace-core/src/go/src/org/apache/htrace/common/span_test.go
index 545c669..f3b65fc 100644
--- a/htrace-core/src/go/src/org/apache/htrace/common/span_test.go
+++ b/htrace-core/src/go/src/org/apache/htrace/common/span_test.go
@@ -20,7 +20,6 @@
 package common
 
 import (
-	"math/rand"
 	"testing"
 )
 
diff --git a/htrace-core/src/go/src/org/apache/htrace/conf/config_test.go b/htrace-core/src/go/src/org/apache/htrace/conf/config_test.go
index 85b1517..b16abb4 100644
--- a/htrace-core/src/go/src/org/apache/htrace/conf/config_test.go
+++ b/htrace-core/src/go/src/org/apache/htrace/conf/config_test.go
@@ -28,7 +28,7 @@
 func TestParseArgV(t *testing.T) {
 	t.Parallel()
 	argv := []string{"-Dfoo=bar", "-Dbaz=123", "-DsillyMode"}
-	bld := &ConfigBuilder{Argv: argv}
+	bld := &Builder{Argv: argv}
 	cnf, err := bld.Build()
 	if err != nil {
 		t.Fatal()
@@ -57,7 +57,7 @@
 		"baz":  "456",
 		"foo2": "4611686018427387904",
 	}
-	bld := &ConfigBuilder{Argv: argv, Defaults: defaults}
+	bld := &Builder{Argv: argv, Defaults: defaults}
 	cnf, err := bld.Build()
 	if err != nil {
 		t.Fatal()
@@ -100,7 +100,7 @@
 		"foo.bar":     "789",
 		"cmdline.opt": "4611686018427387904",
 	}
-	bld := &ConfigBuilder{Argv: argv, Defaults: defaults, Reader: xmlReader}
+	bld := &Builder{Argv: argv, Defaults: defaults, Reader: xmlReader}
 	cnf, err := bld.Build()
 	if err != nil {
 		t.Fatal()