diff --git a/groupChat/groupStore/group_test.go b/groupChat/groupStore/group_test.go
index 2da1e2868991259142ec74cef049f9e9acd1035f..047df74bc3981ef0b3f7b107c5c57fe87dac3ed6 100644
--- a/groupChat/groupStore/group_test.go
+++ b/groupChat/groupStore/group_test.go
@@ -104,7 +104,7 @@ func TestGroup_DeepCopy(t *testing.T) {
 
 // Unit test of Group.store.
 func TestGroup_store(t *testing.T) {
-	kv := versioned.NewKV(make(ekv.Memstore))
+	kv := versioned.NewKV(ekv.MakeMemstore())
 	g := createTestGroup(rand.New(rand.NewSource(42)), t)
 
 	err := g.store(kv)
@@ -130,7 +130,7 @@ func TestGroup_store(t *testing.T) {
 
 // Unit test of Group.loadGroup.
 func Test_loadGroup(t *testing.T) {
-	kv := versioned.NewKV(make(ekv.Memstore))
+	kv := versioned.NewKV(ekv.MakeMemstore())
 	g := createTestGroup(rand.New(rand.NewSource(42)), t)
 
 	err := g.store(kv)
@@ -151,7 +151,7 @@ func Test_loadGroup(t *testing.T) {
 
 // Error path: an error is returned when no group with the ID exists in storage.
 func Test_loadGroup_InvalidGroupIdError(t *testing.T) {
-	kv := versioned.NewKV(make(ekv.Memstore))
+	kv := versioned.NewKV(ekv.MakeMemstore())
 	g := createTestGroup(rand.New(rand.NewSource(42)), t)
 	expectedErr := strings.SplitN(kvGetGroupErr, "%", 2)[0]
 
@@ -164,7 +164,7 @@ func Test_loadGroup_InvalidGroupIdError(t *testing.T) {
 
 // Unit test of Group.removeGroup.
 func Test_removeGroup(t *testing.T) {
-	kv := versioned.NewKV(make(ekv.Memstore))
+	kv := versioned.NewKV(ekv.MakeMemstore())
 	g := createTestGroup(rand.New(rand.NewSource(42)), t)
 
 	err := g.store(kv)
diff --git a/groupChat/manager_test.go b/groupChat/manager_test.go
index db891b387280540bf2d27b2a4f4c7e25da41d98e..95eb620337bc040dd53543c809b2d005211b4490 100644
--- a/groupChat/manager_test.go
+++ b/groupChat/manager_test.go
@@ -22,7 +22,7 @@ import (
 
 // Unit test of Manager.newManager.
 func Test_newManager(t *testing.T) {
-	kv := versioned.NewKV(make(ekv.Memstore))
+	kv := versioned.NewKV(ekv.MakeMemstore())
 	user := group.Member{
 		ID:    id.NewIdFromString("userID", id.User, t),
 		DhKey: randCycInt(rand.New(rand.NewSource(42))),
@@ -66,7 +66,7 @@ func Test_newManager(t *testing.T) {
 // Tests that Manager.newManager loads a group storage when it exists.
 func Test_newManager_LoadStorage(t *testing.T) {
 	prng := rand.New(rand.NewSource(42))
-	kv := versioned.NewKV(make(ekv.Memstore))
+	kv := versioned.NewKV(ekv.MakeMemstore())
 	user := group.Member{
 		ID:    id.NewIdFromString("userID", id.User, t),
 		DhKey: randCycInt(rand.New(rand.NewSource(42))),
@@ -98,7 +98,7 @@ func Test_newManager_LoadStorage(t *testing.T) {
 // Error path: an error is returned when a group cannot be loaded from storage.
 func Test_newManager_LoadError(t *testing.T) {
 	prng := rand.New(rand.NewSource(42))
-	kv := versioned.NewKV(make(ekv.Memstore))
+	kv := versioned.NewKV(ekv.MakeMemstore())
 	user := group.Member{
 		ID:    id.NewIdFromString("userID", id.User, t),
 		DhKey: randCycInt(rand.New(rand.NewSource(42))),
diff --git a/groupChat/utils_test.go b/groupChat/utils_test.go
index 002dbb17f28fb5170d511b66126b926280beeb53..371d03ba3d87adbbbab9be9b64d12be99006ef7c 100644
--- a/groupChat/utils_test.go
+++ b/groupChat/utils_test.go
@@ -57,7 +57,7 @@ func newTestManager(rng *rand.Rand, t *testing.T) (*Manager, gs.Group) {
 
 	g := newTestGroupWithUser(m.grp, user.ID, user.DhKey,
 		m.e2e.GetHistoricalDHPrivkey(), rng, t)
-	gStore, err := gs.NewStore(versioned.NewKV(make(ekv.Memstore)), user)
+	gStore, err := gs.NewStore(versioned.NewKV(ekv.MakeMemstore()), user)
 	if err != nil {
 		t.Fatalf("Failed to create new group store: %+v", err)
 	}
@@ -92,7 +92,7 @@ func newTestManagerWithStore(rng *rand.Rand, numGroups int, sendErr int,
 		DhKey: m.e2e.GetHistoricalDHPubkey(),
 	}
 
-	gStore, err := gs.NewStore(versioned.NewKV(make(ekv.Memstore)), user)
+	gStore, err := gs.NewStore(versioned.NewKV(ekv.MakeMemstore()), user)
 	if err != nil {
 		t.Fatalf("Failed to create new group store: %+v", err)
 	}
diff --git a/single/responseProcessor.go b/single/responseProcessor.go
index 99b4be25a286f0fc501eb8999bd4006ecb8c7920..942a8443cb32a3b9ea40d357f5e9b3277c59123a 100644
--- a/single/responseProcessor.go
+++ b/single/responseProcessor.go
@@ -11,8 +11,6 @@ import (
 	"gitlab.com/elixxir/primitives/format"
 )
 
-const responseProcessorName = "responseProcessorName"
-
 type callbackWrapper func(payload []byte,
 	receptionID receptionID.EphemeralIdentity, rounds []rounds.Round, err error)