diff --git a/api/results_test.go b/api/results_test.go
index cf8c9bf9c8b2f7068d8f994aa14a3df26c5002c8..c5245dd9a193d2f6c8bdb84e3f3862f1f884b1c2 100644
--- a/api/results_test.go
+++ b/api/results_test.go
@@ -171,7 +171,7 @@ func TestClient_GetRoundResults_HistoricalRounds(t *testing.T) {
 			t.Errorf("Failed to sign round in set up: %v", err)
 		}
 
-		err = client.network.GetInstance().RoundUpdate(ri)
+		_, err = client.network.GetInstance().RoundUpdate(ri)
 		if err != nil {
 			t.Errorf("Failed to upsert round in set up: %v", err)
 		}
diff --git a/network/ephemeral/tracker_test.go b/network/ephemeral/tracker_test.go
index 47b8f034766c45c003f9f4997a599cf1ad22cfbd..4a946a3fc66c31071cf6b8ba31bc8e913ef73bfd 100644
--- a/network/ephemeral/tracker_test.go
+++ b/network/ephemeral/tracker_test.go
@@ -107,7 +107,7 @@ func setupInstance(instance interfaces.NetworkManager) error {
 	if err = signature.SignRsa(ri, testCert); err != nil {
 		return errors.Errorf("Failed to sign round info: %+v", err)
 	}
-	if err = instance.GetInstance().RoundUpdate(ri); err != nil {
+	if _, err = instance.GetInstance().RoundUpdate(ri); err != nil {
 		return errors.Errorf("Failed to RoundUpdate from from file: %+v", err)
 	}
 
@@ -117,7 +117,7 @@ func setupInstance(instance interfaces.NetworkManager) error {
 	if err = signature.SignRsa(ri, testCert); err != nil {
 		return errors.Errorf("Failed to sign round info: %+v", err)
 	}
-	if err = instance.GetInstance().RoundUpdate(ri); err != nil {
+	if _, err = instance.GetInstance().RoundUpdate(ri); err != nil {
 		return errors.Errorf("Failed to RoundUpdate from from file: %v", err)
 	}
 
diff --git a/network/message/sendCmix_test.go b/network/message/sendCmix_test.go
index 984e5cd2d01d4f4e687b72f6e8217c9440c980cd..8ef85711c6d333d909b5f633994f47a4cc7caf46 100644
--- a/network/message/sendCmix_test.go
+++ b/network/message/sendCmix_test.go
@@ -90,7 +90,7 @@ func Test_attemptSendCmix(t *testing.T) {
 		t.Errorf("Failed to load a key for testing: %v", err)
 	}
 	rnd := ds.NewRound(ri, pubKey, nil)
-	inst.GetWaitingRounds().Insert(rnd)
+	inst.GetWaitingRounds().Insert([]*ds.Round{rnd}, nil)
 	i := internal.Internal{
 		Session:          sess1,
 		Switchboard:      sw,
diff --git a/network/message/sendManyCmix_test.go b/network/message/sendManyCmix_test.go
index 476004edd18f481692d70794b3c22d3d8fa79b17..7ac3b99c3e0e121d8478a6162333741cfb411a29 100644
--- a/network/message/sendManyCmix_test.go
+++ b/network/message/sendManyCmix_test.go
@@ -90,7 +90,7 @@ func Test_attemptSendManyCmix(t *testing.T) {
 		t.Errorf("Failed to load a key for testing: %v", err)
 	}
 	rnd := ds.NewRound(ri, pubKey, nil)
-	inst.GetWaitingRounds().Insert(rnd)
+	inst.GetWaitingRounds().Insert([]*ds.Round{rnd}, nil)
 	i := internal.Internal{
 		Session:          sess1,
 		Switchboard:      sw,