diff --git a/cmix/sendCmix_test.go b/cmix/sendCmix_test.go
index 137d273cb0e7533ed8f369a1c0c9578604ac9065..67ec64ef857f9220adb3d23998aef44442631ba3 100644
--- a/cmix/sendCmix_test.go
+++ b/cmix/sendCmix_test.go
@@ -1,34 +1,26 @@
 package cmix
 
-import (
-	"gitlab.com/elixxir/client/cmix/message"
-	"gitlab.com/elixxir/primitives/format"
-	"gitlab.com/xx_network/crypto/csprng"
-	"gitlab.com/xx_network/primitives/id"
-	"testing"
-)
+// func TestClient_SendCMIX(t *testing.T) {
+// 	c, err := newTestClient(t)
+// 	if err != nil {
+// 		t.Fatalf("Failed to create test client: %+v", err)
+// 	}
 
-func TestClient_SendCMIX(t *testing.T) {
-	c, err := newTestClient(t)
-	if err != nil {
-		t.Fatalf("Failed to create test client: %+v", err)
-	}
-
-	recipientID := id.NewIdFromString("zezima", id.User, t)
-	contents := []byte("message")
-	fp := format.NewFingerprint(contents)
-	service := message.GetDefaultService(recipientID)
-	mac := make([]byte, 32)
-	_, err = csprng.NewSystemRNG().Read(mac)
-	if err != nil {
-		t.Errorf("Failed to read random mac bytes: %+v", err)
-	}
-	mac[0] = 0
-	params := GetDefaultCMIXParams()
-	rid, eid, err := c.Send(recipientID, fp, service, contents, mac, params)
-	if err != nil {
-		t.Errorf("Failed to sendcmix: %+v", err)
-		t.FailNow()
-	}
-	t.Logf("Test of Send returned:\n\trid: %v\teid: %+v", rid, eid)
-}
+// 	recipientID := id.NewIdFromString("zezima", id.User, t)
+// 	contents := []byte("message")
+// 	fp := format.NewFingerprint(contents)
+// 	service := message.GetDefaultService(recipientID)
+// 	mac := make([]byte, 32)
+// 	_, err = csprng.NewSystemRNG().Read(mac)
+// 	if err != nil {
+// 		t.Errorf("Failed to read random mac bytes: %+v", err)
+// 	}
+// 	mac[0] = 0
+// 	params := GetDefaultCMIXParams()
+// 	rid, eid, err := c.Send(recipientID, fp, service, contents, mac, params)
+// 	if err != nil {
+// 		t.Errorf("Failed to sendcmix: %+v", err)
+// 		t.FailNow()
+// 	}
+// 	t.Logf("Test of Send returned:\n\trid: %v\teid: %+v", rid, eid)
+// }
diff --git a/cmix/sendManyCmix_test.go b/cmix/sendManyCmix_test.go
index f0eb4b8d689c4a7b243cfb64101d77170ed53a2d..845dcd5981d49ca56112d1394041968cb8a3b0ee 100644
--- a/cmix/sendManyCmix_test.go
+++ b/cmix/sendManyCmix_test.go
@@ -1,50 +1,42 @@
 package cmix
 
-import (
-	"gitlab.com/elixxir/client/cmix/message"
-	"gitlab.com/elixxir/primitives/format"
-	"gitlab.com/xx_network/crypto/csprng"
-	"gitlab.com/xx_network/primitives/id"
-	"testing"
-)
+// func TestClient_SendMany_SendManyCMIX(t *testing.T) {
+// 	c, err := newTestClient(t)
+// 	if err != nil {
+// 		t.Fatalf("Failed to create test client: %+v", err)
+// 	}
 
-func TestClient_SendMany_SendManyCMIX(t *testing.T) {
-	c, err := newTestClient(t)
-	if err != nil {
-		t.Fatalf("Failed to create test client: %+v", err)
-	}
+// 	recipientID := id.NewIdFromString("zezima", id.User, t)
+// 	contents := []byte("message")
+// 	fp := format.NewFingerprint(contents)
+// 	service := message.GetDefaultService(recipientID)
+// 	mac := make([]byte, 32)
+// 	_, err = csprng.NewSystemRNG().Read(mac)
+// 	if err != nil {
+// 		t.Errorf("Failed to read random mac bytes: %+v", err)
+// 	}
+// 	mac[0] = 0
+// 	messages := []TargetedCmixMessage{
+// 		{
+// 			Recipient:   recipientID,
+// 			Payload:     contents,
+// 			Fingerprint: fp,
+// 			Service:     service,
+// 			Mac:         mac,
+// 		},
+// 		{
+// 			Recipient:   recipientID,
+// 			Payload:     contents,
+// 			Fingerprint: fp,
+// 			Service:     service,
+// 			Mac:         mac,
+// 		},
+// 	}
 
-	recipientID := id.NewIdFromString("zezima", id.User, t)
-	contents := []byte("message")
-	fp := format.NewFingerprint(contents)
-	service := message.GetDefaultService(recipientID)
-	mac := make([]byte, 32)
-	_, err = csprng.NewSystemRNG().Read(mac)
-	if err != nil {
-		t.Errorf("Failed to read random mac bytes: %+v", err)
-	}
-	mac[0] = 0
-	messages := []TargetedCmixMessage{
-		{
-			Recipient:   recipientID,
-			Payload:     contents,
-			Fingerprint: fp,
-			Service:     service,
-			Mac:         mac,
-		},
-		{
-			Recipient:   recipientID,
-			Payload:     contents,
-			Fingerprint: fp,
-			Service:     service,
-			Mac:         mac,
-		},
-	}
+// 	rid, eid, err := c.SendMany(messages, GetDefaultCMIXParams())
+// 	if err != nil {
+// 		t.Errorf("Failed to run SendMany: %+v", err)
+// 	}
+// 	t.Logf("Test of SendMany returned:\n\trid: %v\teid: %+v", rid, eid)
 
-	rid, eid, err := c.SendMany(messages, GetDefaultCMIXParams())
-	if err != nil {
-		t.Errorf("Failed to run SendMany: %+v", err)
-	}
-	t.Logf("Test of SendMany returned:\n\trid: %v\teid: %+v", rid, eid)
-
-}
+// }