diff --git a/packages/perennial-oracle/contracts/keeper/KeeperOracle_Migration.sol b/packages/perennial-oracle/contracts/keeper/KeeperOracle_Migration.sol
index 7326c6844..d48bbf037 100644
--- a/packages/perennial-oracle/contracts/keeper/KeeperOracle_Migration.sol
+++ b/packages/perennial-oracle/contracts/keeper/KeeperOracle_Migration.sol
@@ -1,7 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity 0.8.24;
 
-import {IMarket, OracleVersion, OracleReceipt } from "../interfaces/IKeeperFactory.sol";
+import { IMarket } from "@equilibria/perennial-v2/contracts/interfaces/IMarket.sol";
+import { OracleVersion } from "@equilibria/perennial-v2/contracts/types/OracleVersion.sol";
+import { OracleReceipt } from "@equilibria/perennial-v2/contracts/types/OracleReceipt.sol";
 import { PriceResponse } from "./types/PriceResponse.sol";
 import { KeeperOracle } from "./KeeperOracle.sol";
 
diff --git a/packages/perennial/contracts/test/MockToken.sol b/packages/perennial/contracts/test/MockToken.sol
index 2c8262f02..b2461ac22 100644
--- a/packages/perennial/contracts/test/MockToken.sol
+++ b/packages/perennial/contracts/test/MockToken.sol
@@ -1,14 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.13;
 
-import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-import {Intent} from "@equilibria/perennial-v2-verifier/contracts/interfaces/IVerifier.sol";
-
-import "../interfaces/IMarket.sol";
+import { UFixed6Lib } from "@equilibria/root/number/types/UFixed6.sol";
+import { Fixed6Lib } from "@equilibria/root/number/types/Fixed6.sol";
+import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import { Intent } from "@equilibria/perennial-v2-verifier/contracts/interfaces/IVerifier.sol";
+import { IMarket } from "../interfaces/IMarket.sol";
 
 contract MockToken is ERC20 {
 
-    enum Function{SETTLE, UPDATE, UPDATE_MAKER, UPDATE_INTENT}
+    enum Function{ SETTLE, UPDATE, UPDATE_MAKER, UPDATE_INTENT }
 
     Function private functionToCall;
 
@@ -26,6 +27,8 @@ contract MockToken is ERC20 {
         } else if (functionToCall == Function.SETTLE){
             IMarket(msg.sender).settle(address(0));
         }
+
+        return true;
     }
 
     function setFunctionToCall(Function _functionToCall) external {
diff --git a/packages/perennial/contracts/test/OrderTester.sol b/packages/perennial/contracts/test/OrderTester.sol
index f0e481157..30239522b 100644
--- a/packages/perennial/contracts/test/OrderTester.sol
+++ b/packages/perennial/contracts/test/OrderTester.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.13;
 
+import { Fixed6 } from "@equilibria/root/number/types/Fixed6.sol";
 import { Order, OrderStorageGlobal, OrderStorageLocal } from "../types/Order.sol";
 import { OracleVersion } from "../types/OracleVersion.sol";
 import { Position } from "../types/Position.sol";