diff --git a/server/channelserver/repo_character_test.go b/server/channelserver/repo_character_test.go
index 4fc579b2e..52ebdd780 100644
--- a/server/channelserver/repo_character_test.go
+++ b/server/channelserver/repo_character_test.go
@@ -579,3 +579,49 @@ func TestFindByRastaID(t *testing.T) {
 		t.Errorf("Expected 'RepoChar', got: %q", gotName)
 	}
 }
+
+func TestLoadSaveData(t *testing.T) {
+	repo, _, charID := setupCharRepo(t)
+
+	id, savedata, isNew, name, err := repo.LoadSaveData(charID)
+	if err != nil {
+		t.Fatalf("LoadSaveData failed: %v", err)
+	}
+	if id != charID {
+		t.Errorf("Expected charID %d, got: %d", charID, id)
+	}
+	if name != "RepoChar" {
+		t.Errorf("Expected name 'RepoChar', got: %q", name)
+	}
+	if isNew {
+		t.Error("Expected is_new_character=false")
+	}
+	if savedata == nil {
+		t.Error("Expected non-nil savedata")
+	}
+}
+
+func TestLoadSaveDataNewCharacter(t *testing.T) {
+	repo, db, charID := setupCharRepo(t)
+
+	if _, err := db.Exec("UPDATE characters SET is_new_character=true WHERE id=$1", charID); err != nil {
+		t.Fatalf("Setup failed: %v", err)
+	}
+
+	_, _, isNew, _, err := repo.LoadSaveData(charID)
+	if err != nil {
+		t.Fatalf("LoadSaveData failed: %v", err)
+	}
+	if !isNew {
+		t.Error("Expected is_new_character=true")
+	}
+}
+
+func TestLoadSaveDataNotFound(t *testing.T) {
+	repo, _, _ := setupCharRepo(t)
+
+	_, _, _, _, err := repo.LoadSaveData(999999)
+	if err == nil {
+		t.Fatal("Expected error for non-existent character")
+	}
+}
diff --git a/server/channelserver/repo_event_test.go b/server/channelserver/repo_event_test.go
new file mode 100644
index 000000000..0c8b60499
--- /dev/null
+++ b/server/channelserver/repo_event_test.go
@@ -0,0 +1,166 @@
+package channelserver
+
+import (
+	"testing"
+	"time"
+
+	"github.com/jmoiron/sqlx"
+)
+
+func setupEventRepo(t *testing.T) (*EventRepository, *sqlx.DB) {
+	t.Helper()
+	db := SetupTestDB(t)
+	repo := NewEventRepository(db)
+	t.Cleanup(func() { TeardownTestDB(t, db) })
+	return repo, db
+}
+
+func insertEventQuest(t *testing.T, db *sqlx.DB, questType, questID int, startTime time.Time, activeDays, inactiveDays int) uint32 {
+	t.Helper()
+	var id uint32
+	err := db.QueryRow(
+		`INSERT INTO event_quests (quest_type, quest_id, start_time, active_days, inactive_days)
+		 VALUES ($1, $2, $3, $4, $5) RETURNING id`,
+		questType, questID, startTime, activeDays, inactiveDays,
+	).Scan(&id)
+	if err != nil {
+		t.Fatalf("Failed to insert event quest: %v", err)
+	}
+	return id
+}
+
+func TestGetEventQuestsEmpty(t *testing.T) {
+	repo, _ := setupEventRepo(t)
+
+	rows, err := repo.GetEventQuests()
+	if err != nil {
+		t.Fatalf("GetEventQuests failed: %v", err)
+	}
+	defer rows.Close()
+
+	if rows.Next() {
+		t.Error("Expected no rows for empty event_quests table")
+	}
+}
+
+func TestGetEventQuestsReturnsRows(t *testing.T) {
+	repo, db := setupEventRepo(t)
+
+	now := time.Now().Truncate(time.Microsecond)
+	insertEventQuest(t, db, 1, 100, now, 0, 0)
+	insertEventQuest(t, db, 2, 200, now, 7, 3)
+
+	rows, err := repo.GetEventQuests()
+	if err != nil {
+		t.Fatalf("GetEventQuests failed: %v", err)
+	}
+	defer rows.Close()
+
+	count := 0
+	for rows.Next() {
+		var id, mark uint32
+		var questID, flags, activeDays, inactiveDays int
+		var maxPlayers, questType uint8
+		var startTime time.Time
+		if err := rows.Scan(&id, &maxPlayers, &questType, &questID, &mark, &flags, &startTime, &activeDays, &inactiveDays); err != nil {
+			t.Fatalf("Scan failed: %v", err)
+		}
+		count++
+	}
+	if count != 2 {
+		t.Errorf("Expected 2 rows, got: %d", count)
+	}
+}
+
+func TestGetEventQuestsOrderByQuestID(t *testing.T) {
+	repo, db := setupEventRepo(t)
+
+	now := time.Now().Truncate(time.Microsecond)
+	insertEventQuest(t, db, 1, 300, now, 0, 0)
+	insertEventQuest(t, db, 1, 100, now, 0, 0)
+	insertEventQuest(t, db, 1, 200, now, 0, 0)
+
+	rows, err := repo.GetEventQuests()
+	if err != nil {
+		t.Fatalf("GetEventQuests failed: %v", err)
+	}
+	defer rows.Close()
+
+	var questIDs []int
+	for rows.Next() {
+		var id, mark uint32
+		var questID, flags, activeDays, inactiveDays int
+		var maxPlayers, questType uint8
+		var startTime time.Time
+		if err := rows.Scan(&id, &maxPlayers, &questType, &questID, &mark, &flags, &startTime, &activeDays, &inactiveDays); err != nil {
+			t.Fatalf("Scan failed: %v", err)
+		}
+		questIDs = append(questIDs, questID)
+	}
+	if len(questIDs) != 3 || questIDs[0] != 100 || questIDs[1] != 200 || questIDs[2] != 300 {
+		t.Errorf("Expected quest IDs [100, 200, 300], got: %v", questIDs)
+	}
+}
+
+func TestBeginTxAndUpdateEventQuestStartTime(t *testing.T) {
+	repo, db := setupEventRepo(t)
+
+	originalTime := time.Date(2025, 1, 1, 12, 0, 0, 0, time.UTC)
+	questID := insertEventQuest(t, db, 1, 100, originalTime, 7, 3)
+
+	newTime := time.Date(2025, 6, 15, 12, 0, 0, 0, time.UTC)
+
+	tx, err := repo.BeginTx()
+	if err != nil {
+		t.Fatalf("BeginTx failed: %v", err)
+	}
+
+	if err := repo.UpdateEventQuestStartTime(tx, questID, newTime); err != nil {
+		_ = tx.Rollback()
+		t.Fatalf("UpdateEventQuestStartTime failed: %v", err)
+	}
+
+	if err := tx.Commit(); err != nil {
+		t.Fatalf("Commit failed: %v", err)
+	}
+
+	// Verify the update
+	var got time.Time
+	if err := db.QueryRow("SELECT start_time FROM event_quests WHERE id=$1", questID).Scan(&got); err != nil {
+		t.Fatalf("Verification query failed: %v", err)
+	}
+	if !got.Equal(newTime) {
+		t.Errorf("Expected start_time %v, got: %v", newTime, got)
+	}
+}
+
+func TestUpdateEventQuestStartTimeRollback(t *testing.T) {
+	repo, db := setupEventRepo(t)
+
+	originalTime := time.Date(2025, 1, 1, 12, 0, 0, 0, time.UTC)
+	questID := insertEventQuest(t, db, 1, 100, originalTime, 0, 0)
+
+	tx, err := repo.BeginTx()
+	if err != nil {
+		t.Fatalf("BeginTx failed: %v", err)
+	}
+
+	newTime := time.Date(2025, 6, 15, 12, 0, 0, 0, time.UTC)
+	if err := repo.UpdateEventQuestStartTime(tx, questID, newTime); err != nil {
+		t.Fatalf("UpdateEventQuestStartTime failed: %v", err)
+	}
+
+	// Rollback instead of commit
+	if err := tx.Rollback(); err != nil {
+		t.Fatalf("Rollback failed: %v", err)
+	}
+
+	// Verify original time is preserved
+	var got time.Time
+	if err := db.QueryRow("SELECT start_time FROM event_quests WHERE id=$1", questID).Scan(&got); err != nil {
+		t.Fatalf("Verification query failed: %v", err)
+	}
+	if !got.Equal(originalTime) {
+		t.Errorf("Expected original start_time %v after rollback, got: %v", originalTime, got)
+	}
+}
diff --git a/server/channelserver/repo_user_test.go b/server/channelserver/repo_user_test.go
new file mode 100644
index 000000000..5a95e815c
--- /dev/null
+++ b/server/channelserver/repo_user_test.go
@@ -0,0 +1,110 @@
+package channelserver
+
+import (
+	"database/sql"
+	"testing"
+	"time"
+
+	"github.com/jmoiron/sqlx"
+)
+
+func setupUserRepo(t *testing.T) (*UserRepository, *sqlx.DB, uint32) {
+	t.Helper()
+	db := SetupTestDB(t)
+	userID := CreateTestUser(t, db, "user_repo_test")
+	repo := NewUserRepository(db)
+	t.Cleanup(func() { TeardownTestDB(t, db) })
+	return repo, db, userID
+}
+
+func TestBanUserPermanent(t *testing.T) {
+	repo, db, userID := setupUserRepo(t)
+
+	if err := repo.BanUser(userID, nil); err != nil {
+		t.Fatalf("BanUser (permanent) failed: %v", err)
+	}
+
+	// Verify ban exists with NULL expires
+	var gotUserID uint32
+	var expires sql.NullTime
+	err := db.QueryRow("SELECT user_id, expires FROM bans WHERE user_id=$1", userID).Scan(&gotUserID, &expires)
+	if err != nil {
+		t.Fatalf("Verification query failed: %v", err)
+	}
+	if gotUserID != userID {
+		t.Errorf("Expected user_id %d, got: %d", userID, gotUserID)
+	}
+	if expires.Valid {
+		t.Errorf("Expected NULL expires for permanent ban, got: %v", expires.Time)
+	}
+}
+
+func TestBanUserTemporary(t *testing.T) {
+	repo, db, userID := setupUserRepo(t)
+
+	expiry := time.Now().Add(24 * time.Hour).Truncate(time.Microsecond)
+	if err := repo.BanUser(userID, &expiry); err != nil {
+		t.Fatalf("BanUser (temporary) failed: %v", err)
+	}
+
+	var gotUserID uint32
+	var got time.Time
+	err := db.QueryRow("SELECT user_id, expires FROM bans WHERE user_id=$1", userID).Scan(&gotUserID, &got)
+	if err != nil {
+		t.Fatalf("Verification query failed: %v", err)
+	}
+	if gotUserID != userID {
+		t.Errorf("Expected user_id %d, got: %d", userID, gotUserID)
+	}
+	if !got.Equal(expiry) {
+		t.Errorf("Expected expires %v, got: %v", expiry, got)
+	}
+}
+
+func TestBanUserUpsertPermanentToTemporary(t *testing.T) {
+	repo, db, userID := setupUserRepo(t)
+
+	// First: permanent ban
+	if err := repo.BanUser(userID, nil); err != nil {
+		t.Fatalf("BanUser (permanent) failed: %v", err)
+	}
+
+	// Upsert: change to temporary
+	expiry := time.Now().Add(1 * time.Hour).Truncate(time.Microsecond)
+	if err := repo.BanUser(userID, &expiry); err != nil {
+		t.Fatalf("BanUser (upsert to temporary) failed: %v", err)
+	}
+
+	var got time.Time
+	err := db.QueryRow("SELECT expires FROM bans WHERE user_id=$1", userID).Scan(&got)
+	if err != nil {
+		t.Fatalf("Verification query failed: %v", err)
+	}
+	if !got.Equal(expiry) {
+		t.Errorf("Expected expires %v after upsert, got: %v", expiry, got)
+	}
+}
+
+func TestBanUserUpsertTemporaryToPermanent(t *testing.T) {
+	repo, db, userID := setupUserRepo(t)
+
+	// First: temporary ban
+	expiry := time.Now().Add(1 * time.Hour).Truncate(time.Microsecond)
+	if err := repo.BanUser(userID, &expiry); err != nil {
+		t.Fatalf("BanUser (temporary) failed: %v", err)
+	}
+
+	// Upsert: change to permanent
+	if err := repo.BanUser(userID, nil); err != nil {
+		t.Fatalf("BanUser (upsert to permanent) failed: %v", err)
+	}
+
+	var expires sql.NullTime
+	err := db.QueryRow("SELECT expires FROM bans WHERE user_id=$1", userID).Scan(&expires)
+	if err != nil {
+		t.Fatalf("Verification query failed: %v", err)
+	}
+	if expires.Valid {
+		t.Errorf("Expected NULL expires after upsert to permanent, got: %v", expires.Time)
+	}
+}