diff --git a/contracts/src/scripts/DeployGovernance.s.sol b/contracts/src/scripts/DeployGovernance.s.sol
index e54f07735..f442b7a47 100644
--- a/contracts/src/scripts/DeployGovernance.s.sol
+++ b/contracts/src/scripts/DeployGovernance.s.sol
@@ -107,12 +107,9 @@ contract DeployGovernance is Script, Deployers {
         bytes32 _salt,
         IERC20 _boldToken,
         address[] memory _initialInitiatives
-    )
-        internal
-        view
-        returns (address)
-    {
-        (address governanceAddress,) = computeGovernanceAddressAndConfig(_deployer, _salt, _boldToken, _initialInitiatives);
+    ) internal view returns (address) {
+        (address governanceAddress,) =
+            computeGovernanceAddressAndConfig(_deployer, _salt, _boldToken, _initialInitiatives);
         return governanceAddress;
     }
 
@@ -121,11 +118,7 @@ contract DeployGovernance is Script, Deployers {
         bytes32 _salt,
         IERC20 _boldToken,
         address[] memory _initialInitiatives
-    )
-        internal
-        view
-        returns (address, IGovernance.Configuration memory)
-    {
+    ) internal view returns (address, IGovernance.Configuration memory) {
         IGovernance.Configuration memory governanceConfiguration = IGovernance.Configuration({
             registrationFee: REGISTRATION_FEE,
             registrationThresholdFactor: REGISTRATION_THRESHOLD_FACTOR,
diff --git a/contracts/src/scripts/DeployLiquity2.s.sol b/contracts/src/scripts/DeployLiquity2.s.sol
index addffafaf..0437be932 100644
--- a/contracts/src/scripts/DeployLiquity2.s.sol
+++ b/contracts/src/scripts/DeployLiquity2.s.sol
@@ -241,7 +241,8 @@ contract DeployLiquity2Script is DeployGovernance, UniPriceConverter, StdCheats,
         (address governanceAddress, string memory governanceManifest) = deployGovernance(
             deployer, SALT, deployed.boldToken, deployed.usdc, ICurveStableswapNG(address(deployed.usdcCurvePool))
         );
-        address computedGovernanceAddress = computeGovernanceAddress(deployer, SALT, deployed.boldToken, new address[](0));
+        address computedGovernanceAddress =
+            computeGovernanceAddress(deployer, SALT, deployed.boldToken, new address[](0));
         //console2.log(computedGovernanceAddress, "computedGovernanceAddress");
         //console2.log(governanceAddress, "governanceAddress");
         assert(governanceAddress == computedGovernanceAddress);
@@ -489,7 +490,8 @@ contract DeployLiquity2Script is DeployGovernance, UniPriceConverter, StdCheats,
 
         contracts.priceFeed = new PriceFeedTestnet();
         //console2.log(computeGovernanceAddress(deployer, SALT, _boldToken, new address[](0)), "computeGovernanceAddress");
-        contracts.interestRouter = IInterestRouter(computeGovernanceAddress(deployer, SALT, _boldToken, new address[](0)));
+        contracts.interestRouter =
+            IInterestRouter(computeGovernanceAddress(deployer, SALT, _boldToken, new address[](0)));
         addresses.borrowerOperations = vm.computeCreate2Address(
             SALT, keccak256(getBytecode(type(BorrowerOperations).creationCode, address(contracts.addressesRegistry)))
         );
@@ -926,7 +928,7 @@ contract DeployLiquity2Script is DeployGovernance, UniPriceConverter, StdCheats,
                 string.concat('"multiTroveGetter":"', address(deployed.multiTroveGetter).toHexString(), '",'),
                 string.concat('"exchangeHelpers":"', address(deployed.exchangeHelpers).toHexString(), '",'),
                 string.concat('"branches":[', branches.join(","), "],"),
-                string.concat('"governance":', _governanceManifest, '') // no comma
+                string.concat('"governance":', _governanceManifest, "") // no comma
             ),
             "}"
         );
diff --git a/contracts/src/test/TestContracts/Deployment.t.sol b/contracts/src/test/TestContracts/Deployment.t.sol
index 8d28e05d3..8e5342b24 100644
--- a/contracts/src/test/TestContracts/Deployment.t.sol
+++ b/contracts/src/test/TestContracts/Deployment.t.sol
@@ -18,7 +18,7 @@ import "./TroveManagerTester.t.sol";
 import "../../TroveNFT.sol";
 import "../../NFTMetadata/MetadataNFT.sol";
 import "../../CollateralRegistry.sol";
-import "../../MockInterestRouter.sol";
+import "./MockInterestRouter.sol";
 import "./PriceFeedTestnet.sol";
 import "./MetadataDeployment.sol";
 import "../../Zappers/WETHZapper.sol";
diff --git a/contracts/src/MockInterestRouter.sol b/contracts/src/test/TestContracts/MockInterestRouter.sol
similarity index 69%
rename from contracts/src/MockInterestRouter.sol
rename to contracts/src/test/TestContracts/MockInterestRouter.sol
index e3dc25ead..55d906cd2 100644
--- a/contracts/src/MockInterestRouter.sol
+++ b/contracts/src/test/TestContracts/MockInterestRouter.sol
@@ -2,6 +2,6 @@
 
 pragma solidity 0.8.24;
 
-import "./Interfaces/IInterestRouter.sol";
+import "../../Interfaces/IInterestRouter.sol";
 
 contract MockInterestRouter is IInterestRouter {}