diff --git a/groupChat/makeGroup.go b/groupChat/makeGroup.go
index a9aa01838d1c6db25cf71cc79e2631bbb4b01371..e5137f56fd0bc45c8752c96f8244aaebe25fb365 100644
--- a/groupChat/makeGroup.go
+++ b/groupChat/makeGroup.go
@@ -88,13 +88,13 @@ func (m Manager) MakeGroup(membership []*id.ID, name, msg []byte) (gs.Group,
 	// Send all group requests
 	roundIDs, status, err := m.sendRequests(g)
 
-	if err==nil{
+	if err == nil {
 		edgeStore := m.store.GetEdge()
 		edgeStore.Add(edge.Preimage{
 			Data:   g.ID[:],
 			Type:   "group",
 			Source: g.ID[:],
-		},m.client.GetUser().ReceptionID)
+		}, m.store.GetUser().ReceptionID)
 	}
 
 	return g, roundIDs, status, err
diff --git a/storage/edge/edge_test.go b/storage/edge/edge_test.go
index b267c004a54b7cae9c0f42698b8b3cf11694a119..464122030fbb8f0728bd3700a227f207db7d526a 100644
--- a/storage/edge/edge_test.go
+++ b/storage/edge/edge_test.go
@@ -424,7 +424,7 @@ func TestStore_AddUpdateCallback(t *testing.T) {
 	// 	for j := range chans[identity] {
 	// 		chans[identity][j] = make(chan *id.ID, 2)
 	// 		cb := func(cbIdentity *id.ID, _ bool) {
-	// 			// t.Logf("callback called for idenetity %s", cbIdentity)
+	// 			// t.Logf("callback called for identity %s", cbIdentity)
 	// 			chans[identity][j] <- cbIdentity
 	// 		}
 	// 		// t.Logf("adding callback %d/%d for identity %s", i+1, len(cbs), &identity)
diff --git a/storage/session.go b/storage/session.go
index e43ddac37f0cf7558d67061f707ba5fcce5e5257..4a380b7911699490b0d6437beaa84c911b3ba080 100644
--- a/storage/session.go
+++ b/storage/session.go
@@ -69,7 +69,7 @@ type Session struct {
 	clientVersion       *clientVersion.Store
 	uncheckedRounds     *rounds.UncheckedRoundStore
 	hostList            *hostList.Store
-	edgeCheck			*edge.Store
+	edgeCheck           *edge.Store
 }
 
 // Initialize a new Session object
@@ -156,7 +156,7 @@ func New(baseDir, password string, u userInterface.User, currentVersion version.
 
 	s.hostList = hostList.NewStore(s.kv)
 
-	s.edgeCheck, err = edge.NewStore(s.kv,u.ReceptionID)
+	s.edgeCheck, err = edge.NewStore(s.kv, u.ReceptionID)
 	if err != nil {
 		return nil, errors.WithMessage(err, "Failed to edge check store")
 	}
@@ -239,7 +239,7 @@ func Load(baseDir, password string, currentVersion version.Version,
 	s.hostList = hostList.NewStore(s.kv)
 
 	s.edgeCheck, err = edge.LoadStore(s.kv)
-	if err!=nil{
+	if err != nil {
 		return nil, errors.WithMessage(err, "Failed to load edge check store")
 	}
 
@@ -435,5 +435,10 @@ func InitTestingSession(i interface{}) *Session {
 
 	s.hostList = hostList.NewStore(s.kv)
 
+	s.edgeCheck, err = edge.NewStore(s.kv, uid)
+	if err != nil {
+		jww.FATAL.Panicf("Failed to create new edge Store: %+v", err)
+	}
+
 	return s
 }