diff --git a/auth/confirm.go b/auth/confirm.go
index c4bdf8a225bf8ad0863293ea2c23de73459d1c45..57b230e171fe1356aa048a23b3ada37bdff0944e 100644
--- a/auth/confirm.go
+++ b/auth/confirm.go
@@ -41,9 +41,8 @@ func ConfirmRequestAuth(partner contact.Contact, rng io.Reader,
 	// verify the passed contact matches what is stored
 	if storedContact.DhPubKey.Cmp(partner.DhPubKey) != 0 {
 		storage.Auth().Fail(partner.ID)
-		return errors.Errorf("Pending Auth Request has different "+
-			"pubkey than stored",
-			err)
+		return errors.WithMessage(err, "Pending Auth Request has different "+
+			"pubkey than stored")
 	}
 
 	grp := storage.E2e().GetGroup()
diff --git a/bindings/client.go b/bindings/client.go
index 20bf4cd8c0134a086b7a1bc9e7a4382c15f6b54a..7a8a6779735320d5c201c4695d1a9940835b071c 100644
--- a/bindings/client.go
+++ b/bindings/client.go
@@ -17,11 +17,10 @@ import (
 	"gitlab.com/elixxir/client/interfaces/message"
 	"gitlab.com/elixxir/client/interfaces/utility"
 	"gitlab.com/elixxir/comms/mixmessages"
+	ds "gitlab.com/elixxir/comms/network/dataStructures"
 	"gitlab.com/elixxir/primitives/states"
 	"gitlab.com/xx_network/primitives/id"
 	"time"
-	ds "gitlab.com/elixxir/comms/network/dataStructures"
-
 )
 
 // BindingsClient wraps the api.Client, implementing additional functions
diff --git a/interfaces/contact/factList.go b/interfaces/contact/factList.go
index 7db95d0c51eb2ed6a5b46fdef3aba85b9f1d7ede..f875af67216028f656f68c02e6b1a5892e812dd6 100644
--- a/interfaces/contact/factList.go
+++ b/interfaces/contact/factList.go
@@ -2,8 +2,8 @@ package contact
 
 import (
 	"github.com/pkg/errors"
-	"strings"
 	jww "github.com/spf13/jwalterweatherman"
+	"strings"
 )
 
 type FactList []Fact
diff --git a/interfaces/params/CMIX_test.go b/interfaces/params/CMIX_test.go
index 70f29070745a8d9dd04d03c7c6f2034fd85685c7..9b0a3bdffd9465a3181975632c9b4e939df443ae 100644
--- a/interfaces/params/CMIX_test.go
+++ b/interfaces/params/CMIX_test.go
@@ -7,7 +7,7 @@ import (
 
 func TestGetDefaultCMIX(t *testing.T) {
 	c := GetDefaultCMIX()
-	if c.RoundTries != 3 || c.Timeout != 10*time.Second {
+	if c.RoundTries != 3 || c.Timeout != 25*time.Second {
 		t.Errorf("GetDefaultCMIX did not return expected values")
 	}
 }
diff --git a/storage/auth/store.go b/storage/auth/store.go
index 01bb85631b28dd3914ffbf2f43f6bba694b175eb..dde9c5c58fee21ae84c717354c45e2b1208ca37b 100644
--- a/storage/auth/store.go
+++ b/storage/auth/store.go
@@ -325,7 +325,7 @@ func (s *Store) GetRequest(partner *id.ID) (RequestType, *SentRequest, contact.C
 		return Receive, nil, *r.receive, nil
 	default:
 		return 0, nil, contact.Contact{},
-			errors.Errorf("invalid Type: %s", r.rt)
+			errors.Errorf("invalid Type: %d", r.rt)
 	}
 }
 
diff --git a/storage/e2e/store.go b/storage/e2e/store.go
index 20d843a604dc6895e2d298038c7fe0078bf621b5..ee6cacbf3193aeb83f89d4301406f45eaed3fa15 100644
--- a/storage/e2e/store.go
+++ b/storage/e2e/store.go
@@ -110,7 +110,8 @@ func LoadStore(kv *versioned.KV, myID *id.ID, rng *fastRNG.StreamGenerator) (*St
 
 		fingerprints: &fingerprints,
 
-		kv: kv,
+		kv:  kv,
+		grp: grp,
 
 		context: &context{
 			fa:   &fingerprints,