diff --git a/handlers/application/menuhandler_test.go b/handlers/application/menuhandler_test.go
index e8f7974..7afe790 100644
--- a/handlers/application/menuhandler_test.go
+++ b/handlers/application/menuhandler_test.go
@@ -623,9 +623,15 @@ func TestSaveGender(t *testing.T) {
 
 func TestSaveTemporaryPin(t *testing.T) {
 	sessionId := "session123"
-	ctx, store := InitializeTestStore(t)
+
+	ctx, userdatastore := InitializeTestStore(t)
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
 
+	_, logdb := InitializeTestLogdbStore(t)
+	logDb := store.LogDb{
+		Db: logdb,
+	}
+
 	fm, err := NewFlagManager(flagsPath)
 	if err != nil {
 		log.Fatal(err)
@@ -636,7 +642,8 @@ func TestSaveTemporaryPin(t *testing.T) {
 	// Create the MenuHandlers instance with the mock flag manager
 	h := &MenuHandlers{
 		flagManager:   fm,
-		userdataStore: store,
+		userdataStore: userdatastore,
+		logDb:         logDb,
 	}
 
 	// Define test cases
@@ -677,9 +684,15 @@ func TestSaveTemporaryPin(t *testing.T) {
 
 func TestCheckIdentifier(t *testing.T) {
 	sessionId := "session123"
-	ctx, store := InitializeTestStore(t)
+	ctx, userdatastore := InitializeTestStore(t)
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
 
+	_, logdb := InitializeTestLogdbStore(t)
+
+	logDb := store.LogDb{
+		Db: logdb,
+	}
+
 	// Define test cases
 	tests := []struct {
 		name            string
@@ -699,14 +712,15 @@ func TestCheckIdentifier(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			err := store.WriteEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY, []byte(tt.publicKey))
+			err := userdatastore.WriteEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY, []byte(tt.publicKey))
 			if err != nil {
 				t.Fatal(err)
 			}
 
 			// Create the MenuHandlers instance with the mock store
 			h := &MenuHandlers{
-				userdataStore: store,
+				userdataStore: userdatastore,
+				logDb:         logDb,
 			}
 
 			// Call the method