@rev-net/core-v6 0.0.9 → 0.0.11

package/test/REVInvincibility.t.sol

@@ -373,7 +373,7 @@ contract REVInvincibility_PropertyTests is TestBaseWorkflow {
     /// @notice hasMintPermissionFor returns false for random addresses.
     /// @dev With the buyback hook removed, hasMintPermissionFor should return false
     ///      for addresses that are not the loans contract or a sucker.
-    function test_fixVerify_hasMintPermission_noBuyback() public {
+    function test_fixVerify_hasMintPermission_noBuyback() public view {
         // The fee project was deployed without buyback hook in our setup
         JBRuleset memory currentRuleset = jbRulesets().currentOf(FEE_PROJECT_ID);
 
@@ -574,7 +574,7 @@ contract REVInvincibility_PropertyTests is TestBaseWorkflow {
     function test_econ_loanAmplificationSpiral() public {
         // Step 1: Pay to get tokens
         uint256 payAmount = 10e18;
-        (uint256 loanId1, uint256 tokens1, uint256 borrow1) = _setupLoan(USER, payAmount, 25);
+        (,, uint256 borrow1) = _setupLoan(USER, payAmount, 25);
         assertTrue(borrow1 > 0, "First loan should have borrow amount");
 
         // Step 2: Add borrowed amount back to balance (inflating surplus)
@@ -588,8 +588,7 @@ contract REVInvincibility_PropertyTests is TestBaseWorkflow {
             jbMultiTerminal().pay{value: payAmount}(REVNET_ID, JBConstants.NATIVE_TOKEN, payAmount, USER, 0, "", "");
 
         // Step 4: Try to borrow again
-        uint256 borrowable2 =
-            LOANS_CONTRACT.borrowableAmountFrom(REVNET_ID, tokens2, 18, uint32(uint160(JBConstants.NATIVE_TOKEN)));
+        LOANS_CONTRACT.borrowableAmountFrom(REVNET_ID, tokens2, 18, uint32(uint160(JBConstants.NATIVE_TOKEN)));
 
         // The totalBorrowed from loan1 is added to surplus in borrowableAmountFrom,
         // so the second borrow should not amplify beyond what the real surplus supports.
@@ -619,7 +618,7 @@ contract REVInvincibility_PropertyTests is TestBaseWorkflow {
         jbMultiTerminal().pay{value: 0.01e18}(REVNET_ID, JBConstants.NATIVE_TOKEN, 0.01e18, payor, 0, "", "");
 
         // Get current ruleset to verify we're in stage 1
-        JBRuleset memory currentRuleset = jbRulesets().currentOf(REVNET_ID);
+        jbRulesets().currentOf(REVNET_ID);
 
         // Cash out at the new (lower) tax rate
         // Note: there's a 30-day cash out delay, so we advance more
@@ -653,8 +652,7 @@ contract REVInvincibility_PropertyTests is TestBaseWorkflow {
     function test_econ_reservedTokenDilution() public {
         // Pay to create surplus + mint tokens (some go to reserved)
         vm.prank(USER);
-        uint256 userTokens =
-            jbMultiTerminal().pay{value: 10e18}(REVNET_ID, JBConstants.NATIVE_TOKEN, 10e18, USER, 0, "", "");
+        jbMultiTerminal().pay{value: 10e18}(REVNET_ID, JBConstants.NATIVE_TOKEN, 10e18, USER, 0, "", "");
 
         // Send reserved tokens to splits
         try jbController().sendReservedTokensToSplitsOf(REVNET_ID) {} catch {}
@@ -721,8 +719,7 @@ contract REVInvincibility_PropertyTests is TestBaseWorkflow {
             jbMultiTerminal().pay{value: 10e18}(REVNET_ID, JBConstants.NATIVE_TOKEN, 10e18, userA, 0, "", "");
 
         vm.prank(userB);
-        uint256 tokensB =
-            jbMultiTerminal().pay{value: 10e18}(REVNET_ID, JBConstants.NATIVE_TOKEN, 10e18, userB, 0, "", "");
+        jbMultiTerminal().pay{value: 10e18}(REVNET_ID, JBConstants.NATIVE_TOKEN, 10e18, userB, 0, "", "");
 
         // UserA borrows (tokens locked as collateral)
         mockExpect(
@@ -757,7 +754,7 @@ contract REVInvincibility_PropertyTests is TestBaseWorkflow {
     /// @dev Extraction should be bounded by the bonding curve.
     function test_econ_collateralRotation() public {
         // Setup initial loan
-        (uint256 loanId, uint256 tokens, uint256 borrowAmount) = _setupLoan(USER, 5e18, 25);
+        (uint256 loanId,, uint256 borrowAmount) = _setupLoan(USER, 5e18, 25);
         if (borrowAmount == 0) return;
 
         // Surplus increases (someone else pays in)
@@ -787,7 +784,7 @@ contract REVInvincibility_PropertyTests is TestBaseWorkflow {
     /// @dev Borrow all available surplus → new payments and repayment still functional.
     function test_econ_zeroSurplusLoanDefault() public {
         // Pay and borrow maximum
-        (uint256 loanId, uint256 tokens, uint256 borrowAmount) = _setupLoan(USER, 10e18, 25);
+        (,, uint256 borrowAmount) = _setupLoan(USER, 10e18, 25);
         if (borrowAmount == 0) return;
 
         // New user can still pay into the system
@@ -802,7 +799,7 @@ contract REVInvincibility_PropertyTests is TestBaseWorkflow {
     /// @notice Loans across stage boundary: loans stay healthy when tax rate decreases.
     function test_econ_stageTransitionWithLoans() public {
         // Create loan in stage 0
-        (uint256 loanId, uint256 tokens, uint256 borrowAmount) = _setupLoan(USER, 10e18, 25);
+        (uint256 loanId,, uint256 borrowAmount) = _setupLoan(USER, 10e18, 25);
         if (borrowAmount == 0) return;
 
         REVLoan memory loanBefore = LOANS_CONTRACT.loanOf(loanId);
@@ -822,7 +819,7 @@ contract REVInvincibility_PropertyTests is TestBaseWorkflow {
         assertEq(loanAfter.collateral, loanBefore.collateral, "Loan collateral unchanged across stages");
 
         // Borrowable amount may have changed (different tax rate)
-        uint256 newBorrowable = LOANS_CONTRACT.borrowableAmountFrom(
+        LOANS_CONTRACT.borrowableAmountFrom(
             REVNET_ID, loanAfter.collateral, 18, uint32(uint160(JBConstants.NATIVE_TOKEN))
         );
         // With lower tax rate in stage 1, borrowable should increase
@@ -834,8 +831,7 @@ contract REVInvincibility_PropertyTests is TestBaseWorkflow {
     function test_econ_splitOperatorRug() public {
         // Pay to build up surplus and reserved tokens
         vm.prank(USER);
-        uint256 userTokens =
-            jbMultiTerminal().pay{value: 50e18}(REVNET_ID, JBConstants.NATIVE_TOKEN, 50e18, USER, 0, "", "");
+        jbMultiTerminal().pay{value: 50e18}(REVNET_ID, JBConstants.NATIVE_TOKEN, 50e18, USER, 0, "", "");
 
         // Send reserved tokens to splits (multisig = split beneficiary)
         try jbController().sendReservedTokensToSplitsOf(REVNET_ID) {} catch {}
@@ -1168,7 +1164,7 @@ contract REVInvincibility_Invariants is StdInvariant, TestBaseWorkflow {
     // INV-REV-2: Collateral accounting exact
     // =====================================================================
     /// @notice Ghost collateral sum must match contract's totalCollateralOf.
-    function invariant_REV_2_collateralAccountingExact() public {
+    function invariant_REV_2_collateralAccountingExact() public view {
         assertEq(
             HANDLER.COLLATERAL_SUM(),
             LOANS_CONTRACT.totalCollateralOf(REVNET_ID),
@@ -1180,7 +1176,7 @@ contract REVInvincibility_Invariants is StdInvariant, TestBaseWorkflow {
     // INV-REV-3: Borrow accounting exact
     // =====================================================================
     /// @notice Ghost borrowed sum must match contract's totalBorrowedFrom.
-    function invariant_REV_3_borrowAccountingExact() public {
+    function invariant_REV_3_borrowAccountingExact() public view {
         uint256 actualTotalBorrowed =
             LOANS_CONTRACT.totalBorrowedFrom(REVNET_ID, jbMultiTerminal(), JBConstants.NATIVE_TOKEN);
 
@@ -1196,7 +1192,7 @@ contract REVInvincibility_Invariants is StdInvariant, TestBaseWorkflow {
     /// @dev Loans CAN become undercollateralized when new payments increase totalSupply
     ///      faster than surplus grows (bonding curve dilution). This is expected behavior.
     ///      We verify that the loan struct itself is internally consistent.
-    function invariant_REV_4_noUndercollateralizedLoans() public {
+    function invariant_REV_4_noUndercollateralizedLoans() public view {
         if (HANDLER.callCount_payAndBorrow() == 0) return;
 
         for (uint256 i = 1; i <= HANDLER.callCount_payAndBorrow(); i++) {
@@ -1226,7 +1222,7 @@ contract REVInvincibility_Invariants is StdInvariant, TestBaseWorkflow {
     // INV-REV-5: Supply + collateral consistency
     // =====================================================================
     /// @notice totalSupply + totalCollateral should be coherent with token tracking.
-    function invariant_REV_5_supplyCollateralConsistency() public {
+    function invariant_REV_5_supplyCollateralConsistency() public view {
         uint256 totalSupply = jbController().totalTokenSupplyWithReservedTokensOf(REVNET_ID);
         uint256 totalCollateral = LOANS_CONTRACT.totalCollateralOf(REVNET_ID);
 

package/test/REVLifecycle.t.sol

@@ -252,7 +252,6 @@ contract REVLifecycle_Local is TestBaseWorkflow {
 
         // Cash out half in stage 0 (50% tax)
         uint256 halfTokens = tokens / 2;
-        uint256 user1BalBefore = USER1.balance;
         vm.prank(USER1);
         uint256 reclaimedStage0 = jbMultiTerminal()
             .cashOutTokensOf({

package/test/REVLoansAttacks.t.sol

@@ -524,7 +524,7 @@ contract REVLoansAttacks is TestBaseWorkflow {
 
         // Setup: create a loan first
         uint256 payAmount = 10e18;
-        (uint256 loanId, uint256 tokenCount, uint256 borrowAmount) = _setupLoan(USER, payAmount, 25);
+        (uint256 loanId,, uint256 borrowAmount) = _setupLoan(USER, payAmount, 25);
         vm.assume(borrowAmount > 0);
 
         // The loan exists. The reentrancy risk during repayLoan:
@@ -559,8 +559,7 @@ contract REVLoansAttacks is TestBaseWorkflow {
             jbMultiTerminal().pay{value: 10e18}(REVNET_ID, JBConstants.NATIVE_TOKEN, 10e18, userA, 0, "", "");
 
         vm.prank(userB);
-        uint256 tokensB =
-            jbMultiTerminal().pay{value: 10e18}(REVNET_ID, JBConstants.NATIVE_TOKEN, 10e18, userB, 0, "", "");
+        jbMultiTerminal().pay{value: 10e18}(REVNET_ID, JBConstants.NATIVE_TOKEN, 10e18, userB, 0, "", "");
 
         // Record pre-borrow state
         uint256 totalSupplyBefore = jbController().totalTokenSupplyWithReservedTokensOf(REVNET_ID);
@@ -604,7 +603,7 @@ contract REVLoansAttacks is TestBaseWorkflow {
     /// @notice After LOAN_LIQUIDATION_DURATION (3650 days), the loan expires and cannot be repaid.
     function test_liquidation_borrowRepayAfterExpiry() public {
         uint256 payAmount = 10e18;
-        (uint256 loanId, uint256 tokenCount, uint256 borrowAmount) = _setupLoan(USER, payAmount, 25);
+        (uint256 loanId,, uint256 borrowAmount) = _setupLoan(USER, payAmount, 25);
         vm.assume(borrowAmount > 0);
 
         // Warp past the liquidation duration (3650 days)
@@ -715,9 +714,6 @@ contract REVLoansAttacks is TestBaseWorkflow {
         // Calculate repay amount
         uint256 repayAmount = loan.amount;
 
-        // The user needs to have ETH to repay
-        uint256 userBalanceBefore = USER.balance;
-
         // Repay the full loan
         vm.prank(USER);
         LOANS_CONTRACT.repayLoan{value: repayAmount}({

package/test/REVLoansFeeRecovery.t.sol

@@ -195,8 +195,6 @@ contract REVLoansFeeRecovery is TestBaseWorkflow {
             extraMetadata: 0
         });
 
-        REVLoanSource[] memory _loanSources = new REVLoanSource[](0);
-
         REVConfig memory revnetConfiguration = REVConfig({
             description: REVDescription(
                 "Revnet", "$REV", "ipfs://QmNRHT91HcDgMcenebYX7rJigt77cgNcosvuhX21wkF3tx", ERC20_SALT

package/test/{REVLoans_AuditFindings.t.sol → REVLoansFindings.t.sol}

@@ -129,12 +129,12 @@ contract GarbageTerminal is ERC165, IJBPayoutTerminal {
     receive() external payable {}
 }
 
-/// @notice Regression tests for nemesis audit findings.
+/// @notice Regression tests for loan findings.
 /// Unvalidated loan source terminal
 /// RepayLoan event emits zeroed values
 /// Auto-issuance timing guard bypass (false positive)
 /// repayLoan revert on excess collateral (false positive)
-contract REVLoans_AuditFindings is TestBaseWorkflow {
+contract REVLoansFindings is TestBaseWorkflow {
     bytes32 REV_DEPLOYER_SALT = "REVDeployer";
     bytes32 ERC20_SALT = "REV_TOKEN";
 
@@ -327,7 +327,7 @@ contract REVLoans_AuditFindings is TestBaseWorkflow {
     //*********************************************************************//
 
     /// @notice borrowFrom rejects a fake terminal not registered in the directory.
-    function test_H1_borrowFromRejectsUnregisteredTerminal() public {
+    function test_borrowFromRejectsUnregisteredTerminal() public {
         // Step 1: User pays into the revnet to get tokens.
         uint256 tokens = _payAndGetTokens(1e18);
         assertGt(tokens, 0, "user should receive tokens");
@@ -367,10 +367,10 @@ contract REVLoans_AuditFindings is TestBaseWorkflow {
 
     /// @notice RepayLoan event emits non-zero loan amount and collateral
     ///         when fully repaying a loan.
-    function test_L1_repayLoanEventEmitsNonZeroValues() public {
+    function test_repayLoanEventEmitsNonZeroValues() public {
         // Step 1: Pay in and borrow.
         uint256 tokens = _payAndGetTokens(1e18);
-        (uint256 loanId, REVLoan memory loan, uint256 loanable) = _borrow(tokens);
+        (uint256 loanId, REVLoan memory loan,) = _borrow(tokens);
 
         assertGt(loan.amount, 0, "loan amount should be non-zero");
         assertGt(loan.collateral, 0, "loan collateral should be non-zero");
@@ -408,7 +408,7 @@ contract REVLoans_AuditFindings is TestBaseWorkflow {
 
     /// @notice Secondary check: verify the original loan data in the emitted event
     ///         has the expected non-zero amount and collateral by recording logs.
-    function test_L1_repayLoanEventLoanFieldIsNonZero() public {
+    function test_repayLoanEventLoanFieldIsNonZero() public {
         // Step 1: Pay in and borrow.
         uint256 tokens = _payAndGetTokens(1e18);
         (uint256 loanId, REVLoan memory loan,) = _borrow(tokens);

package/test/{REVLoansAuditRegressions.t.sol → REVLoansRegressions.t.sol}

@@ -129,7 +129,7 @@ contract FakeTerminal is ERC165, IJBPayoutTerminal {
 }
 
 /// @notice Regression tests for REVLoans unvalidated source terminal.
-contract REVLoansRegressions_Local is TestBaseWorkflow {
+contract REVLoansRegressions is TestBaseWorkflow {
     bytes32 REV_DEPLOYER_SALT = "REVDeployer";
     bytes32 ERC20_SALT = "REV_TOKEN";
 
@@ -289,7 +289,7 @@ contract REVLoansRegressions_Local is TestBaseWorkflow {
     }
 
     /// @notice Verify that the configured loan source (real terminal) is properly registered.
-    function test_configuredSourceIsRegistered() public {
+    function test_configuredSourceIsRegistered() public view {
         // The real terminal should be in the directory
         IJBTerminal[] memory terminals = jbDirectory().terminalsOf(REVNET_ID);
         bool found = false;

package/test/REVLoansSourced.t.sol

@@ -729,7 +729,9 @@ contract REVLoansSourcedTests is TestBaseWorkflow {
 
         assertApproxEqAbs(balance, reclaimableSurplus - nanaFee, 1);
 
-        assertGe(reclaimableSurplus + revFee, mulDiv(loanable, 97, 100)); // small marging for curve rounding.
+        // Allow 2 wei absolute tolerance alongside 3% relative tolerance — at very small
+        // surplus values (e.g. 90 wei), a single mulDiv rounding error exceeds 3%.
+        assertGe(reclaimableSurplus + revFee + 2, mulDiv(loanable, 97, 100));
     }
 
     function test_Pay_Borrow_With_Loan_Source() public {

package/test/{TestPR26_BurnHeldTokens.t.sol → TestBurnHeldTokens.t.sol}

@@ -37,7 +37,7 @@ struct FeeProjectConfig {
     REVSuckerDeploymentConfig suckerDeploymentConfiguration;
 }
 
-contract TestPR26_BurnHeldTokens is TestBaseWorkflow {
+contract TestBurnHeldTokens is TestBaseWorkflow {
     bytes32 REV_DEPLOYER_SALT = "REVDeployer";
     bytes32 ERC20_SALT = "REV_TOKEN";
 

package/test/{TestPR27_CEIPattern.t.sol → TestCEIPattern.t.sol}

@@ -59,7 +59,7 @@ contract ReentrantBorrower {
     }
 }
 
-/// @title TestPR27_CEIPattern
+/// @title TestCEIPattern
 /// @notice Tests for CEI pattern fix in REVLoans._adjust()
 ///
 /// Source context (_addTo/_removeFrom/_addCollateralTo/_returnCollateralFrom):
@@ -69,7 +69,7 @@ contract ReentrantBorrower {
 ///   - _returnCollateralFrom(uint256 revnetId, uint256 collateralCount, ...) — no loan reference
 ///   None of the four helpers read loan.amount or loan.collateral — they all use pre-computed deltas.
 ///   The CEI fix writes loan.amount and loan.collateral BEFORE calling any of these helpers.
-contract TestPR27_CEIPattern is TestBaseWorkflow {
+contract TestCEIPattern is TestBaseWorkflow {
     bytes32 REV_DEPLOYER_SALT = "REVDeployer";
 
     REVDeployer REV_DEPLOYER;
@@ -253,7 +253,7 @@ contract TestPR27_CEIPattern is TestBaseWorkflow {
 
     /// @notice Repay a loan and verify state is consistent afterwards.
     function test_repayLoan_stateConsistent() public {
-        (uint256 loanId, uint256 tokenCount, uint256 borrowAmount) = _setupLoan(USER, 10e18, 500);
+        (uint256 loanId,, uint256 borrowAmount) = _setupLoan(USER, 10e18, 500);
         assertTrue(borrowAmount > 0, "Should borrow nonzero");
 
         REVLoan memory loan = LOANS_CONTRACT.loanOf(loanId);

package/test/{TestPR15_CashOutCallerValidation.t.sol → TestCashOutCallerValidation.t.sol}

@@ -37,7 +37,7 @@ struct FeeProjectConfig {
     REVSuckerDeploymentConfig suckerDeploymentConfiguration;
 }
 
-contract TestPR15_CashOutCallerValidation is TestBaseWorkflow {
+contract TestCashOutCallerValidation is TestBaseWorkflow {
     bytes32 REV_DEPLOYER_SALT = "REVDeployer";
     bytes32 ERC20_SALT = "REV_TOKEN";
 
@@ -96,8 +96,6 @@ contract TestPR15_CashOutCallerValidation is TestBaseWorkflow {
             });
         }
 
-        REVLoanSource[] memory loanSources = new REVLoanSource[](0);
-
         REVConfig memory revnetConfiguration = REVConfig({
             description: REVDescription(name, symbol, projectUri, ERC20_SALT),
             baseCurrency: uint32(uint160(JBConstants.NATIVE_TOKEN)),

package/test/{TestPR09_ConversionDocumentation.t.sol → TestConversionDocumentation.t.sol}

@@ -31,7 +31,7 @@ import {JB721TiersHookStore} from "@bananapus/721-hook-v6/src/JB721TiersHookStor
 import {JBAddressRegistry} from "@bananapus/address-registry-v6/src/JBAddressRegistry.sol";
 import {IJBAddressRegistry} from "@bananapus/address-registry-v6/src/interfaces/IJBAddressRegistry.sol";
 
-contract TestPR09_ConversionDocumentation is TestBaseWorkflow {
+contract TestConversionDocumentation is TestBaseWorkflow {
     bytes32 REV_DEPLOYER_SALT = "REVDeployer";
     bytes32 ERC20_SALT = "REV_TOKEN";
 

package/test/{TestPR13_CrossSourceReallocation.t.sol → TestCrossSourceReallocation.t.sol}

@@ -31,7 +31,7 @@ import {JBAddressRegistry} from "@bananapus/address-registry-v6/src/JBAddressReg
 import {IJBAddressRegistry} from "@bananapus/address-registry-v6/src/interfaces/IJBAddressRegistry.sol";
 
 /// @notice Tests for PR #13: cross-source reallocation prevention.
-contract TestPR13_CrossSourceReallocation is TestBaseWorkflow {
+contract TestCrossSourceReallocation is TestBaseWorkflow {
     bytes32 REV_DEPLOYER_SALT = "REVDeployer";
 
     REVDeployer REV_DEPLOYER;

package/test/{TestPR12_FlashLoanSurplus.t.sol → TestFlashLoanSurplus.t.sol}

@@ -31,7 +31,7 @@ import {JBAddressRegistry} from "@bananapus/address-registry-v6/src/JBAddressReg
 import {IJBAddressRegistry} from "@bananapus/address-registry-v6/src/interfaces/IJBAddressRegistry.sol";
 
 /// @notice Tests showing that flash loan surplus manipulation is economically unprofitable.
-contract TestPR12_FlashLoanSurplus is TestBaseWorkflow {
+contract TestFlashLoanSurplus is TestBaseWorkflow {
     bytes32 REV_DEPLOYER_SALT = "REVDeployer";
     bytes32 ERC20_SALT = "REV_TOKEN";
 

package/test/{TestPR22_HookArrayOOB.t.sol → TestHookArrayOOB.t.sol}

@@ -36,7 +36,7 @@ import {JBRuleset} from "@bananapus/core-v6/src/structs/JBRuleset.sol";
 /// The bug: `hookSpecifications[1] = buybackHookSpecifications[0]` would revert with OOB
 /// when there is no tiered 721 hook (array size is 1, not 2).
 /// The fix: `hookSpecifications[usesTiered721Hook ? 1 : 0] = buybackHookSpecifications[0]`.
-contract TestPR22_HookArrayOOB is TestBaseWorkflow {
+contract TestHookArrayOOB is TestBaseWorkflow {
     bytes32 REV_DEPLOYER_SALT = "REVDeployer";
 
     REVDeployer REV_DEPLOYER;

package/test/{TestPR10_LiquidationBehavior.t.sol → TestLiquidationBehavior.t.sol}

@@ -33,7 +33,7 @@ import {IJBAddressRegistry} from "@bananapus/address-registry-v6/src/interfaces/
 import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 
 /// @notice Tests for PR #10: liquidation behavior documentation and collateral burn mechanics.
-contract TestPR10_LiquidationBehavior is TestBaseWorkflow {
+contract TestLiquidationBehavior is TestBaseWorkflow {
     bytes32 REV_DEPLOYER_SALT = "REVDeployer";
 
     REVDeployer REV_DEPLOYER;
@@ -251,7 +251,7 @@ contract TestPR10_LiquidationBehavior is TestBaseWorkflow {
     function test_borrowerKeepsBorrowedFunds() public {
         uint256 userBalanceBefore = USER.balance;
 
-        (uint256 loanId,, uint256 borrowAmount) = _setupLoan(USER, 10e18, 25);
+        (uint256 loanId,,) = _setupLoan(USER, 10e18, 25);
         require(loanId != 0, "Loan setup failed");
 
         uint256 userBalanceAfter = USER.balance;
@@ -271,7 +271,7 @@ contract TestPR10_LiquidationBehavior is TestBaseWorkflow {
 
     /// @notice Repay before expiry returns collateral (re-mints tokens).
     function test_repayBeforeExpiry_collateralReminted() public {
-        (uint256 loanId,, uint256 borrowAmount) = _setupLoan(USER, 10e18, 25);
+        (uint256 loanId,,) = _setupLoan(USER, 10e18, 25);
         require(loanId != 0, "Loan setup failed");
 
         REVLoan memory loan = LOANS_CONTRACT.loanOf(loanId);
@@ -296,7 +296,7 @@ contract TestPR10_LiquidationBehavior is TestBaseWorkflow {
 
     /// @notice After liquidation, the loan NFT is burned and collateral/borrow tracking is decremented.
     function test_loanDataDeletedAfterLiquidation() public {
-        (uint256 loanId,, uint256 borrowAmount) = _setupLoan(USER, 10e18, 25);
+        (uint256 loanId,,) = _setupLoan(USER, 10e18, 25);
         require(loanId != 0, "Loan setup failed");
 
         REVLoan memory loan = LOANS_CONTRACT.loanOf(loanId);

package/test/{TestPR11_LowFindings.t.sol → TestLowFindings.t.sol}

@@ -37,7 +37,7 @@ struct FeeProjectConfig {
     REVSuckerDeploymentConfig suckerDeploymentConfiguration;
 }
 
-contract TestPR11_LowFindings is TestBaseWorkflow {
+contract TestLowFindings is TestBaseWorkflow {
     bytes32 REV_DEPLOYER_SALT = "REVDeployer";
     bytes32 ERC20_SALT = "REV_TOKEN";
 

package/test/{TestPR32_MixedFixes.t.sol → TestMixedFixes.t.sol}

@@ -31,7 +31,7 @@ import {JBAddressRegistry} from "@bananapus/address-registry-v6/src/JBAddressReg
 import {IJBAddressRegistry} from "@bananapus/address-registry-v6/src/interfaces/IJBAddressRegistry.sol";
 
 /// @notice Tests for PR #32: liquidation boundary, reallocate msg.value, and decimal normalization fixes.
-contract TestPR32_MixedFixes is TestBaseWorkflow {
+contract TestMixedFixes is TestBaseWorkflow {
     bytes32 REV_DEPLOYER_SALT = "REVDeployer";
 
     REVDeployer REV_DEPLOYER;