diff --git a/tests/Feature/SocialAccountModelTest.php b/tests/Feature/SocialAccountModelTest.php
index e588cfc4..d28bbf70 100644
--- a/tests/Feature/SocialAccountModelTest.php
+++ b/tests/Feature/SocialAccountModelTest.php
@@ -4,20 +4,27 @@
 
 use App\Enums\Notification\Type;
 use App\Enums\SocialAccount\Status;
+use App\Events\NotificationCreated;
 use App\Jobs\SendNotification;
+use App\Mail\AccountDisconnected;
+use App\Models\Notification;
 use App\Models\SocialAccount;
 use App\Models\User;
 use App\Models\Workspace;
+use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Queue;
 
 beforeEach(function () {
-    Queue::fake();
-
     $this->owner = User::factory()->create();
     $this->workspace = Workspace::factory()->create(['user_id' => $this->owner->id]);
 });
 
+// ---- markAsTokenExpired ----
+
 test('markAsTokenExpired updates status and dispatches notification when transitioning from connected', function () {
+    Queue::fake();
+
     $account = SocialAccount::factory()->x()->create([
         'workspace_id' => $this->workspace->id,
         'status' => Status::Connected,
@@ -37,6 +44,8 @@
 });
 
 test('markAsTokenExpired does not dispatch notification when already token expired', function () {
+    Queue::fake();
+
     $account = SocialAccount::factory()->x()->create([
         'workspace_id' => $this->workspace->id,
         'status' => Status::TokenExpired,
@@ -49,6 +58,8 @@
 });
 
 test('markAsTokenExpired does not dispatch notification when account is disconnected', function () {
+    Queue::fake();
+
     $account = SocialAccount::factory()->x()->create([
         'workspace_id' => $this->workspace->id,
         'status' => Status::Disconnected,
@@ -59,3 +70,119 @@
 
     Queue::assertNotPushed(SendNotification::class);
 });
+
+test('markAsTokenExpired respects notify=false flag', function () {
+    Queue::fake();
+
+    $account = SocialAccount::factory()->x()->create([
+        'workspace_id' => $this->workspace->id,
+        'status' => Status::Connected,
+        'username' => 'testuser',
+    ]);
+
+    $account->markAsTokenExpired('refresh_token rejected', notify: false);
+
+    expect($account->fresh()->status)->toBe(Status::TokenExpired);
+    Queue::assertNotPushed(SendNotification::class);
+});
+
+test('markAsTokenExpired preserves existing disconnected_at value', function () {
+    Queue::fake();
+
+    $earlier = now()->subDays(3);
+    $account = SocialAccount::factory()->x()->create([
+        'workspace_id' => $this->workspace->id,
+        'status' => Status::Connected,
+        'disconnected_at' => $earlier,
+    ]);
+
+    $account->markAsTokenExpired('refresh_token rejected');
+
+    expect($account->fresh()->disconnected_at->toIso8601String())
+        ->toBe($earlier->toIso8601String());
+});
+
+test('markAsTokenExpired creates notification row with i18n placeholders substituted', function () {
+    Event::fake([NotificationCreated::class]);
+    Mail::fake();
+
+    $account = SocialAccount::factory()->x()->create([
+        'workspace_id' => $this->workspace->id,
+        'status' => Status::Connected,
+        'username' => 'testuser',
+    ]);
+
+    $account->markAsTokenExpired('refresh_token rejected');
+
+    $notification = Notification::where('user_id', $this->owner->id)->first();
+
+    expect($notification)->not->toBeNull();
+    expect($notification->title)->toBe('X account needs to be reconnected');
+    expect($notification->body)->toBe('@testuser session expired — please reconnect to keep posting');
+    expect($notification->type)->toBe(Type::AccountDisconnected);
+    expect($notification->data)->toBe(['social_account_id' => $account->id]);
+
+    Event::assertDispatched(NotificationCreated::class);
+    Mail::assertQueued(AccountDisconnected::class);
+});
+
+// ---- markAsDisconnected ----
+
+test('markAsDisconnected updates status and dispatches notification when transitioning from connected', function () {
+    Queue::fake();
+
+    $account = SocialAccount::factory()->x()->create([
+        'workspace_id' => $this->workspace->id,
+        'status' => Status::Connected,
+        'username' => 'testuser',
+    ]);
+
+    $account->markAsDisconnected('manual disconnect');
+
+    expect($account->fresh()->status)->toBe(Status::Disconnected);
+    expect($account->fresh()->error_message)->toBe('manual disconnect');
+    expect($account->fresh()->disconnected_at)->not->toBeNull();
+
+    Queue::assertPushed(SendNotification::class, function ($job) {
+        return $job->user->id === $this->owner->id
+            && $job->type === Type::AccountDisconnected;
+    });
+});
+
+test('markAsDisconnected does not dispatch notification when already disconnected', function () {
+    Queue::fake();
+
+    $account = SocialAccount::factory()->x()->create([
+        'workspace_id' => $this->workspace->id,
+        'status' => Status::Disconnected,
+        'disconnected_at' => now()->subDay(),
+    ]);
+
+    $account->markAsDisconnected('another disconnect');
+
+    Queue::assertNotPushed(SendNotification::class);
+});
+
+test('markAsDisconnected creates notification row with i18n placeholders substituted', function () {
+    Event::fake([NotificationCreated::class]);
+    Mail::fake();
+
+    $account = SocialAccount::factory()->x()->create([
+        'workspace_id' => $this->workspace->id,
+        'status' => Status::Connected,
+        'username' => 'testuser',
+    ]);
+
+    $account->markAsDisconnected('manual disconnect');
+
+    $notification = Notification::where('user_id', $this->owner->id)->first();
+
+    expect($notification)->not->toBeNull();
+    expect($notification->title)->toBe('X account disconnected');
+    expect($notification->body)->toBe('@testuser needs to be reconnected');
+    expect($notification->type)->toBe(Type::AccountDisconnected);
+    expect($notification->data)->toBe(['social_account_id' => $account->id]);
+
+    Event::assertDispatched(NotificationCreated::class);
+    Mail::assertQueued(AccountDisconnected::class);
+});