diff --git a/server/federation_test.go b/server/federation_test.go
index d756998..743c849 100644
--- a/server/federation_test.go
+++ b/server/federation_test.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/lbryio/herald.go/internal/metrics"
 	pb "github.com/lbryio/herald.go/protobuf/go"
-	server "github.com/lbryio/herald.go/server"
+	"github.com/lbryio/herald.go/server"
 	"github.com/lbryio/lbry.go/v3/extras/stop"
 	dto "github.com/prometheus/client_model/go"
 	"google.golang.org/grpc"
@@ -49,7 +49,7 @@ func removeFile(fileName string) {
 func TestAddPeer(t *testing.T) {
 	// ctx := context.Background()
 	ctx := stop.NewDebug()
-	args := MakeDefaultTestArgs()
+	args := server.MakeDefaultTestArgs()
 
 	tests := []struct {
 		name string
@@ -108,7 +108,7 @@ func TestAddPeer(t *testing.T) {
 func TestPeerWriter(t *testing.T) {
 	// ctx := context.Background()
 	ctx := stop.NewDebug()
-	args := MakeDefaultTestArgs()
+	args := server.MakeDefaultTestArgs()
 	args.DisableWritePeers = false
 
 	tests := []struct {
@@ -165,8 +165,8 @@ func TestPeerWriter(t *testing.T) {
 func TestAddPeerEndpoint(t *testing.T) {
 	// ctx := context.Background()
 	ctx := stop.NewDebug()
-	args := MakeDefaultTestArgs()
-	args2 := MakeDefaultTestArgs()
+	args := server.MakeDefaultTestArgs()
+	args2 := server.MakeDefaultTestArgs()
 	args2.Port = "50052"
 
 	tests := []struct {
@@ -237,9 +237,9 @@ func TestAddPeerEndpoint(t *testing.T) {
 func TestAddPeerEndpoint2(t *testing.T) {
 	// ctx := context.Background()
 	ctx := stop.NewDebug()
-	args := MakeDefaultTestArgs()
-	args2 := MakeDefaultTestArgs()
-	args3 := MakeDefaultTestArgs()
+	args := server.MakeDefaultTestArgs()
+	args2 := server.MakeDefaultTestArgs()
+	args3 := server.MakeDefaultTestArgs()
 	args2.Port = "50052"
 	args3.Port = "50053"
 
@@ -319,9 +319,9 @@ func TestAddPeerEndpoint2(t *testing.T) {
 func TestAddPeerEndpoint3(t *testing.T) {
 	// ctx := context.Background()
 	ctx := stop.NewDebug()
-	args := MakeDefaultTestArgs()
-	args2 := MakeDefaultTestArgs()
-	args3 := MakeDefaultTestArgs()
+	args := server.MakeDefaultTestArgs()
+	args2 := server.MakeDefaultTestArgs()
+	args3 := server.MakeDefaultTestArgs()
 	args2.Port = "50052"
 	args3.Port = "50053"
 
@@ -409,9 +409,9 @@ func TestAddPeerEndpoint3(t *testing.T) {
 func TestUDPServer(t *testing.T) {
 	// ctx := context.Background()
 	ctx := stop.NewDebug()
-	args := MakeDefaultTestArgs()
+	args := server.MakeDefaultTestArgs()
 	args.DisableStartUDP = false
-	args2 := MakeDefaultTestArgs()
+	args2 := server.MakeDefaultTestArgs()
 	args2.Port = "50052"
 	args2.DisableStartUDP = false
 
diff --git a/server/notifier_test.go b/server/notifier_test.go
index c09e40d..d482b60 100644
--- a/server/notifier_test.go
+++ b/server/notifier_test.go
@@ -47,7 +47,7 @@ func tcpRead(conn net.Conn) ([]byte, error) {
 }
 
 func TestNotifierServer(t *testing.T) {
-	args := MakeDefaultTestArgs()
+	args := server.MakeDefaultTestArgs()
 	// ctx := context.Background()
 	ctx := stop.NewDebug()
 	hub := server.MakeHubServer(ctx, args)
diff --git a/server/search_test.go b/server/search_test.go
index 20df5ae..cd5a50a 100644
--- a/server/search_test.go
+++ b/server/search_test.go
@@ -58,7 +58,7 @@ func TestSearch(t *testing.T) {
 
 	ctx := context.Background()
 	stopGroup := stop.NewDebug()
-	args := MakeDefaultTestArgs()
+	args := server.MakeDefaultTestArgs()
 	hubServer := server.MakeHubServer(stopGroup, args)
 	req := &pb.SearchRequest{
 		Text: "asdf",
diff --git a/server/udp_test.go b/server/udp_test.go
index f7f6829..37f9b90 100644
--- a/server/udp_test.go
+++ b/server/udp_test.go
@@ -11,7 +11,7 @@ import (
 
 // TestUDPPing tests UDPPing correctness against prod server.
 func TestUDPPing(t *testing.T) {
-	args := MakeDefaultTestArgs()
+	args := server.MakeDefaultTestArgs()
 	args.DisableStartUDP = true
 
 	tests := []struct {