diff --git a/bindings/group.go b/bindings/group.go
index 8d20c533d5979fc1032adbbdcc2a093b0ca8f8d4..ddd9a17bd18738cb0318d856acd0e07fa8a8de9a 100644
--- a/bindings/group.go
+++ b/bindings/group.go
@@ -292,7 +292,8 @@ func (gmr *GroupMessageReceive) GetTimestampNano() int64 {
 
 // GetTimestampMS returns the message timestamp in milliseconds.
 func (gmr *GroupMessageReceive) GetTimestampMS() int64 {
-	return gmr.Timestamp.UnixNano() / int64(time.Millisecond)
+	ts := uint64(gmr.Timestamp.UnixNano()) / uint64(time.Millisecond)
+	return int64(ts)
 }
 
 // GetRoundID returns the ID of the round the message was sent on.
@@ -309,5 +310,6 @@ func (gmr *GroupMessageReceive) GetRoundTimestampNano() int64 {
 // GetRoundTimestampMS returns the timestamp, in milliseconds, of the round the
 // message was sent on.
 func (gmr *GroupMessageReceive) GetRoundTimestampMS() int64 {
-	return gmr.RoundTimestamp.UnixNano() / int64(time.Millisecond)
+	ts := uint64(gmr.RoundTimestamp.UnixNano()) / uint64(time.Millisecond)
+	return int64(ts)
 }
diff --git a/groupChat/groupStore/dhKeyList.go b/groupChat/groupStore/dhKeyList.go
index 50c405c426d7a27f2f99767208d2b2915a4f93b5..f6359f3400327ca7639ac23618413e9e836d081d 100644
--- a/groupChat/groupStore/dhKeyList.go
+++ b/groupChat/groupStore/dhKeyList.go
@@ -25,10 +25,11 @@ const (
 	dhKeyDecodeErr = "failed to decode member DH key: %+v"
 )
 
+// DhKeyList is a map of users to their DH key.
 type DhKeyList map[id.ID]*cyclic.Int
 
-// GenerateDhKeyList generates the symmetric/DH key between the user and all
-// group members.
+// GenerateDhKeyList generates the DH key between the user and all group
+// members.
 func GenerateDhKeyList(userID *id.ID, privKey *cyclic.Int,
 	members group.Membership, grp *cyclic.Group) DhKeyList {
 	dkl := make(DhKeyList, len(members)-1)
diff --git a/groupChat/groupStore/group.go b/groupChat/groupStore/group.go
index 98d0b489de808cf1ed5ca31818f4bc7f203fe878..927201addc7feff88fea8a86f85fe46400ebf2ba 100644
--- a/groupChat/groupStore/group.go
+++ b/groupChat/groupStore/group.go
@@ -207,7 +207,8 @@ func DeserializeGroup(data []byte) (Group, error) {
 	return g, err
 }
 
-// groupStoreKey generates a unique key to save and load a Group to/from storage.
+// groupStoreKey generates a unique key to save and load a Group to/from
+// storage.
 func groupStoreKey(groupID *id.ID) string {
 	return groupStorageKey + groupID.String()
 }
diff --git a/groupChat/groupStore/group_test.go b/groupChat/groupStore/group_test.go
index ff855db08634dac15c33b918e14a3d394c90ef2b..30bada2d76d58cdd11a8e2fde8388c7ac9df843c 100644
--- a/groupChat/groupStore/group_test.go
+++ b/groupChat/groupStore/group_test.go
@@ -22,7 +22,8 @@ import (
 func TestNewGroup(t *testing.T) {
 	prng := rand.New(rand.NewSource(42))
 	membership := createMembership(prng, 10, t)
-	dkl := GenerateDhKeyList(membership[0].ID, randCycInt(prng), membership, getGroup())
+	dkl := GenerateDhKeyList(
+		membership[0].ID, randCycInt(prng), membership, getGroup())
 
 	expectedGroup := Group{
 		Name:        []byte(groupName),
diff --git a/groupChat/groupStore/store.go b/groupChat/groupStore/store.go
index 88e980603e323114b2a0c39a138f0e2977627053..f180249e7917b38704b0027b012f3a118262d9f6 100644
--- a/groupChat/groupStore/store.go
+++ b/groupChat/groupStore/store.go
@@ -40,7 +40,8 @@ const (
 	setUserPanic      = "Store.SetUser is for testing only. Got %T"
 )
 
-// The maximum number of group chats that a user can be a part of at once.
+// MaxGroupChats is the maximum number of group chats that a user can be a part
+// of at once.
 const MaxGroupChats = 64
 
 // Store stores the list of Groups that a user is a part of.
@@ -265,7 +266,8 @@ func (s *Store) Get(groupID *id.ID) (Group, bool) {
 
 // GetByKeyFp returns the group with the matching key fingerprint and salt.
 // Returns false if no group is found.
-func (s *Store) GetByKeyFp(keyFp format.Fingerprint, salt [group.SaltLen]byte) (Group, bool) {
+func (s *Store) GetByKeyFp(keyFp format.Fingerprint, salt [group.SaltLen]byte) (
+	Group, bool) {
 	s.mux.RLock()
 	defer s.mux.RUnlock()
 
diff --git a/groupChat/groupStore/store_test.go b/groupChat/groupStore/store_test.go
index 0e0917ff38ce33b83cbecbfafb4f960ea8c38447..0303446c99e2a4c5d36e51887a494d18f68810f8 100644
--- a/groupChat/groupStore/store_test.go
+++ b/groupChat/groupStore/store_test.go
@@ -58,7 +58,7 @@ func TestNewStore(t *testing.T) {
 		groupIds = append(groupIds, grpId)
 	}
 
-	// Check that stored group Id list is expected value
+	// Check that stored group ID list is expected value
 	expectedData := serializeGroupIdList(store.list)
 
 	obj, err := store.kv.Get(groupListStorageKey, groupListVersion)
@@ -211,7 +211,7 @@ func Test_serializeGroupIdList_deserializeGroupIdList(t *testing.T) {
 	data := serializeGroupIdList(testMap)
 	newList := deserializeGroupIdList(data)
 
-	// Sort expected and received lists so they are in the same order
+	// Sort expected and received lists so that they are in the same order
 	sort.Slice(expected, func(i, j int) bool {
 		return bytes.Compare(expected[i].Bytes(), expected[j].Bytes()) == -1
 	})
@@ -405,7 +405,7 @@ func TestStore_GroupIDs(t *testing.T) {
 
 	newList := store.GroupIDs()
 
-	// Sort expected and received lists so they are in the same order
+	// Sort expected and received lists so that they are in the same order
 	sort.Slice(expected, func(i, j int) bool {
 		return bytes.Compare(expected[i].Bytes(), expected[j].Bytes()) == -1
 	})
diff --git a/groupChat/internalFormat.go b/groupChat/internalFormat.go
index 2502a9c8c29c9f940a93bebb1101c5d5a5ae8ef2..e8fd69df643856b49a217a7ae0602ce7e741e363 100644
--- a/groupChat/internalFormat.go
+++ b/groupChat/internalFormat.go
@@ -94,7 +94,7 @@ func (im internalMsg) SetTimestamp(t time.Time) {
 	binary.LittleEndian.PutUint64(im.timestamp, uint64(t.UnixNano()))
 }
 
-// GetSenderID returns the sender ID bytes as a id.ID.
+// GetSenderID returns the sender ID bytes as an id.ID.
 func (im internalMsg) GetSenderID() (*id.ID, error) {
 	return id.Unmarshal(im.senderID)
 }
diff --git a/groupChat/internalFormat_test.go b/groupChat/internalFormat_test.go
index 984d11b8f35ec44935eaea48b5bbd76eec80bdb1..2fc5a0ebb10f93dfff2f01bb54515ebff823f105 100644
--- a/groupChat/internalFormat_test.go
+++ b/groupChat/internalFormat_test.go
@@ -198,7 +198,8 @@ func TestInternalMsg_String(t *testing.T) {
 	}
 }
 
-// Happy path: tests that String returns the expected string for a nil internalMsg.
+// Happy path: tests that String returns the expected string for a nil
+// internalMsg.
 func TestInternalMsg_String_NilInternalMessage(t *testing.T) {
 	im := internalMsg{}
 
diff --git a/groupChat/makeGroup.go b/groupChat/makeGroup.go
index 2c277b4384a04e187e722488d43b99357f1eb0e7..f3c5544c9e6b46a6a747e6ef96d1f7bc870e7aae 100644
--- a/groupChat/makeGroup.go
+++ b/groupChat/makeGroup.go
@@ -75,7 +75,8 @@ func (m Manager) MakeGroup(membership []*id.ID, name, msg []byte) (gs.Group,
 	groupKey := group.NewKey(keyPreimage, mem)
 
 	// Create new group and add to manager
-	g := gs.NewGroup(name, groupID, groupKey, idPreimage, keyPreimage, msg, mem, dkl)
+	g := gs.NewGroup(
+		name, groupID, groupKey, idPreimage, keyPreimage, msg, mem, dkl)
 	if err := m.gs.Add(g); err != nil {
 		return gs.Group{}, nil, NotSent, errors.Errorf(addGroupErr, err)
 	}
@@ -92,7 +93,8 @@ func (m Manager) MakeGroup(membership []*id.ID, name, msg []byte) (gs.Group,
 // buildMembership retrieves the contact object for each member ID and creates a
 // new membership from them. The caller is set as the leader. For a member to be
 // added, the group leader must have an authenticated channel with the member.
-func (m Manager) buildMembership(members []*id.ID) (group.Membership, gs.DhKeyList, error) {
+func (m Manager) buildMembership(members []*id.ID) (group.Membership,
+	gs.DhKeyList, error) {
 	// Return an error if the membership list has too few or too many members
 	if len(members) < group.MinParticipants {
 		return nil, nil,
diff --git a/groupChat/makeGroup_test.go b/groupChat/makeGroup_test.go
index 004bf452664984c8ec8651442ab10a7a64d48fee..6c38cae0fcd61d2c21e750c050c713d55b6edd77 100644
--- a/groupChat/makeGroup_test.go
+++ b/groupChat/makeGroup_test.go
@@ -77,7 +77,8 @@ func TestManager_MakeGroup(t *testing.T) {
 func TestManager_MakeGroup_MaxMessageSizeError(t *testing.T) {
 	prng := rand.New(rand.NewSource(42))
 	m, _ := newTestManagerWithStore(prng, 10, 0, nil, nil, t)
-	expectedErr := fmt.Sprintf(maxInitMsgSizeErr, MaxInitMessageSize+1, MaxInitMessageSize)
+	expectedErr := fmt.Sprintf(
+		maxInitMsgSizeErr, MaxInitMessageSize+1, MaxInitMessageSize)
 
 	_, _, status, err := m.MakeGroup(nil, nil, make([]byte, MaxInitMessageSize+1))
 	if err == nil || err.Error() != expectedErr {
@@ -96,7 +97,8 @@ func TestManager_MakeGroup_MaxMessageSizeError(t *testing.T) {
 func TestManager_MakeGroup_MembershipSizeError(t *testing.T) {
 	prng := rand.New(rand.NewSource(42))
 	m, _ := newTestManagerWithStore(prng, 10, 0, nil, nil, t)
-	expectedErr := fmt.Sprintf(maxMembersErr, group.MaxParticipants+1, group.MaxParticipants)
+	expectedErr := fmt.Sprintf(
+		maxMembersErr, group.MaxParticipants+1, group.MaxParticipants)
 
 	_, _, status, err := m.MakeGroup(make([]*id.ID, group.MaxParticipants+1),
 		nil, []byte{})
@@ -153,7 +155,8 @@ func TestManager_buildMembership(t *testing.T) {
 func TestManager_buildMembership_MinParticipantsError(t *testing.T) {
 	m, _ := newTestManager(rand.New(rand.NewSource(42)), t)
 	memberIDs := make([]*id.ID, group.MinParticipants-1)
-	expectedErr := fmt.Sprintf(minMembersErr, len(memberIDs), group.MinParticipants)
+	expectedErr := fmt.Sprintf(
+		minMembersErr, len(memberIDs), group.MinParticipants)
 
 	_, _, err := m.buildMembership(memberIDs)
 	if err == nil || !strings.Contains(err.Error(), expectedErr) {
@@ -167,7 +170,8 @@ func TestManager_buildMembership_MinParticipantsError(t *testing.T) {
 func TestManager_buildMembership_MaxParticipantsError(t *testing.T) {
 	m, _ := newTestManager(rand.New(rand.NewSource(42)), t)
 	memberIDs := make([]*id.ID, group.MaxParticipants+1)
-	expectedErr := fmt.Sprintf(maxMembersErr, len(memberIDs), group.MaxParticipants)
+	expectedErr := fmt.Sprintf(
+		maxMembersErr, len(memberIDs), group.MaxParticipants)
 
 	_, _, err := m.buildMembership(memberIDs)
 	if err == nil || !strings.Contains(err.Error(), expectedErr) {
@@ -275,7 +279,8 @@ func TestRequestStatus_Message(t *testing.T) {
 
 // addPartners returns a list of user IDs and their matching membership and adds
 // them as partners.
-func addPartners(m *Manager, t *testing.T) ([]*id.ID, group.Membership, gs.DhKeyList) {
+func addPartners(m *Manager, t *testing.T) ([]*id.ID, group.Membership,
+	gs.DhKeyList) {
 	memberIDs := make([]*id.ID, 10)
 	members := group.Membership{m.gs.GetUser()}
 	dkl := gs.DhKeyList{}
diff --git a/groupChat/manager.go b/groupChat/manager.go
index 6691e54154e613678d3b50684aa333a63b9c1f64..92081c060859f180e08c34693d80668b159f3f60 100644
--- a/groupChat/manager.go
+++ b/groupChat/manager.go
@@ -79,7 +79,8 @@ func newManager(client *api.Client, userID *id.ID, userDhKey *cyclic.Int,
 	receiveFunc ReceiveCallback) (*Manager, error) {
 
 	// Load the group chat storage or create one if one does not exist
-	gStore, err := gs.NewOrLoadStore(kv, group.Member{ID: userID, DhKey: userDhKey})
+	gStore, err := gs.NewOrLoadStore(
+		kv, group.Member{ID: userID, DhKey: userDhKey})
 	if err != nil {
 		return nil, errors.Errorf(newGroupStoreErr, err)
 	}
diff --git a/groupChat/manager_test.go b/groupChat/manager_test.go
index 0ea0f5341018fac4a24e72b999603d2a93086ed2..ccb12a194b8c47c3561f3ec07a4b869b5e667571 100644
--- a/groupChat/manager_test.go
+++ b/groupChat/manager_test.go
@@ -31,7 +31,8 @@ func Test_newManager(t *testing.T) {
 	requestFunc := func(g gs.Group) { requestChan <- g }
 	receiveChan := make(chan MessageReceive)
 	receiveFunc := func(msg MessageReceive) { receiveChan <- msg }
-	m, err := newManager(nil, user.ID, user.DhKey, nil, nil, nil, nil, kv, requestFunc, receiveFunc)
+	m, err := newManager(nil, user.ID, user.DhKey, nil, nil, nil, nil, kv,
+		requestFunc, receiveFunc)
 	if err != nil {
 		t.Errorf("newManager() returned an error: %+v", err)
 	}
@@ -84,7 +85,8 @@ func Test_newManager_LoadStorage(t *testing.T) {
 		}
 	}
 
-	m, err := newManager(nil, user.ID, user.DhKey, nil, nil, nil, nil, kv, nil, nil)
+	m, err := newManager(
+		nil, user.ID, user.DhKey, nil, nil, nil, nil, kv, nil, nil)
 	if err != nil {
 		t.Errorf("newManager() returned an error: %+v", err)
 	}
@@ -271,7 +273,8 @@ func Test_newManager_LoadError(t *testing.T) {
 func TestManager_JoinGroup(t *testing.T) {
 	prng := rand.New(rand.NewSource(42))
 	m, _ := newTestManagerWithStore(prng, 10, 0, nil, nil, t)
-	g := newTestGroup(m.store.E2e().GetGroup(), m.store.GetUser().E2eDhPrivateKey, prng, t)
+	g := newTestGroup(
+		m.store.E2e().GetGroup(), m.store.GetUser().E2eDhPrivateKey, prng, t)
 
 	err := m.JoinGroup(g)
 	if err != nil {
diff --git a/groupChat/publicFormat_test.go b/groupChat/publicFormat_test.go
index 69884ff76856562e0d6f9ee3af03ad63e6eecb74..750a8057f41433bc53d5e8c211bf6e73e10f2a57 100644
--- a/groupChat/publicFormat_test.go
+++ b/groupChat/publicFormat_test.go
@@ -149,7 +149,8 @@ func Test_publicMsg_String(t *testing.T) {
 	}
 }
 
-// Happy path: tests that String returns the expected string for a nil publicMsg.
+// Happy path: tests that String returns the expected string for a nil
+// publicMsg.
 func Test_publicMsg_String_NilInternalMessage(t *testing.T) {
 	pm := publicMsg{}
 
diff --git a/groupChat/receive.go b/groupChat/receive.go
index 64cf10b789b3d07bf9d1dbd82d6d76b15c91fe53..78e448c3fccec9456f52cccf7ad3629096988432 100644
--- a/groupChat/receive.go
+++ b/groupChat/receive.go
@@ -69,7 +69,7 @@ func (m Manager) receive(rawMsgs chan message.Receive, stop *stoppable.Single) {
 }
 
 // readMessage returns the group, message ID, timestamp, sender ID, and message
-// of a group message. The encrypted group message data is unmarshaled from a
+// of a group message. The encrypted group message data is unmarshalled from a
 // cMix message in the message.Receive and then decrypted and the MAC is
 // verified. The group is found by finding the group with a matching key
 // fingerprint.
diff --git a/groupChat/receiveRequest.go b/groupChat/receiveRequest.go
index e5c7576f174f793d29ef337e092c96e4d782c371..76018cc4ae50ece4128510a0221013f9845b411d 100644
--- a/groupChat/receiveRequest.go
+++ b/groupChat/receiveRequest.go
@@ -26,7 +26,8 @@ const (
 
 // receiveRequest starts the group request reception worker that waits for new
 // group requests to arrive.
-func (m Manager) receiveRequest(rawMsgs chan message.Receive, stop *stoppable.Single) {
+func (m Manager) receiveRequest(rawMsgs chan message.Receive,
+	stop *stoppable.Single) {
 	jww.DEBUG.Print("Starting group message request reception worker.")
 
 	for {
diff --git a/groupChat/receive_test.go b/groupChat/receive_test.go
index 36ea8ed2dbad4c10630630f198d07d4b6a96bf54..26f3a680065095d05a6c2725e35be7862d8827be 100644
--- a/groupChat/receive_test.go
+++ b/groupChat/receive_test.go
@@ -131,7 +131,8 @@ func TestManager_receive_QuitChan(t *testing.T) {
 	}
 }
 
-// Tests that Manager.readMessage returns the message data for the correct group.
+// Tests that Manager.readMessage returns the message data for the correct
+// group.
 func TestManager_readMessage(t *testing.T) {
 	// Create new test Manager and Group
 	prng := rand.New(rand.NewSource(42))
@@ -206,7 +207,8 @@ func TestManager_readMessage_FindGroupKpError(t *testing.T) {
 	expectedTimestamp := netTime.Now()
 
 	// Create cMix message and get public message
-	cMixMsg, err := m.newCmixMsg(g, expectedContents, expectedTimestamp, g.Members[4], prng)
+	cMixMsg, err := m.newCmixMsg(
+		g, expectedContents, expectedTimestamp, g.Members[4], prng)
 	if err != nil {
 		t.Errorf("Failed to create new cMix message: %+v", err)
 	}
@@ -242,7 +244,8 @@ func TestManager_decryptMessage(t *testing.T) {
 	expectedTimestamp := netTime.Now()
 
 	// Create cMix message and get public message
-	msg, err := m.newCmixMsg(g, expectedContents, expectedTimestamp, g.Members[4], prng)
+	msg, err := m.newCmixMsg(
+		g, expectedContents, expectedTimestamp, g.Members[4], prng)
 	if err != nil {
 		t.Errorf("Failed to create new cMix message: %+v", err)
 	}
@@ -316,7 +319,7 @@ func TestManager_decryptMessage_GetCryptKeyError(t *testing.T) {
 }
 
 // Error path: an error is returned when the decrypted payload cannot be
-// unmarshaled.
+// unmarshalled.
 func TestManager_decryptMessage_UnmarshalInternalMsgError(t *testing.T) {
 	// Create new test Manager and Group
 	prng := rand.New(rand.NewSource(42))
@@ -338,11 +341,13 @@ func TestManager_decryptMessage_UnmarshalInternalMsgError(t *testing.T) {
 
 	// Modify publicMsg to have invalid payload
 	publicMsg = mapPublicMsg(publicMsg.Marshal()[:33])
-	key, err := group.NewKdfKey(g.Key, group.ComputeEpoch(timestamp), publicMsg.GetSalt())
+	key, err := group.NewKdfKey(
+		g.Key, group.ComputeEpoch(timestamp), publicMsg.GetSalt())
 	if err != nil {
 		t.Errorf("failed to create new key: %+v", err)
 	}
-	msg.SetMac(group.NewMAC(key, publicMsg.GetPayload(), g.DhKeys[*g.Members[4].ID]))
+	msg.SetMac(
+		group.NewMAC(key, publicMsg.GetPayload(), g.DhKeys[*g.Members[4].ID]))
 
 	// Check if error is correct
 	expectedErr := strings.SplitN(unmarshalInternalMsgErr, "%", 2)[0]
@@ -364,7 +369,8 @@ func Test_getCryptKey(t *testing.T) {
 	payload := []byte("payload")
 	ts := netTime.Now()
 
-	expectedKey, err := group.NewKdfKey(g.Key, group.ComputeEpoch(ts.Add(5*time.Minute)), salt)
+	expectedKey, err := group.NewKdfKey(
+		g.Key, group.ComputeEpoch(ts.Add(5*time.Minute)), salt)
 	if err != nil {
 		t.Errorf("failed to create new key: %+v", err)
 	}
diff --git a/groupChat/send.go b/groupChat/send.go
index cdb40888ee41c3489fe23f026c1f7e5d05f3caf6..ca25cfe604145224d12fd0651b7a0404375baee0 100644
--- a/groupChat/send.go
+++ b/groupChat/send.go
@@ -56,7 +56,8 @@ func (m *Manager) Send(groupID *id.ID, message []byte) (id.Round, error) {
 
 // createMessages generates a list of cMix messages and a list of corresponding
 // recipient IDs.
-func (m *Manager) createMessages(groupID *id.ID, msg []byte) (map[id.ID]format.Message, error) {
+func (m *Manager) createMessages(groupID *id.ID, msg []byte) (
+	map[id.ID]format.Message, error) {
 	timeNow := netTime.Now()
 
 	g, exists := m.gs.Get(groupID)
diff --git a/groupChat/sendRequests_test.go b/groupChat/sendRequests_test.go
index 56ca284fbc66cb78622388bd11d0454db3280bce..aa9339e5ee298b445c87023dd8c19ab1e0b7afdd 100644
--- a/groupChat/sendRequests_test.go
+++ b/groupChat/sendRequests_test.go
@@ -185,8 +185,8 @@ func TestManager_sendRequests_SendAllFail(t *testing.T) {
 	}
 }
 
-// Tests that Manager.sendRequests returns the correct status when some of the
-// sends fail.
+// Tests that Manager.sendRequests returns the correct status when some sends
+// fail.
 func TestManager_sendRequests_SendPartialSent(t *testing.T) {
 	prng := rand.New(rand.NewSource(42))
 	m, g := newTestManagerWithStore(prng, 10, 2, nil, nil, t)
diff --git a/groupChat/send_test.go b/groupChat/send_test.go
index 1db5cec791e7790bf519ab98030a088f423b076e..e9f794185429d91e544c8861cbb15660fa73ad56 100644
--- a/groupChat/send_test.go
+++ b/groupChat/send_test.go
@@ -136,7 +136,8 @@ func TestManager_Send_SendManyCMIXError(t *testing.T) {
 	}
 }
 
-// Tests that Manager.createMessages generates the messages for the correct group.
+// Tests that Manager.createMessages generates the messages for the correct
+// group.
 func TestManager_createMessages(t *testing.T) {
 	prng := rand.New(rand.NewSource(42))
 	m, g := newTestManagerWithStore(prng, 10, 0, nil, nil, t)
@@ -373,7 +374,8 @@ func TestGroup_newCmixMsg_SaltReaderError(t *testing.T) {
 	expectedErr := strings.SplitN(saltReadErr, "%", 2)[0]
 	m := &Manager{store: storage.InitTestingSession(t)}
 
-	_, err := m.newCmixMsg(gs.Group{}, []byte{}, time.Time{}, group.Member{}, strings.NewReader(""))
+	_, err := m.newCmixMsg(gs.Group{},
+		[]byte{}, time.Time{}, group.Member{}, strings.NewReader(""))
 	if err == nil || !strings.Contains(err.Error(), expectedErr) {
 		t.Errorf("newCmixMsg() failed to return the expected error"+
 			"\nexpected: %s\nreceived: %+v", expectedErr, err)
diff --git a/groupChat/utils_test.go b/groupChat/utils_test.go
index d43ada0dc827fcff5fe253d9d89189abf588f778..554a1d063ebce44b81fad9e323c640de14fbff09 100644
--- a/groupChat/utils_test.go
+++ b/groupChat/utils_test.go
@@ -101,7 +101,8 @@ func newTestManagerWithStore(rng *rand.Rand, numGroups int, sendErr int,
 }
 
 // getMembership returns a Membership with random members for testing.
-func getMembership(size int, uid *id.ID, pubKey *cyclic.Int, grp *cyclic.Group, prng *rand.Rand, t *testing.T) group.Membership {
+func getMembership(size int, uid *id.ID, pubKey *cyclic.Int, grp *cyclic.Group,
+	prng *rand.Rand, t *testing.T) group.Membership {
 	contacts := make([]contact.Contact, size)
 	for i := range contacts {
 		randId, _ := id.NewRandomID(prng, id.User)
@@ -123,7 +124,8 @@ func getMembership(size int, uid *id.ID, pubKey *cyclic.Int, grp *cyclic.Group,
 }
 
 // newTestGroup generates a new group with random values for testing.
-func newTestGroup(grp *cyclic.Group, privKey *cyclic.Int, rng *rand.Rand, t *testing.T) gs.Group {
+func newTestGroup(grp *cyclic.Group, privKey *cyclic.Int, rng *rand.Rand,
+	t *testing.T) gs.Group {
 	// Generate name from base 64 encoded random data
 	nameBytes := make([]byte, 16)
 	rng.Read(nameBytes)
@@ -137,7 +139,8 @@ func newTestGroup(grp *cyclic.Group, privKey *cyclic.Int, rng *rand.Rand, t *tes
 	membership := getMembership(10, id.NewIdFromString("userID", id.User, t),
 		randCycInt(rng), grp, rng, t)
 
-	dkl := gs.GenerateDhKeyList(id.NewIdFromString("userID", id.User, t), privKey, membership, grp)
+	dkl := gs.GenerateDhKeyList(
+		id.NewIdFromString("userID", id.User, t), privKey, membership, grp)
 
 	idPreimage, err := group.NewIdPreimage(rng)
 	if err != nil {
@@ -241,7 +244,8 @@ func (tnm *testNetworkManager) GetE2eMsg(i int) message.Send {
 	return tnm.e2eMessages[i]
 }
 
-func (tnm *testNetworkManager) SendE2E(msg message.Send, _ params.E2E, _ *stoppable.Single) ([]id.Round, e2e.MessageID, time.Time, error) {
+func (tnm *testNetworkManager) SendE2E(msg message.Send, _ params.E2E,
+	_ *stoppable.Single) ([]id.Round, e2e.MessageID, time.Time, error) {
 	tnm.Lock()
 	defer tnm.Unlock()
 
@@ -269,7 +273,8 @@ func (tnm *testNetworkManager) SendCMIX(format.Message, *id.ID, params.CMIX) (id
 	return 0, ephemeral.Id{}, nil
 }
 
-func (tnm *testNetworkManager) SendManyCMIX(messages map[id.ID]format.Message, _ params.CMIX) (id.Round, []ephemeral.Id, error) {
+func (tnm *testNetworkManager) SendManyCMIX(messages map[id.ID]format.Message,
+	_ params.CMIX) (id.Round, []ephemeral.Id, error) {
 	if tnm.sendErr == 1 {
 		return 0, nil, errors.New("SendManyCMIX error")
 	}
@@ -284,8 +289,8 @@ func (tnm *testNetworkManager) SendManyCMIX(messages map[id.ID]format.Message, _
 
 type dummyEventMgr struct{}
 
-func (d *dummyEventMgr) Report(p int, a, b, c string) {}
-func (t *testNetworkManager) GetEventManager() interfaces.EventManager {
+func (d *dummyEventMgr) Report(int, string, string, string) {}
+func (tnm *testNetworkManager) GetEventManager() interfaces.EventManager {
 	return &dummyEventMgr{}
 }