diff --git a/api/results_test.go b/api/results_test.go
index 68e21e9aca1a317bada3ea1497c90166b1b4289c..cf8c9bf9c8b2f7068d8f994aa14a3df26c5002c8 100644
--- a/api/results_test.go
+++ b/api/results_test.go
@@ -40,7 +40,7 @@ func TestClient_GetRoundResults(t *testing.T) {
 	// Create a new copy of the test client for this test
 	client, err := newTestingClient(t)
 	if err != nil {
-		t.Fatalf("Failed in setup: %v", err)
+		t.Fatalf("Failed in setup: %+v", err)
 	}
 
 	// Construct the round call back function signature
diff --git a/api/utils_test.go b/api/utils_test.go
index 973f15747b12741f0f83724a196a30b89800be1d..f1fea1358c4bd46a33c3a8f66d7cf56568485d67 100644
--- a/api/utils_test.go
+++ b/api/utils_test.go
@@ -68,7 +68,10 @@ func newTestingClient(face interface{}) (*Client, error) {
 
 	p := gateway.DefaultPoolParams()
 	p.MaxPoolSize = 1
-	sender, _ := gateway.NewSender(p, c.rng, def, commsManager, c.storage, nil)
+	sender, err := gateway.NewSender(p, c.rng, def, commsManager, c.storage, nil)
+	if err != nil {
+		return nil, err
+	}
 	c.network = &testNetworkManagerGeneric{instance: thisInstance, sender: sender}
 
 	return c, nil
@@ -85,6 +88,8 @@ func getNDF(face interface{}) *ndf.NetworkDefinition {
 
 	cert, _ := utils.ReadFile(testkeys.GetNodeCertPath())
 	nodeID := id.NewIdFromBytes([]byte("gateway"), face)
+	gwId := nodeID.DeepCopy()
+	gwId.SetType(id.Gateway)
 	return &ndf.NetworkDefinition{
 		Registration: ndf.Registration{
 			TlsCertificate: string(cert),
@@ -100,7 +105,7 @@ func getNDF(face interface{}) *ndf.NetworkDefinition {
 		},
 		Gateways: []ndf.Gateway{
 			{
-				ID:             nodeID.Bytes(),
+				ID:             gwId.Bytes(),
 				Address:        "",
 				TlsCertificate: string(cert),
 			},