diff --git a/contracts/test/CollSurplusPool.js b/contracts/test/CollSurplusPool.js
index a431eb11..a3bf5952 100644
--- a/contracts/test/CollSurplusPool.js
+++ b/contracts/test/CollSurplusPool.js
@@ -40,14 +40,14 @@ contract("CollSurplusPool", async (accounts) => {
 
   it("CollSurplusPool: claimColl(): Reverts if caller is not Borrower Operations", async () => {
     await th.assertRevert(
-      collSurplusPool.claimColl(A, th.addressToTroveId(A), { from: A }),
+      collSurplusPool.claimColl(A, { from: A }),
       "CollSurplusPool: Caller is not Borrower Operations",
     );
   });
 
   it("CollSurplusPool: claimColl(): Reverts if nothing to claim", async () => {
     await th.assertRevert(
-      borrowerOperations.claimCollateral(th.addressToTroveId(A), { from: A }),
+      borrowerOperations.claimCollateral({ from: A }),
       "CollSurplusPool: No collateral available to claim",
     );
   });
diff --git a/contracts/test/GasCompensationTest.js b/contracts/test/GasCompensationTest.js
index d956912a..458988bf 100644
--- a/contracts/test/GasCompensationTest.js
+++ b/contracts/test/GasCompensationTest.js
@@ -60,9 +60,9 @@ contract("Gas compensation tests", async (accounts) => {
   });
 
   before(async () => {
-    troveManagerTester = await TroveManagerTester.new();
+    troveManagerTester = await TroveManagerTester.new(toBN(dec(110, 16)), toBN(dec(10, 16)), toBN(dec(10, 16)));
     const WETH = await ERC20.new("WETH", "WETH");
-    borrowerOperationsTester = await BorrowerOperationsTester.new(WETH.address);
+    borrowerOperationsTester = await BorrowerOperationsTester.new(WETH.address, troveManagerTester.address);
 
     TroveManagerTester.setAsDeployed(troveManagerTester);
     BorrowerOperationsTester.setAsDeployed(borrowerOperationsTester);
diff --git a/contracts/test/OwnershipTest.js b/contracts/test/OwnershipTest.js
index 0f5bc12d..306f5d6b 100644
--- a/contracts/test/OwnershipTest.js
+++ b/contracts/test/OwnershipTest.js
@@ -20,7 +20,7 @@ contract("All Liquity functions with onlyOwner modifier", async (accounts) => {
 
   before(async () => {
     contracts = await deploymentHelper.deployLiquityCore();
-    contracts.borrowerOperations = await BorrowerOperationsTester.new(contracts.WETH.address);
+    contracts.borrowerOperations = await BorrowerOperationsTester.new(contracts.WETH.address, contracts.troveManager.address);
     contracts = await deploymentHelper.deployBoldToken(contracts);
 
     boldToken = contracts.boldToken;
@@ -89,7 +89,7 @@ contract("All Liquity functions with onlyOwner modifier", async (accounts) => {
 
   describe("BorrowerOperations", async (accounts) => {
     it("setAddresses(): reverts when called by non-owner, with wrong addresses, or twice", async () => {
-      await testDeploymentSetter(borrowerOperations, 9);
+      await testDeploymentSetter(borrowerOperations, 8);
     });
   });
 
diff --git a/contracts/utils/deploymentHelpers.js b/contracts/utils/deploymentHelpers.js
index 42959066..bd4b0772 100644
--- a/contracts/utils/deploymentHelpers.js
+++ b/contracts/utils/deploymentHelpers.js
@@ -59,7 +59,8 @@ class DeploymentHelper {
 
     // Borrowing contracts
     const activePool = await Contracts.ActivePool.new(WETH.address);
-    const borrowerOperations = await Contracts.BorrowerOperations.new(WETH.address);
+    const troveManager = await Contracts.TroveManager.new(web3.utils.toBN("1100000000000000000"), web3.utils.toBN("100000000000000000"), web3.utils.toBN("100000000000000000"));
+    const borrowerOperations = await Contracts.BorrowerOperations.new(WETH.address, troveManager.address);
     const collSurplusPool = await Contracts.CollSurplusPool.new(WETH.address);
     const defaultPool = await Contracts.DefaultPool.new(WETH.address);
     const gasPool = await Contracts.GasPool.new();
@@ -67,7 +68,6 @@ class DeploymentHelper {
     const priceFeed = await Contracts.PriceFeedMock.new();
     const sortedTroves = await Contracts.SortedTroves.new();
     const stabilityPool = await Contracts.StabilityPool.new(WETH.address);
-    const troveManager = await Contracts.TroveManager.new();
 
     const { boldToken } = await this.deployBoldToken({
       troveManager,
@@ -167,7 +167,6 @@ class DeploymentHelper {
 
     // set contracts in BorrowerOperations
     await contracts.borrowerOperations.setAddresses(
-      contracts.troveManager.address,
       contracts.activePool.address,
       contracts.defaultPool.address,
       contracts.stabilityPool.address,