diff --git a/voter-registry/src/test/java/SimpleRegistryTest.java b/voter-registry/src/test/java/SimpleRegistryTest.java
index 88389b8..7b090bc 100644
--- a/voter-registry/src/test/java/SimpleRegistryTest.java
+++ b/voter-registry/src/test/java/SimpleRegistryTest.java
@@ -9,8 +9,8 @@ import meerkat.bulletinboard.ThreadedBulletinBoardClient;
 import meerkat.crypto.concrete.ECDSASignature;
 import meerkat.protobuf.BulletinBoardAPI.BulletinBoardMessage;
 import meerkat.protobuf.BulletinBoardAPI.MessageFilterList;
+import meerkat.protobuf.VoterRegistry;
 import meerkat.protobuf.VoterRegistry.GroupID;
-import meerkat.protobuf.VoterRegistry.VoterGroup;
 import meerkat.protobuf.VoterRegistry.VoterID;
 import meerkat.protobuf.VoterRegistry.VoterInfo;
 import meerkat.protobuf.Voting;
@@ -227,9 +227,9 @@ public class SimpleRegistryTest extends TestCase {
 
         String voterId = new BigInteger(130, random).toString(32);
         String groupId = new BigInteger(130, random).toString(32);
-        VoterGroup voterInfo = VoterGroup.newBuilder()
-                .setVoterId(VoterID.newBuilder().setId(voterId))
-                .setGroupId(GroupID.newBuilder().setId(groupId)).build();
+        VoterRegistry.VoterRegistryMessage voterInfo = VoterRegistry.VoterRegistryMessage.newBuilder()
+                .setVoterID(VoterID.newBuilder().setId(voterId))
+                .addGroupID(GroupID.newBuilder().setId(groupId)).build();
 
         SimpleRegistry registry = new SimpleRegistry(signer, bulletinBoardClient, certStream);
         registry.AddToGroups(voterInfo, handler);
@@ -260,9 +260,9 @@ public class SimpleRegistryTest extends TestCase {
 
         String voterId = new BigInteger(130, random).toString(32);
         String groupId = new BigInteger(130, random).toString(32);
-        VoterGroup voterInfo = VoterGroup.newBuilder()
-                .setVoterId(VoterID.newBuilder().setId(voterId))
-                .setGroupId(GroupID.newBuilder().setId(groupId)).build();
+        VoterRegistry.VoterRegistryMessage voterInfo = VoterRegistry.VoterRegistryMessage.newBuilder()
+                .setVoterID(VoterID.newBuilder().setId(voterId))
+                .addGroupID(GroupID.newBuilder().setId(groupId)).build();
 
         this.certStream = getClass().getResourceAsStream(CERT1_PEM_EXAMPLE);