diff --git a/server/api_test.go b/server/api_test.go
index 89c9fc5b7..5e9d5cff9 100644
--- a/server/api_test.go
+++ b/server/api_test.go
@@ -171,8 +171,8 @@ func NewConsoleLogger(output *os.File, verbose bool) *zap.Logger {
 }
 
 func NewDB(t *testing.T) *sql.DB {
-	//dbUrl := "postgresql://postgres@127.0.0.1:5432/nakama?sslmode=disable"
-	dbUrl := "postgresql://root@127.0.0.1:26257/nakama?sslmode=disable"
+	dbUrl := "postgresql://postgres@127.0.0.1:5432/nakama?sslmode=disable"
+	// dbUrl := "postgresql://root@127.0.0.1:26257/nakama?sslmode=disable"
 	if dbUrlEnv := os.Getenv("TEST_DB_URL"); len(dbUrlEnv) > 0 {
 		dbUrl = dbUrlEnv
 	}
diff --git a/server/core_friend_test.go b/server/core_friend_test.go
index 78fbaf47d..aac7da595 100644
--- a/server/core_friend_test.go
+++ b/server/core_friend_test.go
@@ -50,48 +50,48 @@ func TestServer_ListFriendsOfFriends(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if _, err := addFriend(ctx, logger, tx, uid, uidA1.String()); err != nil {
+	if _, err := addFriend(ctx, logger, tx, uid, uidA1.String(), ""); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := addFriend(ctx, logger, tx, uidA1, uid.String()); err != nil {
+	if _, err := addFriend(ctx, logger, tx, uidA1, uid.String(), ""); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := addFriend(ctx, logger, tx, uidA1, uidA2.String()); err != nil {
+	if _, err := addFriend(ctx, logger, tx, uidA1, uidA2.String(), ""); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := addFriend(ctx, logger, tx, uidA2, uidA1.String()); err != nil {
+	if _, err := addFriend(ctx, logger, tx, uidA2, uidA1.String(), ""); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := addFriend(ctx, logger, tx, uidA1, uidA3.String()); err != nil {
+	if _, err := addFriend(ctx, logger, tx, uidA1, uidA3.String(), ""); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := addFriend(ctx, logger, tx, uidA3, uidA1.String()); err != nil {
+	if _, err := addFriend(ctx, logger, tx, uidA3, uidA1.String(), ""); err != nil {
 		t.Fatal(err)
 	}
 
-	if _, err := addFriend(ctx, logger, tx, uid, uidB1.String()); err != nil {
+	if _, err := addFriend(ctx, logger, tx, uid, uidB1.String(), ""); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := addFriend(ctx, logger, tx, uidB1, uid.String()); err != nil {
+	if _, err := addFriend(ctx, logger, tx, uidB1, uid.String(), ""); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := addFriend(ctx, logger, tx, uidB1, uidB2.String()); err != nil {
+	if _, err := addFriend(ctx, logger, tx, uidB1, uidB2.String(), ""); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := addFriend(ctx, logger, tx, uidB2, uidB1.String()); err != nil {
+	if _, err := addFriend(ctx, logger, tx, uidB2, uidB1.String(), ""); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := addFriend(ctx, logger, tx, uidB1, uidB3.String()); err != nil {
+	if _, err := addFriend(ctx, logger, tx, uidB1, uidB3.String(), ""); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := addFriend(ctx, logger, tx, uidB3, uidB1.String()); err != nil {
+	if _, err := addFriend(ctx, logger, tx, uidB3, uidB1.String(), ""); err != nil {
 		t.Fatal(err)
 	}
 
-	if _, err := addFriend(ctx, logger, tx, uid, uidB3.String()); err != nil {
+	if _, err := addFriend(ctx, logger, tx, uid, uidB3.String(), ""); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := addFriend(ctx, logger, tx, uidB3, uid.String()); err != nil {
+	if _, err := addFriend(ctx, logger, tx, uidB3, uid.String(), ""); err != nil {
 		t.Fatal(err)
 	}