diff --git a/package.json b/package.json
index ee087e8..908d368 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "test": "forge test -vvv --mp \"test/unit/**/*.sol\" --fork-url https://mainnet.optimism.io",
     "test:integration": "forge test -vvv --mp \"test/integration/*/*.sol\" --fork-url https://mainnet.optimism.io ",
     "test:invariant": "forge test -vvv --mc BaseInvariantTest --fork-url https://optimism.llamarpc.com/sk_llama_3f92d666a172604faf69e469a67ec6ea ",
-    "test:income": "forge test -vv --mp \"test/integration/IncomeSimulator.t.sol\" --fork-url https://mainnet.optimism.io ",
+    "test:income": "forge test -vvvv --mp \"test/integration/IncomeSimulator.t.sol\" --fork-url https://mainnet.optimism.io ",
     "coverage": "forge coverage --mp \"test/unit/**/*.sol\" --fork-url https://mainnet.optimism.io ",
     "deploy:testnet": "make deploy-testnet",
     "deploy:mainnet": "make deploy-mainnet",
diff --git a/test/integration/BaseIntegrationTest.t.sol b/test/integration/BaseIntegrationTest.t.sol
index d69f147..e44202b 100644
--- a/test/integration/BaseIntegrationTest.t.sol
+++ b/test/integration/BaseIntegrationTest.t.sol
@@ -83,14 +83,20 @@ contract BaseIntegrationTest is Test {
         aaveYieldAggregator = new AaveYieldAggregator(address(sharesFactory), WETH, AAVE_POOL, AAVE_WETH_GATEWAY);
         blankYieldAggregator = new BlankYieldAggregator(address(sharesFactory), WETH);
 
+
         sharesNFT.setFactory(address(sharesFactory));
-        sharesFactory.queueMigrateYield(address(aaveYieldAggregator));
-        vm.warp(block.timestamp + sharesFactory.TIMELOCK_DURATION());
-        sharesFactory.executeMigrateYield();
+        sharesFactory.resetYield(address(blankYieldAggregator));
 
         sharesNFT.transferOwnership(FACTORY_OWNER);
-        sharesFactory.transferOwnership(FACTORY_OWNER);
         aaveYieldAggregator.transferOwnership(FACTORY_OWNER);
+
+        sharesFactory.transferOwnership(FACTORY_OWNER);
+        sharesFactory.acceptOwnership();
+
+        sharesFactory.queueMigrateYield(address(aaveYieldAggregator));
+        vm.warp(block.timestamp + 4 days);
+        sharesFactory.executeMigrateYield();
+
         vm.stopPrank();
     }