diff --git a/internal/handler/contact_test.go b/internal/handler/contact_test.go
index 298260e..1ee4388 100644
--- a/internal/handler/contact_test.go
+++ b/internal/handler/contact_test.go
@@ -54,7 +54,7 @@ func TestGetContactWithMock(t *testing.T) {
 	mockstore := mock.NewMockContactStore()
 	testUserId := uuid.New()
 
-	testCon := contact.Contact{PhoneNumber: "+12335403383", UserId: testUserId}
+	testCon := contact.Contact{PhoneNumber: "+12335403383", UserId: &testUserId}
 	ctx := t.Context()
 	if err := mockstore.CreateContact(ctx, &testCon); err != nil {
 		assert.NoError(t, err, "Error creating contact")
diff --git a/internal/handler/message_event_response_test.go b/internal/handler/message_event_response_test.go
index 5420999..210099e 100644
--- a/internal/handler/message_event_response_test.go
+++ b/internal/handler/message_event_response_test.go
@@ -51,7 +51,7 @@ func TestRecordMessageEventResponseWithMock(t *testing.T) {
 	}
 
 	event.MessageId = msg.Id
-	event.RecipientId = con.Id
+	event.RecipientId = *con.Id
 	event.ScheduledMessageId = schMsg.Id
 	if err := mockStore.CreateScheduledMessageEvent(ctx, &event); err != nil {
 		assert.NoError(t, err, "Error creating scheduled message event: %v", err)
diff --git a/internal/handler/schedule_message_status_test.go b/internal/handler/schedule_message_status_test.go
index 93240ea..10dcbe4 100644
--- a/internal/handler/schedule_message_status_test.go
+++ b/internal/handler/schedule_message_status_test.go
@@ -32,7 +32,7 @@ func TestUpdateScheduledMessageStatusWithMock(t *testing.T) {
 	con := testContact(recipientId, testUserId)
 	msg := testMessage(messageId, testUserId)
 	schMsg := testScheduledMessage(scheduledMessageId, testUserId, now)
-	event := testScheduledMessageEvent(msg.Id, con.Id, schMsg.Id)
+	event := testScheduledMessageEvent(msg.Id, *con.Id, schMsg.Id)
 
 	ctx := t.Context()
 
diff --git a/internal/handler/scheduled_message_event_test.go b/internal/handler/scheduled_message_event_test.go
index 13d6047..56fed9f 100644
--- a/internal/handler/scheduled_message_event_test.go
+++ b/internal/handler/scheduled_message_event_test.go
@@ -104,7 +104,7 @@ func TestGetScheduledMessageEventWithMock(t *testing.T) {
 	con := testContact(recipientId, testUserId)
 	msg := testMessage(messageId, testUserId)
 	schMsg := testScheduledMessage(scheduledMessageId, testUserId, now)
-	event := testScheduledMessageEvent(msg.Id, con.Id, schMsg.Id)
+	event := testScheduledMessageEvent(msg.Id, *con.Id, schMsg.Id)
 
 	ctx := t.Context()
 
@@ -150,7 +150,7 @@ func TestDeleteScheduledMessageEventWithMock(t *testing.T) {
 	con := testContact(recipientId, testUserId)
 	msg := testMessage(messageId, testUserId)
 	schMsg := testScheduledMessage(scheduledMessageId, testUserId, now)
-	event := testScheduledMessageEvent(msg.Id, con.Id, schMsg.Id)
+	event := testScheduledMessageEvent(msg.Id, *con.Id, schMsg.Id)
 
 	ctx := t.Context()
 
@@ -185,9 +185,10 @@ func TestDeleteScheduledMessageEventWithMock(t *testing.T) {
 
 func testContact(id uuid.UUID, userId uuid.UUID) contact.Contact {
 	if id == uuid.Nil {
-		return contact.Contact{Id: uuid.New(), PhoneNumber: "+10123456789", UserId: userId}
+		id = uuid.New()
+		return contact.Contact{Id: &id, PhoneNumber: "+10123456789", UserId: &userId}
 	} else {
-		return contact.Contact{Id: id, PhoneNumber: "+10123456789", UserId: userId}
+		return contact.Contact{Id: &id, PhoneNumber: "+10123456789", UserId: &userId}
 	}
 }
 
diff --git a/internal/handler/scheduled_message_test.go b/internal/handler/scheduled_message_test.go
index 026acb7..b3ca5c3 100644
--- a/internal/handler/scheduled_message_test.go
+++ b/internal/handler/scheduled_message_test.go
@@ -97,7 +97,7 @@ func TestFetchScheduledMessageWithMock(t *testing.T) {
 	con := testContact(recipientId, testUserId)
 	msg := testMessage(messageId, testUserId)
 	schMsg := testScheduledMessage(scheduledMessageId, testUserId, now)
-	event := testScheduledMessageEvent(msg.Id, con.Id, schMsg.Id)
+	event := testScheduledMessageEvent(msg.Id, *con.Id, schMsg.Id)
 
 	ctx := t.Context()