diff --git a/e2e/parse/firstMessagePart_test.go b/e2e/parse/firstMessagePart_test.go
index d1459191cf165ebaeb2e2248105097a57e3ece1c..05d9adf3989edb4d52c0ac164d32a86b33311407 100644
--- a/e2e/parse/firstMessagePart_test.go
+++ b/e2e/parse/firstMessagePart_test.go
@@ -9,10 +9,11 @@ package parse
 
 import (
 	"bytes"
-	"gitlab.com/elixxir/client/catalog"
 	"reflect"
 	"testing"
 	"time"
+
+	"gitlab.com/elixxir/client/catalog"
 )
 
 // Expected firstMessagePart for checking against, generated by fmp in
@@ -36,12 +37,14 @@ var expectedFMP = firstMessagePart{
 
 // Test that newFirstMessagePart returns a correctly made firstMessagePart.
 func Test_newFirstMessagePart(t *testing.T) {
+	testStr := []byte{'t', 'e', 's', 't', 'i', 'n', 'g', 's', 't', 'r', 'i', 'n', 'g'}
 	fmp := newFirstMessagePart(
 		catalog.XxMessage,
 		1077,
 		2,
 		time.Unix(1609786229, 0).UTC(),
-		[]byte{'t', 'e', 's', 't', 'i', 'n', 'g', 's', 't', 'r', 'i', 'n', 'g'},
+		testStr,
+		len(testStr),
 	)
 
 	gotTime := fmp.getTimestamp()
diff --git a/e2e/parse/messagePart_test.go b/e2e/parse/messagePart_test.go
index 93c1bb83df372fcd456822bf7b984d8bb47ff937..a25ddb4743a5d834605c2a559cc98dc7621461eb 100644
--- a/e2e/parse/messagePart_test.go
+++ b/e2e/parse/messagePart_test.go
@@ -26,7 +26,8 @@ var expectedMP = messagePart{
 
 // Tests that a new function part is successfully created.
 func Test_newMessagePart(t *testing.T) {
-	goTmp := newMessagePart(32, 6, []byte{'t', 'e', 's', 't', 'i', 'n', 'g'})
+	testStr := []byte{'t', 'e', 's', 't', 'i', 'n', 'g'}
+	goTmp := newMessagePart(32, 6, testStr, len(testStr))
 	if !reflect.DeepEqual(goTmp, expectedMP) {
 		t.Errorf("MessagePart received and MessagePart expected do not match."+
 			"\nexpected: %#v\nreceived: %#v", expectedMP, goTmp)
diff --git a/e2e/parse/partition_test.go b/e2e/parse/partition_test.go
index e8440ef1a6f62b34ec4ef6a7378c56218157a88c..db05ccfbf0f04f382c60004357fd2208e2793d62 100644
--- a/e2e/parse/partition_test.go
+++ b/e2e/parse/partition_test.go
@@ -8,12 +8,13 @@
 package parse
 
 import (
+	"testing"
+
 	"gitlab.com/elixxir/client/catalog"
 	"gitlab.com/elixxir/client/storage/versioned"
 	"gitlab.com/elixxir/ekv"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/netTime"
-	"testing"
 )
 
 var ipsumTestStr = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras sit amet euismod est. Donec dolor " +
@@ -68,8 +69,8 @@ func TestPartitioner_Partition(t *testing.T) {
 
 // Test that Partitioner.HandlePartition can handle a message part.
 func TestPartitioner_HandlePartition(t *testing.T) {
-	p := NewPartitioner(versioned.NewKV(ekv.MakeMemstore()), len(ipsumTestStr))
-	m := newMessagePart(1107, 1, []byte(ipsumTestStr))
+	p := NewPartitioner(versioned.NewKV(ekv.MakeMemstore()), 256)
+	m := newMessagePart(1107, 1, []byte(ipsumTestStr), 256)
 
 	_, _ = p.HandlePartition(
 		&id.DummyUser,
@@ -80,9 +81,9 @@ func TestPartitioner_HandlePartition(t *testing.T) {
 
 // Test that HandlePartition can handle a first message part
 func TestPartitioner_HandleFirstPartition(t *testing.T) {
-	p := NewPartitioner(versioned.NewKV(ekv.MakeMemstore()), len(ipsumTestStr))
+	p := NewPartitioner(versioned.NewKV(ekv.MakeMemstore()), 256)
 	m := newFirstMessagePart(
-		catalog.XxMessage, 1107, 1, netTime.Now(), []byte(ipsumTestStr))
+		catalog.XxMessage, 1107, 1, netTime.Now(), []byte(ipsumTestStr), 256)
 
 	_, _ = p.HandlePartition(
 		&id.DummyUser,