diff --git a/test/TestTest.t.sol b/test/TestTest.t.sol
index 28651ce..5f3682e 100644
--- a/test/TestTest.t.sol
+++ b/test/TestTest.t.sol
@@ -21,8 +21,7 @@ contract TestTest is BaseTest {
                     tokenHandleRegistryAddress: address(0),
                     legacyFeeFollowModule: address(0),
                     legacyProfileFollowModule: address(0),
-                    newFeeFollowModule: address(0),
-                    migrationAdmin: address(0)
+                    newFeeFollowModule: address(0)
                 })
             })
         );
diff --git a/test/base/TestSetup.t.sol b/test/base/TestSetup.t.sol
index e12de94..b1a4dcc 100644
--- a/test/base/TestSetup.t.sol
+++ b/test/base/TestSetup.t.sol
@@ -260,8 +260,7 @@ contract TestSetup is Test, ContractAddressesLoaderDeployer, ArrayHelpers {
                 tokenHandleRegistryAddress: address(tokenHandleRegistry),
                 legacyFeeFollowModule: address(0), // TODO: Fill this in
                 legacyProfileFollowModule: address(0), // TODO: Fill this in
-                newFeeFollowModule: address(0), // TODO: Fill this in
-                migrationAdmin: migrationAdmin
+                newFeeFollowModule: address(0) // TODO: Fill this in
             })
         });
         followNFT = new FollowNFT(hubProxyAddr);
@@ -321,8 +320,7 @@ contract TestSetup is Test, ContractAddressesLoaderDeployer, ArrayHelpers {
                 tokenHandleRegistryAddress: tokenHandleRegistryProxyAddr,
                 legacyFeeFollowModule: address(0),
                 legacyProfileFollowModule: address(0),
-                newFeeFollowModule: address(0),
-                migrationAdmin: migrationAdmin
+                newFeeFollowModule: address(0)
             })
         });
         followNFT = new FollowNFT(hubProxyAddr);
diff --git a/test/fork/UpgradeForkTest.t.sol b/test/fork/UpgradeForkTest.t.sol
index fcec6f7..237eb4b 100644
--- a/test/fork/UpgradeForkTest.t.sol
+++ b/test/fork/UpgradeForkTest.t.sol
@@ -367,8 +367,7 @@ contract UpgradeForkTest is BaseTest {
                 tokenHandleRegistryAddress: address(tokenHandleRegistry),
                 legacyFeeFollowModule: address(0), // TODO: Fill this in
                 legacyProfileFollowModule: address(0), // TODO: Fill this in
-                newFeeFollowModule: address(0), // TODO: Fill this in
-                migrationAdmin: migrationAdmin
+                newFeeFollowModule: address(0) // TODO: Fill this in
             })
         });
         followNFT = new FollowNFT(hubProxyAddr);
diff --git a/test/migrations/Migrations.t.sol b/test/migrations/Migrations.t.sol
index 406beaa..a7dc5b1 100644
--- a/test/migrations/Migrations.t.sol
+++ b/test/migrations/Migrations.t.sol
@@ -638,8 +638,7 @@ contract MigrationsTestNonFork is BaseTest {
             tokenHandleRegistryAddress: makeAddr('tokenHandleRegistryAddress'),
             legacyFeeFollowModule: legacyFeeFollowModule,
             legacyProfileFollowModule: makeAddr('legacyProfileFollowModule'),
-            newFeeFollowModule: newFeeFollowModule,
-            migrationAdmin: makeAddr('migrationAdmin')
+            newFeeFollowModule: newFeeFollowModule
         });
         LensV2Migration migration = new LensV2Migration(migrationParams);
 
@@ -676,8 +675,7 @@ contract MigrationsTestNonFork is BaseTest {
             tokenHandleRegistryAddress: makeAddr('tokenHandleRegistryAddress'),
             legacyFeeFollowModule: makeAddr('legacyFeeFollowModule'),
             legacyProfileFollowModule: legacyProfileFollowModule,
-            newFeeFollowModule: makeAddr('newFeeFollowModule'),
-            migrationAdmin: makeAddr('migrationAdmin')
+            newFeeFollowModule: makeAddr('newFeeFollowModule')
         });
         LensV2Migration migration = new LensV2Migration(migrationParams);
 
diff --git a/test/modules/act/collect/BaseFeeCollectModule.t.sol b/test/modules/act/collect/BaseFeeCollectModule.t.sol
index 28d7d4c..9f639a2 100644
--- a/test/modules/act/collect/BaseFeeCollectModule.t.sol
+++ b/test/modules/act/collect/BaseFeeCollectModule.t.sol
@@ -127,6 +127,8 @@ contract BaseFeeCollectModule_Initialization is BaseFeeCollectModuleBase {
                 (amount == 0 && whitelistedCurrency == address(0))
         );
 
+        vm.assume(whitelistedCurrency != address(baseFeeCollectModule));
+
         if (whitelistedCurrency != address(0)) {
             vm.etch(whitelistedCurrency, address(new MockCurrency()).code);
         }