diff --git a/test/services/coves_auth_service_redaction_test.dart b/test/services/coves_auth_service_redaction_test.dart
index 553bb4a..4f8a790 100644
--- a/test/services/coves_auth_service_redaction_test.dart
+++ b/test/services/coves_auth_service_redaction_test.dart
@@ -1,32 +1,15 @@
 import 'package:coves_flutter/models/coves_session.dart';
 import 'package:coves_flutter/services/coves_auth_service.dart';
-import 'package:dio/dio.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:mockito/annotations.dart';
-import 'package:mockito/mockito.dart';
-
-import 'coves_auth_service_test.mocks.dart';
 
 /// Tests for sensitive data redaction in CovesAuthService
 ///
 /// Verifies that sensitive parameters (tokens) are properly redacted
 /// from debug logs while preserving useful debugging information.
-@GenerateMocks([Dio, FlutterSecureStorage])
 void main() {
-  late CovesAuthService service;
-  late MockDio mockDio;
-  late MockFlutterSecureStorage mockStorage;
-
   setUp(() {
-    mockDio = MockDio();
-    mockStorage = MockFlutterSecureStorage();
-
-    // Create a test instance
-    service = CovesAuthService.createTestInstance(
-      dio: mockDio,
-      storage: mockStorage,
-    );
+    // Reset singleton state before each test
+    CovesAuthService.resetInstance();
   });
 
   tearDown(() {
diff --git a/test/services/coves_auth_service_singleton_test.dart b/test/services/coves_auth_service_singleton_test.dart
index a443fd4..662a1c4 100644
--- a/test/services/coves_auth_service_singleton_test.dart
+++ b/test/services/coves_auth_service_singleton_test.dart
@@ -148,6 +148,7 @@ void main() {
     test('resetInstance() should clear the singleton', () {
       // Arrange
       final instance1 = CovesAuthService(dio: mockDio, storage: mockStorage);
+      expect(instance1, isNotNull); // Verify initial singleton exists
 
       // Act
       CovesAuthService.resetInstance();
diff --git a/test/services/coves_auth_service_validation_test.dart b/test/services/coves_auth_service_validation_test.dart
index d8004ad..a027a96 100644
--- a/test/services/coves_auth_service_validation_test.dart
+++ b/test/services/coves_auth_service_validation_test.dart
@@ -3,7 +3,6 @@ import 'package:dio/dio.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/annotations.dart';
-import 'package:mockito/mockito.dart';
 
 import 'coves_auth_service_test.mocks.dart';