diff --git a/cadence/contracts/PMStrategiesV1.cdc b/cadence/contracts/PMStrategiesV1.cdc
index 90ce8e80..19010816 100644
--- a/cadence/contracts/PMStrategiesV1.cdc
+++ b/cadence/contracts/PMStrategiesV1.cdc
@@ -849,7 +849,7 @@ access(all) contract PMStrategiesV1 {
         }
 
         access(contract) fun removePendingRedeem(id: UInt64) {
-            self.pendingRedeems.remove(key: id)
+            let _removedRedeem = self.pendingRedeems.remove(key: id)
         }
 
         access(contract) view fun getPendingRedeem(id: UInt64): PendingRedeemInfo? {
@@ -897,7 +897,7 @@ access(all) contract PMStrategiesV1 {
             }
             let entry: auth(Remove) &AnyStruct = &self.metadata["claimOutcomes"]!
             let outcomes = entry as! auth(Remove) &{UInt64: String}
-            outcomes.remove(key: yieldVaultID)
+            let _removedOutcome = outcomes.remove(key: yieldVaultID)
         }
 
         access(contract) view fun getClaimOutcome(yieldVaultID: UInt64): String? {
diff --git a/cadence/contracts/mocks/EVM.cdc b/cadence/contracts/mocks/EVM.cdc
index 25314e7c..fbfe5851 100644
--- a/cadence/contracts/mocks/EVM.cdc
+++ b/cadence/contracts/mocks/EVM.cdc
@@ -750,7 +750,7 @@ contract EVM {
                         )
                     }
 
-                    keyList.add(
+                    let _keyIndex = keyList.add(
                       key.publicKey,
                       hashAlgorithm: key.hashAlgorithm,
                       // normalization factor. We need to divide by 1000 because the
diff --git a/cadence/contracts/mocks/FlowTransactionScheduler.cdc b/cadence/contracts/mocks/FlowTransactionScheduler.cdc
index 973d3bb8..91638e81 100644
--- a/cadence/contracts/mocks/FlowTransactionScheduler.cdc
+++ b/cadence/contracts/mocks/FlowTransactionScheduler.cdc
@@ -488,7 +488,7 @@ access(all) contract FlowTransactionScheduler {
         access(all) fun remove(timestamp: UFix64) {
             // Only remove if the timestamp is in the array
             if let index = self.timestamps.firstIndex(of: timestamp) {
-                self.timestamps.remove(at: index)
+                let _removedTimestamp = self.timestamps.remove(at: index)
             }
         }
 
@@ -605,7 +605,7 @@ access(all) contract FlowTransactionScheduler {
         /// txRemovalLimit) require explicit authorization from the contract administrator.
         access(UpdateConfig) fun setConfig(newConfig: {SchedulerConfig}, txRemovalLimit: UInt) {
             self.config = newConfig
-            FlowTransactionScheduler.account.storage.load<UInt>(from: /storage/txRemovalLimit)
+            let _oldLimit = FlowTransactionScheduler.account.storage.load<UInt>(from: /storage/txRemovalLimit)
             FlowTransactionScheduler.account.storage.save(txRemovalLimit, to: /storage/txRemovalLimit)
             emit ConfigUpdated()
         }
@@ -1032,7 +1032,7 @@ access(all) contract FlowTransactionScheduler {
             if let priorityQueue = transactionQueue[transactionPriority] {
                 priorityQueue[transactionID] = nil
                 if priorityQueue.keys.length == 0 {
-                    transactionQueue.remove(key: transactionPriority)
+                    let _removedPriorityQueue = transactionQueue.remove(key: transactionPriority)
                 } else {
                     transactionQueue[transactionPriority] = priorityQueue
                 }
@@ -1041,8 +1041,8 @@ access(all) contract FlowTransactionScheduler {
 
             // if the slot is now empty remove it from the maps
             if transactionQueue.keys.length == 0 {
-                self.slotQueue.remove(key: slot)
-                self.slotUsedEffort.remove(key: slot)
+                let _removedSlotQueue = self.slotQueue.remove(key: slot)
+                let _removedSlotEffort = self.slotUsedEffort.remove(key: slot)
 
                 self.sortedTimestamps.remove(timestamp: slot)
             }
@@ -1154,7 +1154,7 @@ access(all) contract FlowTransactionScheduler {
                         // charge the full fee for transaction execution
                         destroy tx!.payAndRefundFees(refundMultiplier: 0.0)
 
-                        self.removeTransaction(txData: tx!)
+                        let _removedExpiredTx = self.removeTransaction(txData: tx!)
                     }
                 }
             }
@@ -1243,7 +1243,7 @@ access(all) contract FlowTransactionScheduler {
             
             // keep the array under the limit
             if UInt(self.canceledTransactions.length) > self.config.canceledTransactionsLimit {
-                self.canceledTransactions.remove(at: 0)
+                let _removedOldestCanceled = self.canceledTransactions.remove(at: 0)
             }
 
             emit Canceled(
@@ -1255,8 +1255,8 @@ access(all) contract FlowTransactionScheduler {
                 transactionHandlerTypeIdentifier: tx.handlerTypeIdentifier
             )
 
-            self.removeTransaction(txData: tx)
-            
+            let _removedCanceledTx = self.removeTransaction(txData: tx)
+
             return <-refundedFees
         }
 
@@ -1436,7 +1436,7 @@ access(all) contract FlowTransactionScheduler {
         let storageUsedBefore = self.account.storage.used
         self.account.storage.save(data!, to: storagePath)
         let storageUsedAfter = self.account.storage.used
-        self.account.storage.load<AnyStruct>(from: storagePath)
+        let _loadedData = self.account.storage.load<AnyStruct>(from: storagePath)
 
         return FlowStorageFees.convertUInt64StorageBytesToUFix64Megabytes(storageUsedAfter.saturatingSubtract(storageUsedBefore))
     }
diff --git a/cadence/tests/atomic_registration_gc_test.cdc b/cadence/tests/atomic_registration_gc_test.cdc
index f4a7b89a..0c44326c 100644
--- a/cadence/tests/atomic_registration_gc_test.cdc
+++ b/cadence/tests/atomic_registration_gc_test.cdc
@@ -31,7 +31,7 @@ access(all) fun setup() {
     let reserveAmount = 100_000_00.0
     setupMoetVault(protocolAccount, beFailed: false)
     setupYieldVault(protocolAccount, beFailed: false)
-    mintFlow(to: protocolAccount, amount: reserveAmount)
+    let _mintedFlowReserve = mintFlow(to: protocolAccount, amount: reserveAmount)
     mintMoet(signer: protocolAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
     mintYield(signer: yieldTokenAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
     setMockSwapperLiquidityConnector(signer: protocolAccount, vaultStoragePath: MOET.VaultStoragePath)
@@ -70,13 +70,13 @@ access(all) fun setup() {
     // Scheduler contracts are deployed as part of deployContracts()
     
     // Fund FlowYieldVaults account for scheduling fees (atomic initial scheduling)
-    mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
+    let _mintedFlowFees = mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
 }
 
 access(all) fun testAtomicRegistrationAndGC() {
     let user = Test.createAccount()
     let fundingAmount = 100.0
-    mintFlow(to: user, amount: fundingAmount)
+    let _mintedFlowUser = mintFlow(to: user, amount: fundingAmount)
 
     // Grant Beta Access
     let betaRef = grantBeta(flowYieldVaultsAccount, user)
diff --git a/cadence/tests/create_yield_vault_manager_validation_test.cdc b/cadence/tests/create_yield_vault_manager_validation_test.cdc
index 8df00345..6340065d 100644
--- a/cadence/tests/create_yield_vault_manager_validation_test.cdc
+++ b/cadence/tests/create_yield_vault_manager_validation_test.cdc
@@ -22,7 +22,7 @@ fun test_CreateYieldVaultManagerValidatesBetaRef() {
 
     let user = Test.createAccount()
     transferFlow(signer: serviceAccount, recipient: user.address, amount: 1.0)
-    grantBeta(flowYieldVaultsAccount, user)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
     let txn = Test.Transaction(
         code: Test.readFile("../transactions/test/create_yield_vault_manager_with_beta_cap.cdc"),
diff --git a/cadence/tests/forked_rebalance_boundary_test.cdc b/cadence/tests/forked_rebalance_boundary_test.cdc
index 6c7a8224..4dc3d58a 100644
--- a/cadence/tests/forked_rebalance_boundary_test.cdc
+++ b/cadence/tests/forked_rebalance_boundary_test.cdc
@@ -220,8 +220,8 @@ fun test_UpperBoundary() {
     let user = Test.createAccount()
     let fundingAmount = 1000.0
 
-    transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+    let _transferFlowResult = transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
     // Set vault to baseline 1:1 price
     setVaultSharePrice(
@@ -425,8 +425,8 @@ fun test_LowerBoundary() {
     let user = Test.createAccount()
     let fundingAmount = 1000.0
 
-    transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+    let _transferFlowResult = transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
     setVaultSharePrice(
         vaultAddress: morphoVaultAddress,
diff --git a/cadence/tests/forked_rebalance_scenario1_test.cdc b/cadence/tests/forked_rebalance_scenario1_test.cdc
index 4a12c025..5e234183 100644
--- a/cadence/tests/forked_rebalance_scenario1_test.cdc
+++ b/cadence/tests/forked_rebalance_scenario1_test.cdc
@@ -202,9 +202,9 @@ fun test_ForkedRebalanceYieldVaultScenario1() {
 	}
 
 	// 	confirm user exists.
-	getBalance(address: user.address, vaultPublicPath: /public/flowTokenReceiver)!
-    transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+	let _userBalance = getBalance(address: user.address, vaultPublicPath: /public/flowTokenReceiver)!
+    let _transferFlowResult = transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
     // Set vault to baseline 1:1 price
     setVaultSharePrice(
diff --git a/cadence/tests/forked_rebalance_scenario2_test.cdc b/cadence/tests/forked_rebalance_scenario2_test.cdc
index 2d9ba5a9..2064ce71 100644
--- a/cadence/tests/forked_rebalance_scenario2_test.cdc
+++ b/cadence/tests/forked_rebalance_scenario2_test.cdc
@@ -342,8 +342,8 @@ fun test_RebalanceYieldVaultScenario2() {
 
 	// Likely 0.0
 	let _flowBalanceBefore = getBalance(address: user.address, vaultPublicPath: /public/flowTokenReceiver)!
-	transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+	let _transferFlowResult = transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
     // Set vault to baseline 1:1 price
     setVaultSharePrice(
diff --git a/cadence/tests/forked_rebalance_scenario3a_test.cdc b/cadence/tests/forked_rebalance_scenario3a_test.cdc
index 45a83b6c..2e2beb11 100644
--- a/cadence/tests/forked_rebalance_scenario3a_test.cdc
+++ b/cadence/tests/forked_rebalance_scenario3a_test.cdc
@@ -149,8 +149,8 @@ fun test_RebalanceYieldVaultScenario3A() {
 	// Likely 0.0
 	let flowBalanceBefore = getBalance(address: user.address, vaultPublicPath: /public/flowTokenReceiver)!
 	log("[TEST] flow balance before \(flowBalanceBefore)")
-	transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+	let _transferFlowResult = transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
     // Set vault to baseline 1:1 price
     // Use 1 billion (1e9) as base - large enough to prevent slippage, safe from UFix64 overflow
diff --git a/cadence/tests/forked_rebalance_scenario3b_test.cdc b/cadence/tests/forked_rebalance_scenario3b_test.cdc
index 3d71ac50..15acadcc 100644
--- a/cadence/tests/forked_rebalance_scenario3b_test.cdc
+++ b/cadence/tests/forked_rebalance_scenario3b_test.cdc
@@ -147,8 +147,8 @@ fun test_RebalanceYieldVaultScenario3B() {
 	// Likely 0.0
 	let flowBalanceBefore = getBalance(address: user.address, vaultPublicPath: /public/flowTokenReceiver)!
 	log("[TEST] flow balance before \(flowBalanceBefore)")
-	transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+	let _transferFlowResult = transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
     // Set vault to baseline 1:1 price
     setVaultSharePrice(
diff --git a/cadence/tests/forked_rebalance_scenario3c_test.cdc b/cadence/tests/forked_rebalance_scenario3c_test.cdc
index b4065358..cf2de542 100644
--- a/cadence/tests/forked_rebalance_scenario3c_test.cdc
+++ b/cadence/tests/forked_rebalance_scenario3c_test.cdc
@@ -148,8 +148,8 @@ fun test_ForkedRebalanceYieldVaultScenario3C() {
 
     // Likely 0.0
     let _flowBalanceBefore = getBalance(address: user.address, vaultPublicPath: /public/flowTokenReceiver)!
-    transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+    let _transferFlowResult = transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
     // Set vault to baseline 1:1 price
     setVaultSharePrice(
diff --git a/cadence/tests/forked_rebalance_scenario3d_test.cdc b/cadence/tests/forked_rebalance_scenario3d_test.cdc
index f4a0bb1f..be5603a0 100644
--- a/cadence/tests/forked_rebalance_scenario3d_test.cdc
+++ b/cadence/tests/forked_rebalance_scenario3d_test.cdc
@@ -149,8 +149,8 @@ fun test_ForkedRebalanceYieldVaultScenario3D() {
 
     // Likely 0.0
     let _flowBalanceBefore = getBalance(address: user.address, vaultPublicPath: /public/flowTokenReceiver)!
-    transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+    let _transferFlowResult = transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
     // Set vault to baseline 1:1 price
     setVaultSharePrice(
diff --git a/cadence/tests/forked_rebalance_scenario4_test.cdc b/cadence/tests/forked_rebalance_scenario4_test.cdc
index 18fe68aa..0e854f77 100644
--- a/cadence/tests/forked_rebalance_scenario4_test.cdc
+++ b/cadence/tests/forked_rebalance_scenario4_test.cdc
@@ -171,8 +171,8 @@ fun test_RebalanceLowCollateralHighYieldPrices() {
 	let yieldPriceIncrease = 1500.0 // YT:   $1000.0 → $1500.0
 
 	let user = Test.createAccount()
-	transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
-	grantBeta(flowYieldVaultsAccount, user)
+	let _transferFlowResult = transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
+	let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
 	createYieldVault(
 		signer: user,
@@ -345,8 +345,8 @@ fun test_RebalanceHighCollateralLowYieldPrices() {
 	let yieldPriceIncrease = 1.5      // YT: $1.0 → $1.5
 
 	let user = Test.createAccount()
-	transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
-	grantBeta(flowYieldVaultsAccount, user)
+	let _transferFlowResult = transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
+	let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
 	createYieldVault(
 		signer: user,
diff --git a/cadence/tests/grant_beta_cleanup_test.cdc b/cadence/tests/grant_beta_cleanup_test.cdc
index 38dc2f1a..5d31cbe1 100644
--- a/cadence/tests/grant_beta_cleanup_test.cdc
+++ b/cadence/tests/grant_beta_cleanup_test.cdc
@@ -16,13 +16,13 @@ fun test_ReGrantBetaRevokesPreviousCapability() {
     let user = Test.createAccount()
     transferFlow(signer: serviceAccount, recipient: user.address, amount: 1.0)
 
-    grantBeta(flowYieldVaultsAccount, user)
+    let _grantedBetaFirst = grantBeta(flowYieldVaultsAccount, user)
 
     let backupRes = _executeTransaction("../transactions/test/backup_beta_cap.cdc", [], user)
     Test.expect(backupRes, Test.beSucceeded())
 
     // Re-granting should revoke the previously issued controller (and thus all old capability copies).
-    grantBeta(flowYieldVaultsAccount, user)
+    let _grantedBetaSecond = grantBeta(flowYieldVaultsAccount, user)
 
     // Event assertions: the re-grant should emit BetaRevoked for the *previous* capID, then a fresh BetaGranted.
     let grantedAny = Test.eventsOfType(Type<FlowYieldVaultsClosedBeta.BetaGranted>())
diff --git a/cadence/tests/rebalance_scenario1_test.cdc b/cadence/tests/rebalance_scenario1_test.cdc
index a15abea8..bd3fceae 100644
--- a/cadence/tests/rebalance_scenario1_test.cdc
+++ b/cadence/tests/rebalance_scenario1_test.cdc
@@ -35,7 +35,7 @@ fun setup() {
 	let reserveAmount = 100_000_00.0
 	setupMoetVault(protocolAccount, beFailed: false)
 	setupYieldVault(protocolAccount, beFailed: false)
-	mintFlow(to: protocolAccount, amount: reserveAmount)
+	let _mintedFlowReserve = mintFlow(to: protocolAccount, amount: reserveAmount)
 	mintMoet(signer: protocolAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
 	mintYield(signer: yieldTokenAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
 	setMockSwapperLiquidityConnector(signer: protocolAccount, vaultStoragePath: MOET.VaultStoragePath)
@@ -73,7 +73,7 @@ fun setup() {
 	)
 
 	// Fund FlowYieldVaults account for scheduling fees (atomic initial scheduling)
-	mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
+	let _mintedFlowFees = mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
 
 	snapshot = getCurrentBlockHeight()
 }
@@ -103,8 +103,8 @@ fun test_RebalanceYieldVaultScenario1() {
 
 	// Likely 0.0
 	let _flowBalanceBefore = getBalance(address: user.address, vaultPublicPath: /public/flowTokenReceiver)!
-	mintFlow(to: user, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+	let _mintedFlowUser = mintFlow(to: user, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
 	createYieldVault(
 		signer: user,
diff --git a/cadence/tests/rebalance_scenario2_test.cdc b/cadence/tests/rebalance_scenario2_test.cdc
index 06449882..694aee70 100644
--- a/cadence/tests/rebalance_scenario2_test.cdc
+++ b/cadence/tests/rebalance_scenario2_test.cdc
@@ -104,7 +104,7 @@ fun setup() {
 	let reserveAmount = 100_000_00.0
 	setupMoetVault(protocolAccount, beFailed: false)
 	setupYieldVault(protocolAccount, beFailed: false)
-	mintFlow(to: protocolAccount, amount: reserveAmount)
+	let _mintedFlowReserve = mintFlow(to: protocolAccount, amount: reserveAmount)
 	mintMoet(signer: protocolAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
 	mintYield(signer: yieldTokenAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
 	setMockSwapperLiquidityConnector(signer: protocolAccount, vaultStoragePath: MOET.VaultStoragePath)
@@ -142,7 +142,7 @@ fun setup() {
 	)
 
 	// Fund FlowYieldVaults account for scheduling fees (atomic initial scheduling)
-	mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
+	let _mintedFlowFees = mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
 
 	snapshot = getCurrentBlockHeight()
 }
@@ -167,8 +167,8 @@ fun test_RebalanceYieldVaultScenario2() {
 
 	// Likely 0.0
 	let flowBalanceBefore = getBalance(address: user.address, vaultPublicPath: /public/flowTokenReceiver)!
-	mintFlow(to: user, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+	let _mintedFlowUser = mintFlow(to: user, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
 	createYieldVault(
 		signer: user,
diff --git a/cadence/tests/rebalance_scenario3a_test.cdc b/cadence/tests/rebalance_scenario3a_test.cdc
index 4a773049..0af26122 100644
--- a/cadence/tests/rebalance_scenario3a_test.cdc
+++ b/cadence/tests/rebalance_scenario3a_test.cdc
@@ -36,7 +36,7 @@ fun setup() {
 	let reserveAmount = 100_000_00.0
 	setupMoetVault(protocolAccount, beFailed: false)
 	setupYieldVault(protocolAccount, beFailed: false)
-	mintFlow(to: protocolAccount, amount: reserveAmount)
+	let _mintedFlowReserve = mintFlow(to: protocolAccount, amount: reserveAmount)
 	mintMoet(signer: protocolAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
 	mintYield(signer: yieldTokenAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
 	setMockSwapperLiquidityConnector(signer: protocolAccount, vaultStoragePath: MOET.VaultStoragePath)
@@ -74,7 +74,7 @@ fun setup() {
 	)
 
 	// Fund FlowYieldVaults account for scheduling fees (atomic initial scheduling)
-	mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
+	let _mintedFlowFees = mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
 
 	snapshot = getCurrentBlockHeight()
 }
@@ -96,8 +96,8 @@ fun test_RebalanceYieldVaultScenario3A() {
 	// Likely 0.0
 	let flowBalanceBefore = getBalance(address: user.address, vaultPublicPath: /public/flowTokenReceiver)!
 	log("[TEST] flow balance before \(flowBalanceBefore)")
-	mintFlow(to: user, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+	let _mintedFlowUser = mintFlow(to: user, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
 	createYieldVault(
 		signer: user,
diff --git a/cadence/tests/rebalance_scenario3b_test.cdc b/cadence/tests/rebalance_scenario3b_test.cdc
index 8fe741fe..56587ec8 100644
--- a/cadence/tests/rebalance_scenario3b_test.cdc
+++ b/cadence/tests/rebalance_scenario3b_test.cdc
@@ -36,7 +36,7 @@ fun setup() {
 	let reserveAmount = 100_000_00.0
 	setupMoetVault(protocolAccount, beFailed: false)
 	setupYieldVault(protocolAccount, beFailed: false)
-	mintFlow(to: protocolAccount, amount: reserveAmount)
+	let _mintedFlowReserve = mintFlow(to: protocolAccount, amount: reserveAmount)
 	mintMoet(signer: protocolAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
 	mintYield(signer: yieldTokenAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
 	setMockSwapperLiquidityConnector(signer: protocolAccount, vaultStoragePath: MOET.VaultStoragePath)
@@ -74,7 +74,7 @@ fun setup() {
 	)
 
 	// Fund FlowYieldVaults account for scheduling fees (atomic initial scheduling)
-	mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
+	let _mintedFlowFees = mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
 
 	snapshot = getCurrentBlockHeight()
 }
@@ -96,8 +96,8 @@ fun test_RebalanceYieldVaultScenario3B() {
 	// Likely 0.0
 	let flowBalanceBefore = getBalance(address: user.address, vaultPublicPath: /public/flowTokenReceiver)!
 	log("[TEST] flow balance before \(flowBalanceBefore)")
-	mintFlow(to: user, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+	let _mintedFlowUser = mintFlow(to: user, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
 	createYieldVault(
 		signer: user,
diff --git a/cadence/tests/rebalance_scenario3c_test.cdc b/cadence/tests/rebalance_scenario3c_test.cdc
index 84e4a5a7..ec813f94 100644
--- a/cadence/tests/rebalance_scenario3c_test.cdc
+++ b/cadence/tests/rebalance_scenario3c_test.cdc
@@ -36,7 +36,7 @@ fun setup() {
 	let reserveAmount = 100_000_00.0
 	setupMoetVault(protocolAccount, beFailed: false)
 	setupYieldVault(protocolAccount, beFailed: false)
-	mintFlow(to: protocolAccount, amount: reserveAmount)
+	let _mintedFlowReserve = mintFlow(to: protocolAccount, amount: reserveAmount)
 	mintMoet(signer: protocolAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
 	mintYield(signer: yieldTokenAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
 	setMockSwapperLiquidityConnector(signer: protocolAccount, vaultStoragePath: MOET.VaultStoragePath)
@@ -74,7 +74,7 @@ fun setup() {
 	)
 
 	// Fund FlowYieldVaults account for scheduling fees (atomic initial scheduling)
-	mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
+	let _mintedFlowFees = mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
 
 	snapshot = getCurrentBlockHeight()
 }
@@ -96,8 +96,8 @@ fun test_RebalanceYieldVaultScenario3C() {
 	// Likely 0.0
 	let flowBalanceBefore = getBalance(address: user.address, vaultPublicPath: /public/flowTokenReceiver)!
 	log("[TEST] flow balance before \(flowBalanceBefore)")
-	mintFlow(to: user, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+	let _mintedFlowUser = mintFlow(to: user, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
 	createYieldVault(
 		signer: user,
diff --git a/cadence/tests/rebalance_scenario3d_test.cdc b/cadence/tests/rebalance_scenario3d_test.cdc
index 2def8b74..8fac8acc 100644
--- a/cadence/tests/rebalance_scenario3d_test.cdc
+++ b/cadence/tests/rebalance_scenario3d_test.cdc
@@ -36,7 +36,7 @@ fun setup() {
 	let reserveAmount = 100_000_00.0
 	setupMoetVault(protocolAccount, beFailed: false)
 	setupYieldVault(protocolAccount, beFailed: false)
-	mintFlow(to: protocolAccount, amount: reserveAmount)
+	let _mintedFlowReserve = mintFlow(to: protocolAccount, amount: reserveAmount)
 	mintMoet(signer: protocolAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
 	mintYield(signer: yieldTokenAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
 	setMockSwapperLiquidityConnector(signer: protocolAccount, vaultStoragePath: MOET.VaultStoragePath)
@@ -74,7 +74,7 @@ fun setup() {
 	)
 
 	// Fund FlowYieldVaults account for scheduling fees (atomic initial scheduling)
-	mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
+	let _mintedFlowFees = mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
 
 	snapshot = getCurrentBlockHeight()
 }
@@ -96,8 +96,8 @@ fun test_RebalanceYieldVaultScenario3D() {
 	// Likely 0.0
 	let flowBalanceBefore = getBalance(address: user.address, vaultPublicPath: /public/flowTokenReceiver)!
 	log("[TEST] flow balance before \(flowBalanceBefore)")
-	mintFlow(to: user, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+	let _mintedFlowUser = mintFlow(to: user, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
 	createYieldVault(
 		signer: user,
diff --git a/cadence/tests/rebalance_scenario4_test.cdc b/cadence/tests/rebalance_scenario4_test.cdc
index 397b6d7e..d2f0360d 100644
--- a/cadence/tests/rebalance_scenario4_test.cdc
+++ b/cadence/tests/rebalance_scenario4_test.cdc
@@ -47,7 +47,7 @@ fun setupEnv(flowPrice: UFix64, yieldPrice: UFix64) {
 	let reserveAmount = 100_000_000.0
 	setupMoetVault(protocolAccount, beFailed: false)
 	setupYieldVault(protocolAccount, beFailed: false)
-	mintFlow(to: protocolAccount, amount: reserveAmount)
+	let _mintedFlowReserve = mintFlow(to: protocolAccount, amount: reserveAmount)
 	mintMoet(signer: protocolAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
 	mintYield(signer: yieldTokenAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
 	setMockSwapperLiquidityConnector(signer: protocolAccount, vaultStoragePath: MOET.VaultStoragePath)
@@ -89,7 +89,7 @@ fun setupEnv(flowPrice: UFix64, yieldPrice: UFix64) {
 	)
 
 	// Fund FlowYieldVaults account for scheduling fees (atomic initial scheduling)
-	mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
+	let _mintedFlowFees = mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
 }
 
 access(all)
@@ -104,8 +104,8 @@ fun test_RebalanceLowCollateralHighYieldPrices() {
 	let yieldPriceIncrease = 1500.0 // YT:   $1000.0 → $1500.0
 
 	let user = Test.createAccount()
-	mintFlow(to: user, amount: fundingAmount)
-	grantBeta(flowYieldVaultsAccount, user)
+	let _mintedFlowUser = mintFlow(to: user, amount: fundingAmount)
+	let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
 	createYieldVault(
 		signer: user,
@@ -205,8 +205,8 @@ fun test_RebalanceHighCollateralLowYieldPrices() {
 	let yieldPriceIncrease = 1.5      // YT: $1.0 → $1.5
 
 	let user = Test.createAccount()
-	mintFlow(to: user, amount: fundingAmount)
-	grantBeta(flowYieldVaultsAccount, user)
+	let _mintedFlowUser = mintFlow(to: user, amount: fundingAmount)
+	let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
 	createYieldVault(
 		signer: user,
diff --git a/cadence/tests/rebalance_yield_test.cdc b/cadence/tests/rebalance_yield_test.cdc
index a6d21b31..c6275eb3 100644
--- a/cadence/tests/rebalance_yield_test.cdc
+++ b/cadence/tests/rebalance_yield_test.cdc
@@ -34,7 +34,7 @@ fun setup() {
     // mint tokens & set liquidity in mock swapper contract
     let reserveAmount = 100_000_00.0
     setupYieldVault(protocolAccount, beFailed: false)
-    mintFlow(to: protocolAccount, amount: reserveAmount)
+    let _mintedFlowReserve = mintFlow(to: protocolAccount, amount: reserveAmount)
     mintMoet(signer: protocolAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
     mintYield(signer: yieldTokenAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
     setMockSwapperLiquidityConnector(signer: protocolAccount, vaultStoragePath: MOET.VaultStoragePath)
@@ -72,7 +72,7 @@ fun setup() {
     )
 
     // Fund FlowYieldVaults account for scheduling fees (atomic initial scheduling)
-    mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
+    let _mintedFlowFees = mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
 
     snapshot = getCurrentBlockHeight()
 }
@@ -92,8 +92,8 @@ fun test_RebalanceYieldVaultScenario2() {
 
     // Likely 0.0
     let _flowBalanceBefore = getBalance(address: user.address, vaultPublicPath: /public/flowTokenReceiver)!
-    mintFlow(to: user, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+    let _mintedFlowUser = mintFlow(to: user, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
     createYieldVault(
         signer: user,
diff --git a/cadence/tests/scheduled_rebalance_integration_test.cdc b/cadence/tests/scheduled_rebalance_integration_test.cdc
index c9d79875..e140905a 100644
--- a/cadence/tests/scheduled_rebalance_integration_test.cdc
+++ b/cadence/tests/scheduled_rebalance_integration_test.cdc
@@ -37,7 +37,7 @@ fun setup() {
     log("FlowYieldVaultsSchedulerV1 available")
     
     // Fund FlowYieldVaults account for scheduling fees
-    mintFlow(to: flowYieldVaultsAccount, amount: 1000.0)
+    let _mintedFlowToVaultsAccount = mintFlow(to: flowYieldVaultsAccount, amount: 1000.0)
 
     // Set mocked token prices
     setMockOraclePrice(signer: flowYieldVaultsAccount, forTokenIdentifier: yieldTokenIdentifier, price: 1.0)
@@ -48,7 +48,7 @@ fun setup() {
     let reserveAmount = 100_000_00.0
     setupMoetVault(protocolAccount, beFailed: false)
     setupYieldVault(protocolAccount, beFailed: false)
-    mintFlow(to: protocolAccount, amount: reserveAmount)
+    let _mintedFlowToProtocol = mintFlow(to: protocolAccount, amount: reserveAmount)
     mintMoet(signer: protocolAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
     mintYield(signer: yieldTokenAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
     setMockSwapperLiquidityConnector(signer: protocolAccount, vaultStoragePath: MOET.VaultStoragePath)
@@ -110,7 +110,7 @@ fun testNativeScheduledRebalancing() {
     
     // Step 1: Create a YieldVault with initial funding
     log("Step 1: Creating YieldVault...")
-    mintFlow(to: user, amount: fundingAmount)
+    let _mintedFlowToUser = mintFlow(to: user, amount: fundingAmount)
     let betaRef = grantBeta(flowYieldVaultsAccount, user)
     Test.expect(betaRef, Test.beSucceeded())
     
@@ -193,9 +193,9 @@ fun testMultipleExecutionsWithPriceChanges() {
     log("========================================")
     
     let user = Test.createAccount()
-    mintFlow(to: user, amount: 500.0)
-    grantBeta(flowYieldVaultsAccount, user)
-    
+    let _mintedFlowToUser = mintFlow(to: user, amount: 500.0)
+    let _grantedBetaToUser = grantBeta(flowYieldVaultsAccount, user)
+
     // Step 1: Create YieldVault
     log("Step 1: Creating YieldVault...")
     let createYieldVaultRes = executeTransaction(
diff --git a/cadence/tests/scheduled_rebalance_scenario_test.cdc b/cadence/tests/scheduled_rebalance_scenario_test.cdc
index 08d42bda..3401b620 100644
--- a/cadence/tests/scheduled_rebalance_scenario_test.cdc
+++ b/cadence/tests/scheduled_rebalance_scenario_test.cdc
@@ -46,7 +46,7 @@ fun setup() {
     deployContracts()
     
     // Fund FlowYieldVaults account for scheduling fees
-    mintFlow(to: flowYieldVaultsAccount, amount: 2000.0)
+    let _mintedFlowToVaultsAccount = mintFlow(to: flowYieldVaultsAccount, amount: 2000.0)
 
     // Set initial token prices (both at 1.0)
     setMockOraclePrice(signer: flowYieldVaultsAccount, forTokenIdentifier: yieldTokenIdentifier, price: 1.0)
@@ -56,7 +56,7 @@ fun setup() {
     let reserveAmount = 100_000_00.0
     setupMoetVault(protocolAccount, beFailed: false)
     setupYieldVault(protocolAccount, beFailed: false)
-    mintFlow(to: protocolAccount, amount: reserveAmount)
+    let _mintedFlowToProtocol = mintFlow(to: protocolAccount, amount: reserveAmount)
     mintMoet(signer: protocolAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
     mintYield(signer: yieldTokenAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
     setMockSwapperLiquidityConnector(signer: protocolAccount, vaultStoragePath: MOET.VaultStoragePath)
@@ -113,9 +113,9 @@ fun testRegistryReceivesYieldVaultRegistrationAtInit() {
     log("========================================")
     
     let user = Test.createAccount()
-    mintFlow(to: user, amount: 1000.0)
-    grantBeta(flowYieldVaultsAccount, user)
-    
+    let _mintedFlowToUser = mintFlow(to: user, amount: 1000.0)
+    let _grantedBetaToUser = grantBeta(flowYieldVaultsAccount, user)
+
     // Create a YieldVault - this triggers AutoBalancer initialization
     log("Creating YieldVault...")
     let createYieldVaultRes = executeTransaction(
@@ -158,9 +158,9 @@ fun testSingleAutoBalancerThreeExecutions() {
     log("========================================")
     
     let user = Test.createAccount()
-    mintFlow(to: user, amount: 1000.0)
-    grantBeta(flowYieldVaultsAccount, user)
-    
+    let _mintedFlowToUser = mintFlow(to: user, amount: 1000.0)
+    let _grantedBetaToUser = grantBeta(flowYieldVaultsAccount, user)
+
     // Create YieldVault
     log("Creating YieldVault...")
     let createYieldVaultRes = executeTransaction(
@@ -253,9 +253,9 @@ fun testThreeYieldVaultsNineExecutions() {
     log("========================================")
     
     let user = Test.createAccount()
-    mintFlow(to: user, amount: 3000.0)
-    grantBeta(flowYieldVaultsAccount, user)
-    
+    let _mintedFlowToUser = mintFlow(to: user, amount: 3000.0)
+    let _grantedBetaToUser = grantBeta(flowYieldVaultsAccount, user)
+
     // Create 3 yield vaults
     log("Creating 3 yield vaults...")
     var i = 0
@@ -373,9 +373,9 @@ fun testFiveYieldVaultsContinueWithoutSupervisor() {
     log("========================================")
     
     let user = Test.createAccount()
-    mintFlow(to: user, amount: 5000.0)
-    grantBeta(flowYieldVaultsAccount, user)
-    
+    let _mintedFlowToUser = mintFlow(to: user, amount: 5000.0)
+    let _grantedBetaToUser = grantBeta(flowYieldVaultsAccount, user)
+
     // Create 5 yield vaults
     log("Creating 5 yield vaults...")
     var i = 0
@@ -486,9 +486,9 @@ fun testFailedYieldVaultCannotRecoverWithoutSupervisor() {
     log("========================================")
     
     let user = Test.createAccount()
-    mintFlow(to: user, amount: 2000.0)
-    grantBeta(flowYieldVaultsAccount, user)
-    
+    let _mintedFlowToUser = mintFlow(to: user, amount: 2000.0)
+    let _grantedBetaToUser = grantBeta(flowYieldVaultsAccount, user)
+
     // Step 1: Create 3 yield vaults
     log("\nStep 1: Creating 3 yield vaults...")
     var i = 0
diff --git a/cadence/tests/scheduled_supervisor_test.cdc b/cadence/tests/scheduled_supervisor_test.cdc
index bb96543a..5b9ea3b7 100644
--- a/cadence/tests/scheduled_supervisor_test.cdc
+++ b/cadence/tests/scheduled_supervisor_test.cdc
@@ -32,7 +32,7 @@ fun setup() {
 
     // Fund FlowYieldVaults account BEFORE any YieldVaults are created, as registerYieldVault
     // now atomically schedules the first execution which requires FLOW for fees
-    mintFlow(to: flowYieldVaultsAccount, amount: 1000.0)
+    let _mintedFlowToVaults = mintFlow(to: flowYieldVaultsAccount, amount: 1000.0)
 
     // Mock Oracle
     setMockOraclePrice(signer: flowYieldVaultsAccount, forTokenIdentifier: yieldTokenIdentifier, price: 1.0)
@@ -42,7 +42,7 @@ fun setup() {
     let reserveAmount = 100_000_00.0
     setupMoetVault(protocolAccount, beFailed: false)
     setupYieldVault(protocolAccount, beFailed: false)
-    mintFlow(to: protocolAccount, amount: reserveAmount)
+    let _mintedFlowToProtocol = mintFlow(to: protocolAccount, amount: reserveAmount)
     mintMoet(signer: protocolAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
     mintYield(signer: yieldTokenAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
     setMockSwapperLiquidityConnector(signer: protocolAccount, vaultStoragePath: MOET.VaultStoragePath)
@@ -95,8 +95,8 @@ fun testAutoRegisterAndSupervisor() {
     log("\n Testing Auto-Register + Native Scheduling...")
 
     let user = Test.createAccount()
-    mintFlow(to: user, amount: 1000.0)
-    grantBeta(flowYieldVaultsAccount, user)
+    let _mintFlowResult = mintFlow(to: user, amount: 1000.0)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
     // 1. Create YieldVault (Should auto-register and self-schedule via native mechanism)
     log("Step 1: Create YieldVault")
@@ -152,8 +152,8 @@ fun testMultiYieldVaultNativeScheduling() {
     log("\n Testing Multiple YieldVaults Native Scheduling...")
 
     let user = Test.createAccount()
-    mintFlow(to: user, amount: 1000.0)
-    grantBeta(flowYieldVaultsAccount, user)
+    let _mintFlowResult = mintFlow(to: user, amount: 1000.0)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
     // Create 3 yield vaults (each auto-schedules via native mechanism)
     var i = 0
@@ -206,8 +206,8 @@ fun testMultiYieldVaultIndependentExecution() {
     log("\n Testing multiple yield vaults execute independently...")
 
     let user = Test.createAccount()
-    mintFlow(to: user, amount: 1000.0)
-    grantBeta(flowYieldVaultsAccount, user)
+    let _mintFlowResult = mintFlow(to: user, amount: 1000.0)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
     // Create 3 yield vaults (each auto-schedules via native mechanism)
     var i = 0
@@ -295,9 +295,9 @@ fun testPaginationStress() {
     log("Expecting at least ".concat(minTotalExecutions.toString()).concat(" total executions (").concat(minExecutionsPerYieldVault.toString()).concat(" per yield vault)"))
 
     let user = Test.createAccount()
-    mintFlow(to: user, amount: 10000.0)  // For 3 rounds of 18 yield vaults
-    grantBeta(flowYieldVaultsAccount, user)
-    mintFlow(to: flowYieldVaultsAccount, amount: 50000.0)  // Increased for scheduling fees
+    let _mintFlowUserResult = mintFlow(to: user, amount: 10000.0)  // For 3 rounds of 18 yield vaults
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
+    let _mintFlowProtocolResult = mintFlow(to: flowYieldVaultsAccount, amount: 50000.0)  // Increased for scheduling fees
 
     // Create yield vaults
     log("Creating ".concat(numYieldVaults.toString()).concat(" yield vaults..."))
@@ -419,9 +419,9 @@ fun testSupervisorDoesNotDisruptHealthyYieldVaults() {
     log("\n Testing Supervisor with healthy yield vaults (nothing to recover)...")
 
     let user = Test.createAccount()
-    mintFlow(to: user, amount: 1000.0)
-    grantBeta(flowYieldVaultsAccount, user)
-    mintFlow(to: flowYieldVaultsAccount, amount: 200.0)
+    let _mintFlowUserResult = mintFlow(to: user, amount: 1000.0)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
+    let _mintFlowProtocolResult = mintFlow(to: flowYieldVaultsAccount, amount: 200.0)
 
     // 1. Create a healthy yield vault (AutoBalancer schedules itself natively)
     log("Step 1: Creating healthy yield vault...")
@@ -549,8 +549,8 @@ fun testStuckYieldVaultDetectionLogic() {
     log("\n Testing stuck yield vault detection logic...")
 
     let user = Test.createAccount()
-    mintFlow(to: user, amount: 1000.0)
-    grantBeta(flowYieldVaultsAccount, user)
+    let _mintFlowResult = mintFlow(to: user, amount: 1000.0)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
     // 1. Create a healthy yield vault
     log("Step 1: Creating healthy yield vault...")
@@ -645,8 +645,8 @@ fun testInsufficientFundsAndRecovery() {
     log("========================================")
 
     let user = Test.createAccount()
-    mintFlow(to: user, amount: 5000.0)
-    grantBeta(flowYieldVaultsAccount, user)
+    let _mintFlowResult = mintFlow(to: user, amount: 5000.0)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
     // Check initial FlowYieldVaults balance
     let initialBalance = (executeScript(
@@ -802,7 +802,7 @@ fun testInsufficientFundsAndRecovery() {
     // STEP 7: REFUND the account
     // ========================================
     log("\n--- STEP 7: Refunding FlowYieldVaults account ---")
-    mintFlow(to: flowYieldVaultsAccount, amount: 200.0)
+    let _mintedFlowRefund = mintFlow(to: flowYieldVaultsAccount, amount: 200.0)
 
     let balanceAfterRefund = (executeScript(
         "../scripts/flow-yield-vaults/get_flow_balance.cdc",
@@ -984,9 +984,9 @@ fun testSupervisorHandlesManyStuckVaults() {
 
     // 1. Setup: user, FLOW, and grant
     let user = Test.createAccount()
-    mintFlow(to: user, amount: 100000.0)
-    grantBeta(flowYieldVaultsAccount, user)
-    mintFlow(to: flowYieldVaultsAccount, amount: 10000.0)
+    let _mintFlowUserResult = mintFlow(to: user, amount: 100000.0)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
+    let _mintFlowProtocolResult = mintFlow(to: flowYieldVaultsAccount, amount: 10000.0)
 
     // 2. Create n yield vaults in batch (Test.executeTransactions)
     var i = 0
@@ -1042,7 +1042,7 @@ fun testSupervisorHandlesManyStuckVaults() {
     }
 
     // 6. Refund FLOW and schedule supervisor
-    mintFlow(to: flowYieldVaultsAccount, amount: 500.0)
+    let _mintedFlowRefund = mintFlow(to: flowYieldVaultsAccount, amount: 500.0)
     Test.commitBlock()
     Test.moveTime(by: 1.0)
     Test.commitBlock()
diff --git a/cadence/tests/scheduler_edge_cases_test.cdc b/cadence/tests/scheduler_edge_cases_test.cdc
index c1348263..baf48094 100644
--- a/cadence/tests/scheduler_edge_cases_test.cdc
+++ b/cadence/tests/scheduler_edge_cases_test.cdc
@@ -28,7 +28,7 @@ fun setup() {
     deployContracts()
     
     // Fund FlowYieldVaults account for scheduling fees
-    mintFlow(to: flowYieldVaultsAccount, amount: 1000.0)
+    let _mintedFlowToVaultsAccount = mintFlow(to: flowYieldVaultsAccount, amount: 1000.0)
 
     // Set mocked token prices
     setMockOraclePrice(signer: flowYieldVaultsAccount, forTokenIdentifier: yieldTokenIdentifier, price: 1.0)
@@ -38,7 +38,7 @@ fun setup() {
     let reserveAmount = 100_000_00.0
     setupMoetVault(protocolAccount, beFailed: false)
     setupYieldVault(protocolAccount, beFailed: false)
-    mintFlow(to: protocolAccount, amount: reserveAmount)
+    let _mintedFlowToProtocol = mintFlow(to: protocolAccount, amount: reserveAmount)
     mintMoet(signer: protocolAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
     mintYield(signer: yieldTokenAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
     setMockSwapperLiquidityConnector(signer: protocolAccount, vaultStoragePath: MOET.VaultStoragePath)
@@ -90,9 +90,9 @@ fun testYieldVaultHasNativeScheduleAfterCreation() {
     log("\n[TEST] YieldVault has native schedule immediately after creation...")
     
     let user = Test.createAccount()
-    mintFlow(to: user, amount: 200.0)
-    grantBeta(flowYieldVaultsAccount, user)
-    
+    let _mintedFlowToUser = mintFlow(to: user, amount: 200.0)
+    let _grantedBetaToUser = grantBeta(flowYieldVaultsAccount, user)
+
     // Create a YieldVault
     let createRes = executeTransaction(
         "../transactions/flow-yield-vaults/create_yield_vault.cdc",
@@ -100,11 +100,11 @@ fun testYieldVaultHasNativeScheduleAfterCreation() {
         user
     )
     Test.expect(createRes, Test.beSucceeded())
-    
+
     let yieldVaultIDs = getYieldVaultIDs(address: user.address)!
     let yieldVaultID = yieldVaultIDs[0]
     log("YieldVault created: ".concat(yieldVaultID.toString()))
-    
+
     // Verify yield vault is registered and has active schedule (native self-scheduling)
     let hasActive = (executeScript(
         "../scripts/flow-yield-vaults/has_active_schedule.cdc",
@@ -125,19 +125,19 @@ fun testCapabilityReuse() {
     log("\n[TEST] Capability reuse on re-registration...")
     
     let user = Test.createAccount()
-    mintFlow(to: user, amount: 200.0)
-    grantBeta(flowYieldVaultsAccount, user)
-    
+    let _mintedFlowToUser = mintFlow(to: user, amount: 200.0)
+    let _grantedBetaToUser = grantBeta(flowYieldVaultsAccount, user)
+
     let createRes = executeTransaction(
         "../transactions/flow-yield-vaults/create_yield_vault.cdc",
         [strategyIdentifier, flowTokenIdentifier, 100.0],
         user
     )
     Test.expect(createRes, Test.beSucceeded())
-    
+
     let yieldVaultIDs = getYieldVaultIDs(address: user.address)!
     let yieldVaultID = yieldVaultIDs[0]
-    
+
     // Check registration
     let regIDsRes = executeScript("../scripts/flow-yield-vaults/get_registered_yield_vault_ids.cdc", [])
     Test.expect(regIDsRes, Test.beSucceeded())
@@ -164,9 +164,9 @@ fun testCloseYieldVaultUnregisters() {
     log("\n[TEST] Close yield vault properly unregisters from registry...")
     
     let user = Test.createAccount()
-    mintFlow(to: user, amount: 400.0)
-    grantBeta(flowYieldVaultsAccount, user)
-    
+    let _mintedFlowToUser = mintFlow(to: user, amount: 400.0)
+    let _grantedBetaToUser = grantBeta(flowYieldVaultsAccount, user)
+
     // Create a yield vault
     let createRes = executeTransaction(
         "../transactions/flow-yield-vaults/create_yield_vault.cdc",
@@ -212,25 +212,25 @@ fun testMultipleUsersMultipleYieldVaults() {
     
     let user1 = Test.createAccount()
     let user2 = Test.createAccount()
-    mintFlow(to: user1, amount: 500.0)
-    mintFlow(to: user2, amount: 500.0)
-    grantBeta(flowYieldVaultsAccount, user1)
-    grantBeta(flowYieldVaultsAccount, user2)
-    
+    let _mintedFlowToUser1 = mintFlow(to: user1, amount: 500.0)
+    let _mintedFlowToUser2 = mintFlow(to: user2, amount: 500.0)
+    let _grantedBetaToUser1 = grantBeta(flowYieldVaultsAccount, user1)
+    let _grantedBetaToUser2 = grantBeta(flowYieldVaultsAccount, user2)
+
     // User1 creates 2 yield vaults
-    executeTransaction(
+    let _createdVault1User1 = executeTransaction(
         "../transactions/flow-yield-vaults/create_yield_vault.cdc",
         [strategyIdentifier, flowTokenIdentifier, 100.0],
         user1
     )
-    executeTransaction(
+    let _createdVault2User1 = executeTransaction(
         "../transactions/flow-yield-vaults/create_yield_vault.cdc",
         [strategyIdentifier, flowTokenIdentifier, 100.0],
         user1
     )
-    
+
     // User2 creates 1 yield vault
-    executeTransaction(
+    let _createdVault1User2 = executeTransaction(
         "../transactions/flow-yield-vaults/create_yield_vault.cdc",
         [strategyIdentifier, flowTokenIdentifier, 100.0],
         user2
@@ -263,9 +263,9 @@ fun testHealthyYieldVaultsSelfSchedule() {
     log("\n[TEST] Healthy yield vaults continue executing without Supervisor...")
     
     let user = Test.createAccount()
-    mintFlow(to: user, amount: 500.0)
-    grantBeta(flowYieldVaultsAccount, user)
-    
+    let _mintedFlowToUser = mintFlow(to: user, amount: 500.0)
+    let _grantedBetaToUser = grantBeta(flowYieldVaultsAccount, user)
+
     // Create a yield vault
     let createRes = executeTransaction(
         "../transactions/flow-yield-vaults/create_yield_vault.cdc",
diff --git a/cadence/tests/scheduler_mixed_population_regression_test.cdc b/cadence/tests/scheduler_mixed_population_regression_test.cdc
index 460b5025..44d725f1 100644
--- a/cadence/tests/scheduler_mixed_population_regression_test.cdc
+++ b/cadence/tests/scheduler_mixed_population_regression_test.cdc
@@ -47,7 +47,7 @@ fun setup() {
     log("Setting up mixed-population scheduler regression test...")
 
     deployContracts()
-    mintFlow(to: flowYieldVaultsAccount, amount: 1000.0)
+    let _mintedFlowToVaultsAccount = mintFlow(to: flowYieldVaultsAccount, amount: 1000.0)
 
     setMockOraclePrice(signer: flowYieldVaultsAccount, forTokenIdentifier: yieldTokenIdentifier, price: 1.0)
     setMockOraclePrice(signer: flowYieldVaultsAccount, forTokenIdentifier: flowTokenIdentifier, price: 1.0)
@@ -55,7 +55,7 @@ fun setup() {
     let reserveAmount = 100_000_00.0
     setupMoetVault(protocolAccount, beFailed: false)
     setupYieldVault(protocolAccount, beFailed: false)
-    mintFlow(to: protocolAccount, amount: reserveAmount)
+    let _mintedFlowToProtocol = mintFlow(to: protocolAccount, amount: reserveAmount)
     mintMoet(signer: protocolAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
     mintYield(signer: yieldTokenAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
     setMockSwapperLiquidityConnector(signer: protocolAccount, vaultStoragePath: MOET.VaultStoragePath)
@@ -151,8 +151,8 @@ fun testSupervisorScansPastNonRecurringTailEntries() {
 
     let blockerCount = FlowYieldVaultsSchedulerRegistry.MAX_BATCH_SIZE + 1
     let user = Test.createAccount()
-    mintFlow(to: user, amount: 2000.0)
-    grantBeta(flowYieldVaultsAccount, user)
+    let _mintedFlowToUser = mintFlow(to: user, amount: 2000.0)
+    let _grantedBetaToUser = grantBeta(flowYieldVaultsAccount, user)
 
     // Step 1: create more than one full scan batch of normal recurring mock vaults.
     // We will convert these into permanently ineligible "blockers" without removing them
@@ -234,7 +234,7 @@ fun testSupervisorScansPastNonRecurringTailEntries() {
     // Step 5: fund the account again and start the Supervisor. A correct implementation
     // should eventually scan past the blockers, detect the real stuck recurring vault, and
     // recover it.
-    mintFlow(to: flowYieldVaultsAccount, amount: 200.0)
+    let _mintedFlowForRecovery = mintFlow(to: flowYieldVaultsAccount, amount: 200.0)
     Test.commitBlock()
 
     let recoveredEventsBefore = Test.eventsOfType(Type<FlowYieldVaultsSchedulerV1.YieldVaultRecovered>()).length
diff --git a/cadence/tests/simulation_btc_daily_2025.cdc b/cadence/tests/simulation_btc_daily_2025.cdc
index 1615a630..b35c1d05 100644
--- a/cadence/tests/simulation_btc_daily_2025.cdc
+++ b/cadence/tests/simulation_btc_daily_2025.cdc
@@ -251,7 +251,7 @@ fun test_BtcDaily2025_DailyRebalancing() {
         let user = Test.createAccount()
         transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: 10.0)
         mintBTC(signer: user, amount: fundingPerAgent)
-        grantBeta(flowYieldVaultsAccount, user)
+        let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
         setVaultSharePrice(
             vaultAddress: morphoVaultAddress,
diff --git a/cadence/tests/test_helpers.cdc b/cadence/tests/test_helpers.cdc
index ef1abd75..c4c68702 100644
--- a/cadence/tests/test_helpers.cdc
+++ b/cadence/tests/test_helpers.cdc
@@ -207,7 +207,7 @@ access(all) fun deployContracts() {
     let wflowAddress = getEVMAddressAssociated(withType: Type<@FlowToken.Vault>().identifier)
         ?? panic("Failed to get WFLOW address via VM Bridge association with FlowToken.Vault")
     setupBetaAccess()
-    setupPunchswap(deployer: serviceAccount, wflowAddress: wflowAddress)
+    let _punchswapAddresses = setupPunchswap(deployer: serviceAccount, wflowAddress: wflowAddress)
 }
 
 access(all) fun deployContractsForFork() {
diff --git a/cadence/tests/tracer_strategy_test.cdc b/cadence/tests/tracer_strategy_test.cdc
index 49650592..12eebde9 100644
--- a/cadence/tests/tracer_strategy_test.cdc
+++ b/cadence/tests/tracer_strategy_test.cdc
@@ -106,7 +106,7 @@ fun setup() {
 	// mint tokens & set liquidity in mock swapper contract
 	let reserveAmount = 100_000_00.0
 	setupYieldVault(protocolAccount, beFailed: false)
-	mintFlow(to: protocolAccount, amount: reserveAmount)
+	let _mintFlowResult = mintFlow(to: protocolAccount, amount: reserveAmount)
 	mintMoet(signer: protocolAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
 	mintYield(signer: yieldTokenAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
 	setMockSwapperLiquidityConnector(signer: protocolAccount, vaultStoragePath: MOET.VaultStoragePath)
@@ -144,7 +144,7 @@ fun setup() {
 	)
 
 	// Fund FlowYieldVaults account for scheduling fees (atomic initial scheduling)
-	mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
+	let _mintedFlowForFees = mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
 
 	snapshot = getCurrentBlockHeight()
 }
@@ -159,8 +159,8 @@ fun test_CreateYieldVaultSucceeds() {
 	let fundingAmount = 100.0
 
 	let user = Test.createAccount()
-	mintFlow(to: user, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+	let _mintedFlowForUser = mintFlow(to: user, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
 	createYieldVault(
 		signer: user,
@@ -182,8 +182,8 @@ fun test_CloseYieldVaultSucceeds() {
 	let fundingAmount = 100.0
 
 	let user = Test.createAccount()
-	mintFlow(to: user, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+	let _mintedFlowForUser = mintFlow(to: user, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
 	createYieldVault(
 		signer: user,
@@ -219,8 +219,8 @@ fun test_RebalanceYieldVaultSucceeds() {
 
 	// Likely 0.0
 	let flowBalanceBefore = getBalance(address: user.address, vaultPublicPath: /public/flowTokenReceiver)!
-	mintFlow(to: user, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+	let _mintedFlowForUser = mintFlow(to: user, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
     createYieldVault(signer: user,
         strategyIdentifier: strategyIdentifier,
@@ -305,8 +305,8 @@ fun test_RebalanceYieldVaultSucceedsAfterYieldPriceDecrease() {
 
 	// Likely 0.0
 	let flowBalanceBefore = getBalance(address: user.address, vaultPublicPath: /public/flowTokenReceiver)!
-	mintFlow(to: user, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+	let _mintedFlowForUser = mintFlow(to: user, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
 	createYieldVault(
 		signer: user,
@@ -374,8 +374,8 @@ fun test_RebalanceYieldVaultSucceedsAfterCollateralPriceIncrease() {
 
     // Likely 0.0
     let _flowBalanceBefore = getBalance(address: user.address, vaultPublicPath: /public/flowTokenReceiver)!
-    mintFlow(to: user, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+    let _mintedFlowForUser = mintFlow(to: user, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
     createYieldVault(
         signer: user,
diff --git a/cadence/tests/transactions/execute_morpho_deposit.cdc b/cadence/tests/transactions/execute_morpho_deposit.cdc
index b6f673fd..79503857 100644
--- a/cadence/tests/transactions/execute_morpho_deposit.cdc
+++ b/cadence/tests/transactions/execute_morpho_deposit.cdc
@@ -33,8 +33,8 @@ transaction(
 
         if signer.storage.borrow<&{FungibleToken.Vault}>(from: sharesVaultData.storagePath) == nil {
             signer.storage.save(<-sharesVaultData.createEmptyVault(), to: sharesVaultData.storagePath)
-            signer.capabilities.unpublish(sharesVaultData.receiverPath)
-            signer.capabilities.unpublish(sharesVaultData.metadataPath)
+            let _unpublishedReceiver = signer.capabilities.unpublish(sharesVaultData.receiverPath)
+            let _unpublishedMetadata = signer.capabilities.unpublish(sharesVaultData.metadataPath)
             let receiverCap = signer.capabilities.storage.issue<&{FungibleToken.Vault}>(sharesVaultData.storagePath)
             signer.capabilities.publish(receiverCap, at: sharesVaultData.receiverPath)
             signer.capabilities.publish(receiverCap, at: sharesVaultData.metadataPath)
diff --git a/cadence/tests/transactions/execute_univ3_swap.cdc b/cadence/tests/transactions/execute_univ3_swap.cdc
index 2d6c0e26..3f92ee9e 100644
--- a/cadence/tests/transactions/execute_univ3_swap.cdc
+++ b/cadence/tests/transactions/execute_univ3_swap.cdc
@@ -52,8 +52,8 @@ transaction(
             ?? panic("No FTVaultData for out token")
         if signer.storage.borrow<&{FungibleToken.Vault}>(from: vaultData.storagePath) == nil {
             signer.storage.save(<-vaultData.createEmptyVault(), to: vaultData.storagePath)
-            signer.capabilities.unpublish(vaultData.receiverPath)
-            signer.capabilities.unpublish(vaultData.metadataPath)
+            let _unpublishedReceiver = signer.capabilities.unpublish(vaultData.receiverPath)
+            let _unpublishedMetadata = signer.capabilities.unpublish(vaultData.metadataPath)
             let receiverCap = signer.capabilities.storage.issue<&{FungibleToken.Vault}>(vaultData.storagePath)
             let metadataCap = signer.capabilities.storage.issue<&{FungibleToken.Vault}>(vaultData.storagePath)
             signer.capabilities.publish(receiverCap, at: vaultData.receiverPath)
diff --git a/cadence/tests/transactions/swap_flow_to_pyusd0.cdc b/cadence/tests/transactions/swap_flow_to_pyusd0.cdc
index 8637a277..659cd2ef 100644
--- a/cadence/tests/transactions/swap_flow_to_pyusd0.cdc
+++ b/cadence/tests/transactions/swap_flow_to_pyusd0.cdc
@@ -66,8 +66,8 @@ transaction(flowAmount: UFix64) {
             ?? panic("Could not resolve FTVaultData for PYUSD0")
         if signer.storage.borrow<&{FungibleToken.Vault}>(from: vaultData.storagePath) == nil {
             signer.storage.save(<-vaultData.createEmptyVault(), to: vaultData.storagePath)
-            signer.capabilities.unpublish(vaultData.receiverPath)
-            signer.capabilities.unpublish(vaultData.metadataPath)
+            let _unpublishedReceiver = signer.capabilities.unpublish(vaultData.receiverPath)
+            let _unpublishedMetadata = signer.capabilities.unpublish(vaultData.metadataPath)
             let receiverCap = signer.capabilities.storage.issue<&{FungibleToken.Vault}>(vaultData.storagePath)
             let metadataCap = signer.capabilities.storage.issue<&{FungibleToken.Vault}>(vaultData.storagePath)
             signer.capabilities.publish(receiverCap, at: vaultData.receiverPath)
diff --git a/cadence/tests/yield_vault_lifecycle_test.cdc b/cadence/tests/yield_vault_lifecycle_test.cdc
index 29a2d799..219d3059 100644
--- a/cadence/tests/yield_vault_lifecycle_test.cdc
+++ b/cadence/tests/yield_vault_lifecycle_test.cdc
@@ -39,7 +39,7 @@ fun setup() {
     // mint tokens & set liquidity in mock swapper contract
     let reserveAmount = 100_000_00.0
     setupYieldVault(protocolAccount, beFailed: false)
-    mintFlow(to: protocolAccount, amount: reserveAmount)
+    let _mintedFlowReserve = mintFlow(to: protocolAccount, amount: reserveAmount)
     mintMoet(signer: protocolAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
     mintYield(signer: yieldTokenAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
     setMockSwapperLiquidityConnector(signer: protocolAccount, vaultStoragePath: MOET.VaultStoragePath)
@@ -75,11 +75,11 @@ fun setup() {
         issuerStoragePath: MockStrategies.IssuerStoragePath,
         beFailed: false
     )
-    
+
     // Scheduler contracts are deployed as part of deployContracts()
 
     // Fund FlowYieldVaults account for scheduling fees (atomic initial scheduling)
-    mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
+    let _mintedFlowFees = mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
 
     snapshot = getCurrentBlockHeight()
 }
@@ -91,8 +91,8 @@ fun testLifecycle() {
     let withdrawAmount = 10.0
     
     let user = Test.createAccount()
-    mintFlow(to: user, amount: initialFunding + depositAmount + 10.0) // extra for fees/buffer
-    grantBeta(flowYieldVaultsAccount, user)
+    let _mintedFlowUser = mintFlow(to: user, amount: initialFunding + depositAmount + 10.0) // extra for fees/buffer
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
     // 1. Create YieldVault
     createYieldVault(
diff --git a/cadence/tests/yield_vault_management_test.cdc b/cadence/tests/yield_vault_management_test.cdc
index 44aa2888..042f1062 100644
--- a/cadence/tests/yield_vault_management_test.cdc
+++ b/cadence/tests/yield_vault_management_test.cdc
@@ -33,8 +33,8 @@ fun test_CreateYieldVaultSucceeds() {
     let fundingAmount = 100.0
 
     let user = Test.createAccount()
-    mintFlow(to: user, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+    let _mintFlowResult = mintFlow(to: user, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
     createYieldVault(
         signer: user,
@@ -56,8 +56,8 @@ fun test_CloseYieldVaultSucceeds() {
     let fundingAmount = 100.0
 
     let user = Test.createAccount()
-    mintFlow(to: user, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+    let _mintedFlowClose = mintFlow(to: user, amount: fundingAmount)
+    let _grantedBetaClose = grantBeta(flowYieldVaultsAccount, user)
 
     createYieldVault(
         signer: user,
diff --git a/cadence/transactions/flow-yield-vaults/create_yield_vault.cdc b/cadence/transactions/flow-yield-vaults/create_yield_vault.cdc
index 84b13ab6..58e71906 100644
--- a/cadence/transactions/flow-yield-vaults/create_yield_vault.cdc
+++ b/cadence/transactions/flow-yield-vaults/create_yield_vault.cdc
@@ -53,7 +53,7 @@ transaction(strategyIdentifier: String, vaultIdentifier: String, amount: UFix64)
             let cap = signer.capabilities.storage.issue<&FlowYieldVaults.YieldVaultManager>(FlowYieldVaults.YieldVaultManagerStoragePath)
             signer.capabilities.publish(cap, at: FlowYieldVaults.YieldVaultManagerPublicPath)
             // issue an authorized capability for later access via Capability controller if needed (e.g. via HybridCustody)
-            signer.capabilities.storage.issue<&FlowYieldVaults.YieldVaultManager>(
+            let _managerCap = signer.capabilities.storage.issue<&FlowYieldVaults.YieldVaultManager>(
                     FlowYieldVaults.YieldVaultManagerStoragePath
                 )
         }
@@ -62,6 +62,6 @@ transaction(strategyIdentifier: String, vaultIdentifier: String, amount: UFix64)
     }
 
     execute {
-        self.manager.createYieldVault(betaRef: self.betaRef, strategyType: self.strategy, withVault: <-self.depositVault)
+        let _yieldVaultID = self.manager.createYieldVault(betaRef: self.betaRef, strategyType: self.strategy, withVault: <-self.depositVault)
     }
 }
diff --git a/cadence/transactions/flow-yield-vaults/setup.cdc b/cadence/transactions/flow-yield-vaults/setup.cdc
index ef2d8be8..e7ac1f45 100644
--- a/cadence/transactions/flow-yield-vaults/setup.cdc
+++ b/cadence/transactions/flow-yield-vaults/setup.cdc
@@ -23,7 +23,7 @@ transaction {
         let cap = signer.capabilities.storage.issue<&FlowYieldVaults.YieldVaultManager>(FlowYieldVaults.YieldVaultManagerStoragePath)
         signer.capabilities.publish(cap, at: FlowYieldVaults.YieldVaultManagerPublicPath)
         // issue an authorized capability for later access via Capability controller if needed (e.g. via HybridCustody)
-        signer.capabilities.storage.issue<auth(FungibleToken.Withdraw) &FlowYieldVaults.YieldVaultManager>(FlowYieldVaults.YieldVaultManagerStoragePath)
+        let _withdrawManagerCap = signer.capabilities.storage.issue<auth(FungibleToken.Withdraw) &FlowYieldVaults.YieldVaultManager>(FlowYieldVaults.YieldVaultManagerStoragePath)
 
         // confirm setup of YieldVaultManager at canonical path
         let storedType = signer.storage.type(at: FlowYieldVaults.YieldVaultManagerStoragePath) ?? Type<Never>()
diff --git a/cadence/transactions/mocks/add_gw_keys.cdc b/cadence/transactions/mocks/add_gw_keys.cdc
index b415d228..6dcc3a88 100644
--- a/cadence/transactions/mocks/add_gw_keys.cdc
+++ b/cadence/transactions/mocks/add_gw_keys.cdc
@@ -3,7 +3,7 @@ transaction {
         let firstKey = signer.keys.get(keyIndex: 0)!
         let range: InclusiveRange<Int> = InclusiveRange(1, 100, step: 1)
         for element in range {
-            signer.keys.add(
+            let _addedKey = signer.keys.add(
                 publicKey: firstKey.publicKey,
                 hashAlgorithm: HashAlgorithm.SHA3_256,
                 weight: 1000.0
diff --git a/cadence/transactions/mocks/incrementfi/setup.cdc b/cadence/transactions/mocks/incrementfi/setup.cdc
index 91505ddf..cfe3a893 100644
--- a/cadence/transactions/mocks/incrementfi/setup.cdc
+++ b/cadence/transactions/mocks/incrementfi/setup.cdc
@@ -13,15 +13,15 @@ transaction(swapPairTemplateHex: String) {
             signer.storage.save(<-MOET.createEmptyVault(vaultType: Type<@MOET.Vault>()), to: MOET.VaultStoragePath)
         }
         // Issue a public Vault capability and publish it to the vault's default public path
-        signer.capabilities.unpublish(YieldToken.ReceiverPublicPath)
-        signer.capabilities.unpublish(MOET.ReceiverPublicPath)
+        let _unpublishedYieldToken = signer.capabilities.unpublish(YieldToken.ReceiverPublicPath)
+        let _unpublishedMoet = signer.capabilities.unpublish(MOET.ReceiverPublicPath)
         let moetReceiverCap = signer.capabilities.storage.issue<&{FungibleToken.Vault}>(MOET.VaultStoragePath)
         signer.capabilities.publish(moetReceiverCap, at: MOET.ReceiverPublicPath)
 
         let yieldTokenReceiverCap = signer.capabilities.storage.issue<&{FungibleToken.Vault}>(YieldToken.VaultStoragePath)
         signer.capabilities.publish(yieldTokenReceiverCap, at: YieldToken.ReceiverPublicPath)
 
-        signer.contracts.add(
+        let _deployedSwapPair = signer.contracts.add(
             name: "SwapPair",
             code: swapPairTemplateHex.decodeHex(),
             token0Vault: MOET.createEmptyVault(vaultType: Type<@MOET.Vault>()),
diff --git a/cadence/transactions/mocks/position/create_wrapped_position.cdc b/cadence/transactions/mocks/position/create_wrapped_position.cdc
index c72de829..a2a7bab2 100644
--- a/cadence/transactions/mocks/position/create_wrapped_position.cdc
+++ b/cadence/transactions/mocks/position/create_wrapped_position.cdc
@@ -30,7 +30,7 @@ transaction(amount: UFix64, vaultStoragePath: StoragePath, pushToDrawDownSink: B
             // issue un-entitled Capability
             let vaultCap = signer.capabilities.storage.issue<&MOET.Vault>(MOET.VaultStoragePath)
             // publish receiver Capability, unpublishing any that may exist to prevent collision
-            signer.capabilities.unpublish(MOET.VaultPublicPath)
+            let _unpublishedMoet = signer.capabilities.unpublish(MOET.VaultPublicPath)
             signer.capabilities.publish(vaultCap, at: MOET.VaultPublicPath)
         }
         // assign a Vault Capability to be used in the VaultSink
diff --git a/cadence/transactions/yield-token/setup_vault.cdc b/cadence/transactions/yield-token/setup_vault.cdc
index f2f6941e..6c956963 100644
--- a/cadence/transactions/yield-token/setup_vault.cdc
+++ b/cadence/transactions/yield-token/setup_vault.cdc
@@ -13,10 +13,10 @@ transaction {
             signer.storage.save(<-YieldToken.createEmptyVault(vaultType: Type<@YieldToken.Vault>()), to: YieldToken.VaultStoragePath)
             // publish a public capability on the Vault
             let cap = signer.capabilities.storage.issue<&{FungibleToken.Vault}>(YieldToken.VaultStoragePath)
-            signer.capabilities.unpublish(YieldToken.ReceiverPublicPath)
+            let _unpublishedReceiver = signer.capabilities.unpublish(YieldToken.ReceiverPublicPath)
             signer.capabilities.publish(cap, at: YieldToken.ReceiverPublicPath)
             // issue an authorized capability to initialize a CapabilityController on the account, but do not publish
-            signer.capabilities.storage.issue<auth(FungibleToken.Withdraw) &{FungibleToken.Vault}>(YieldToken.VaultStoragePath)
+            let _withdrawCap = signer.capabilities.storage.issue<auth(FungibleToken.Withdraw) &{FungibleToken.Vault}>(YieldToken.VaultStoragePath)
         }
         // ensure proper configuration
         assert(signer.storage.type(at: YieldToken.VaultStoragePath) == Type<@YieldToken.Vault>(),