diff --git a/e2e/e2eMessageBuffer_test.go b/e2e/e2eMessageBuffer_test.go
index b10433dac17a2f72b7b71bfb6903e5c6731f0a26..37826cfcff8dee48b705ad4f0efa7b2bd83bd6ac 100644
--- a/e2e/e2eMessageBuffer_test.go
+++ b/e2e/e2eMessageBuffer_test.go
@@ -23,7 +23,7 @@ import (
 func TestE2EMessageHandler_SaveMessage(t *testing.T) {
 	// Set up test values
 	emg := &e2eMessageHandler{}
-	kv := versioned.NewKV(make(ekv.Memstore))
+	kv := versioned.NewKV(ekv.MakeMemstore())
 	testMsgs := makeTestE2EMessages(10, t)
 
 	for _, msg := range testMsgs {
@@ -60,7 +60,7 @@ func TestE2EMessageHandler_SaveMessage(t *testing.T) {
 func TestE2EMessageHandler_LoadMessage(t *testing.T) {
 	// Set up test values
 	cmh := &e2eMessageHandler{}
-	kv := versioned.NewKV(make(ekv.Memstore))
+	kv := versioned.NewKV(ekv.MakeMemstore())
 	testMsgs := makeTestE2EMessages(10, t)
 
 	for _, msg := range testMsgs {
@@ -96,7 +96,7 @@ func TestE2EMessageHandler_LoadMessage(t *testing.T) {
 func TestE2EMessageHandler_Smoke(t *testing.T) {
 	// Set up test messages
 	testMsgs := makeTestE2EMessages(2, t)
-	kv := versioned.NewKV(make(ekv.Memstore))
+	kv := versioned.NewKV(ekv.MakeMemstore())
 	// Create new buffer
 	cmb, err := NewOrLoadE2eMessageBuffer(kv, "testKey")
 	if err != nil {
@@ -178,7 +178,7 @@ func TestE2EParamMarshalUnmarshal(t *testing.T) {
 		Payload:     []byte{1, 2, 3, 4, 5, 6, 7, 8, 9},
 		MessageType: 42,
 		Params: Params{
-			CMIX: cmix.CMIXParams{
+			CMIXParams: cmix.CMIXParams{
 				RoundTries:       6,
 				Timeout:          99,
 				RetryDelay:       -4,
diff --git a/e2e/utils_test.go b/e2e/utils_test.go
index 7a71a84091e80cbaaed1e30b7a0f531a63c828a2..2dbd52c26f4cdbf222df26721defbff1604cc3bb 100644
--- a/e2e/utils_test.go
+++ b/e2e/utils_test.go
@@ -113,6 +113,11 @@ type mockCmixNet struct {
 	instance         *network.Instance
 }
 
+func (m mockCmixNet) Connect(ndf *ndf.NetworkDefinition) error {
+	// TODO implement me
+	panic("implement me")
+}
+
 func (m mockCmixNet) Follow(report cmix.ClientErrorReport) (stoppable.Stoppable, error) {
 	//TODO implement me
 	return nil, nil