New test cases and clean up

test/unit/EmailRecoveryFactory/deployModuleAndManager.t.sol

@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.25;
+
+import "forge-std/console2.sol";
+import { UnitBase } from "../UnitBase.t.sol";
+
+contract EmailRecoveryManager_deployModuleAndManager_Test is UnitBase {
+    function setUp() public override {
+        super.setUp();
+    }
+
+    function test_DeployModuleAndManager_Succeeds() public { }
+}

test/unit/EmailRecoveryManager/configureRecovery.t.sol

@@ -2,17 +2,16 @@
 pragma solidity ^0.8.25;
 
 import "forge-std/console2.sol";
-import { ModuleKitHelpers, ModuleKitUserOp } from "modulekit/ModuleKit.sol";
+import { ModuleKitHelpers } from "modulekit/ModuleKit.sol";
 import { MODULE_TYPE_EXECUTOR } from "modulekit/external/ERC7579.sol";
 import { IEmailRecoveryManager } from "src/interfaces/IEmailRecoveryManager.sol";
 import { EmailRecoveryModule } from "src/modules/EmailRecoveryModule.sol";
 import { GuardianStorage, GuardianStatus } from "src/libraries/EnumerableGuardianMap.sol";
 import { UnitBase } from "../UnitBase.t.sol";
 import { IModule } from "erc7579/interfaces/IERC7579Module.sol";
 
-contract ZkEmailRecovery_configureRecovery_Test is UnitBase {
+contract EmailRecoveryManager_configureRecovery_Test is UnitBase {
     using ModuleKitHelpers for *;
-    using ModuleKitUserOp for *;
 
     function setUp() public override {
         super.setUp();

test/unit/EmailRecoveryManager/extractRecoveredAccountFromAcceptanceSubject.t.sol

@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.25;
+
+import "forge-std/console2.sol";
+import { UnitBase } from "../UnitBase.t.sol";
+
+contract EmailRecoveryManager_extractRecoveredAccountFromAcceptanceSubject_Test is UnitBase {
+    function setUp() public override {
+        super.setUp();
+    }
+
+    function test_ExtractRecoveredAccountFromAcceptanceSubject_Succeeds() public view { }
+}

test/unit/EmailRecoveryManager/extractRecoveredAccountFromRecoverySubject.t.sol

@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.25;
+
+import "forge-std/console2.sol";
+import { UnitBase } from "../UnitBase.t.sol";
+
+contract EmailRecoveryManager_extractRecoveredAccountFromRecoverySubject_Test is UnitBase {
+    function setUp() public override {
+        super.setUp();
+    }
+
+    function test_ExtractRecoveredAccountFromRecoverySubject_Succeeds() public view { }
+}

test/unit/EmailRecoveryManager/getRecoveryConfig.t.sol

@@ -7,7 +7,7 @@ import { EmailRecoveryModule } from "src/modules/EmailRecoveryModule.sol";
 import { GuardianStorage, GuardianStatus } from "src/libraries/EnumerableGuardianMap.sol";
 import { UnitBase } from "../UnitBase.t.sol";
 
-contract ZkEmailRecovery_getRecoveryConfig_Test is UnitBase {
+contract EmailRecoveryManager_getRecoveryConfig_Test is UnitBase {
     function setUp() public override {
         super.setUp();
     }

test/unit/EmailRecoveryManager/getRecoveryRequest.t.sol

@@ -7,7 +7,7 @@ import { EmailRecoveryModule } from "src/modules/EmailRecoveryModule.sol";
 import { GuardianStorage, GuardianStatus } from "src/libraries/EnumerableGuardianMap.sol";
 import { UnitBase } from "../UnitBase.t.sol";
 
-contract ZkEmailRecovery_getRecoveryRequest_Test is UnitBase {
+contract EmailRecoveryManager_getRecoveryRequest_Test is UnitBase {
     function setUp() public override {
         super.setUp();
     }

test/unit/handlers/SafeRecoverySubjectHandler/acceptanceSubjectTemplates.t.sol

@@ -6,11 +6,8 @@ import { SafeRecoverySubjectHandler } from "src/handlers/SafeRecoverySubjectHand
 import { SafeUnitBase } from "../../SafeUnitBase.t.sol";
 
 contract SafeRecoverySubjectHandler_acceptanceSubjectTemplates_Test is SafeUnitBase {
-    SafeRecoverySubjectHandler safeRecoverySubjectHandler;
-
     function setUp() public override {
         super.setUp();
-        safeRecoverySubjectHandler = new SafeRecoverySubjectHandler();
     }
 
     function test_AcceptanceSubjectTemplates_Succeeds() public view {

test/unit/handlers/SafeRecoverySubjectHandler/extractRecoveredAccountFromAcceptanceSubject.t.sol

@@ -8,20 +8,16 @@ import { SafeUnitBase } from "../../SafeUnitBase.t.sol";
 contract SafeRecoverySubjectHandler_extractRecoveredAccountFromAcceptanceSubject_Test is
     SafeUnitBase
 {
-    SafeRecoverySubjectHandler safeRecoverySubjectHandler;
-
     function setUp() public override {
         super.setUp();
-        safeRecoverySubjectHandler = new SafeRecoverySubjectHandler();
     }
 
     function test_ExtractRecoveredAccountFromAcceptanceSubject_Succeeds() public view {
         bytes[] memory subjectParams = new bytes[](1);
         subjectParams[0] = abi.encode(accountAddress);
 
-        address extractedAccount = emailRecoveryHandler.extractRecoveredAccountFromAcceptanceSubject(
-            subjectParams, templateIdx
-        );
+        address extractedAccount = safeRecoverySubjectHandler
+            .extractRecoveredAccountFromAcceptanceSubject(subjectParams, templateIdx);
         assertEq(extractedAccount, accountAddress);
     }
 }

test/unit/handlers/SafeRecoverySubjectHandler/extractRecoveredAccountFromRecoverySubject.t.sol

@@ -2,20 +2,13 @@
 pragma solidity ^0.8.25;
 
 import "forge-std/console2.sol";
-import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
-import { SafeRecoverySubjectHandler } from "src/handlers/SafeRecoverySubjectHandler.sol";
 import { SafeUnitBase } from "../../SafeUnitBase.t.sol";
 
 contract SafeRecoverySubjectHandler_extractRecoveredAccountFromRecoverySubject_Test is
     SafeUnitBase
 {
-    using Strings for uint256;
-
-    SafeRecoverySubjectHandler safeRecoverySubjectHandler;
-
     function setUp() public override {
         super.setUp();
-        safeRecoverySubjectHandler = new SafeRecoverySubjectHandler();
     }
 
     function test_ExtractRecoveredAccountFromRecoverySubject_Succeeds() public view {

test/unit/modules/EmailRecoveryModule/getPreviousOwnerInLinkedList.t.sol → test/unit/handlers/SafeRecoverySubjectHandler/getPreviousOwnerInLinkedList.t.sol

@@ -2,9 +2,9 @@
 pragma solidity ^0.8.25;
 
 import "forge-std/console2.sol";
-import { UnitBase } from "../../UnitBase.t.sol";
+import { SafeUnitBase } from "../../SafeUnitBase.t.sol";
 
-contract EmailRecoveryModule_getPreviousOwnerInLinkedList_Test is UnitBase {
+contract SafeRecoverySubjectHandler_getPreviousOwnerInLinkedList_Test is SafeUnitBase {
     function setUp() public override {
         super.setUp();
     }

test/unit/handlers/SafeRecoverySubjectHandler/recoverySubjectTemplates.t.sol

@@ -2,15 +2,11 @@
 pragma solidity ^0.8.25;
 
 import "forge-std/console2.sol";
-import { SafeRecoverySubjectHandler } from "src/handlers/SafeRecoverySubjectHandler.sol";
 import { SafeUnitBase } from "../../SafeUnitBase.t.sol";
 
 contract SafeRecoverySubjectHandler_recoverySubjectTemplates_Test is SafeUnitBase {
-    SafeRecoverySubjectHandler safeRecoverySubjectHandler;
-
     function setUp() public override {
         super.setUp();
-        safeRecoverySubjectHandler = new SafeRecoverySubjectHandler();
     }
 
     function test_RecoverySubjectTemplates_Succeeds() public view {

test/unit/handlers/SafeRecoverySubjectHandler/validateAcceptanceSubject.t.sol

@@ -6,11 +6,8 @@ import { SafeRecoverySubjectHandler } from "src/handlers/SafeRecoverySubjectHand
 import { SafeUnitBase } from "../../SafeUnitBase.t.sol";
 
 contract SafeRecoverySubjectHandler_validateAcceptanceSubject_Test is SafeUnitBase {
-    SafeRecoverySubjectHandler safeRecoverySubjectHandler;
-
     function setUp() public override {
         super.setUp();
-        safeRecoverySubjectHandler = new SafeRecoverySubjectHandler();
     }
 
     function test_ValidateAcceptanceSubject_RevertWhen_NoSubjectParams() public {

test/unit/modules/EmailRecoveryModule/allowValidatorRecovery.t.sol

@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.25;
+
+import "forge-std/console2.sol";
+import { UnitBase } from "../../UnitBase.t.sol";
+
+contract EmailRecoveryModule_allowValidatorRecovery_Test is UnitBase {
+    function setUp() public override {
+        super.setUp();
+    }
+
+    function test_AllowValidatorRecovery_RevertWhen_InvalidValidator() public view { }
+    function test_AllowValidatorRecovery_SucceedsWhenAlreadyInitialized() public view { }
+    function test_AllowValidatorRecovery_SucceedsWhenInitializing() public view { }
+}

test/unit/modules/EmailRecoveryModule/disallowValidatorRecovery.t.sol

@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.25;
+
+import "forge-std/console2.sol";
+import { UnitBase } from "../../UnitBase.t.sol";
+
+contract EmailRecoveryModule_disallowValidatorRecovery_Test is UnitBase {
+    function setUp() public override {
+        super.setUp();
+    }
+
+    function test_DisallowValidatorRecovery_RevertWhen_InvalidValidator() public view { }
+    function test_DisallowValidatorRecovery_Succeeds() public view { }
+}

test/unit/modules/EmailRecoveryModule/getAllowedSelectors.t.sol

@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.25;
+
+import "forge-std/console2.sol";
+import { UnitBase } from "../../UnitBase.t.sol";
+
+contract EmailRecoveryModule_getAllowedSelectors_Test is UnitBase {
+    function setUp() public override {
+        super.setUp();
+    }
+
+    function test_GetAllowedSelectors_Succeeds() public view { }
+}

test/unit/modules/EmailRecoveryModule/getAllowedValidators.t.sol

@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.25;
+
+import "forge-std/console2.sol";
+import { UnitBase } from "../../UnitBase.t.sol";
+
+contract EmailRecoveryModule_getAllowedValidators_Test is UnitBase {
+    function setUp() public override {
+        super.setUp();
+    }
+
+    function test_GetAllowedValidators_Succeeds() public view { }
+}

test/unit/modules/EmailRecoveryModule/getTrustedRecoveryManager.t.sol

@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.25;
+
+import "forge-std/console2.sol";
+import { UnitBase } from "../../UnitBase.t.sol";
+
+contract EmailRecoveryModule_getTrustedRecoveryManager_Test is UnitBase {
+    function setUp() public override {
+        super.setUp();
+    }
+
+    function test_GetTrustedRecoveryManager_Succeeds() public view { }
+}

test/unit/modules/EmailRecoveryModule/onInstall.t.sol

@@ -9,5 +9,6 @@ contract EmailRecoveryModule_onInstall_Test is UnitBase {
         super.setUp();
     }
 
+    function test_OnInstall_RevertWhen_InvalidOnInstallData() public view { }
     function test_OnInstall_Succeeds() public view { }
 }

test/unit/modules/EmailRecoveryModule/onUninstall.t.sol

@@ -9,5 +9,7 @@ contract EmailRecoveryModule_onUninstall_Test is UnitBase {
         super.setUp();
     }
 
+    function test_OnUninstall_RevertWhen_InvalidValidatorsLength() public view { }
+    function test_OnUninstall_RevertWhen_InvalidNextValidator() public view { }
     function test_OnUninstall_Succeeds() public view { }
 }