diff --git a/package.json b/package.json
index 269a92ba4..c676ffada 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@across-protocol/contracts-v2",
-  "version": "0.0.28",
+  "version": "0.0.32",
   "author": "UMA Team",
   "license": "AGPL-3.0",
   "repository": {
diff --git a/test/fixtures/HubPool.Fixture.ts b/test/fixtures/HubPool.Fixture.ts
index a72da3764..5d5ee5b11 100644
--- a/test/fixtures/HubPool.Fixture.ts
+++ b/test/fixtures/HubPool.Fixture.ts
@@ -7,6 +7,10 @@ import { repaymentChainId, finalFeeUsdc } from "../constants";
 import { umaEcosystemFixture } from "./UmaEcosystem.Fixture";
 
 export const hubPoolFixture = hre.deployments.createFixture(async ({ ethers }) => {
+  return await deployHubPool(ethers);
+});
+
+export async function deployHubPool(ethers: any) {
   const [signer, crossChainAdmin] = await ethers.getSigners();
 
   // This fixture is dependent on the UMA ecosystem fixture. Run it first and grab the output. This is used in the
@@ -64,7 +68,7 @@ export const hubPoolFixture = hre.deployments.createFixture(async ({ ethers }) =
   await hubPool.setPoolRebalanceRoute(repaymentChainId, usdc.address, mockTokens.l2Usdc);
 
   return { ...tokens, ...mockTokens, hubPool, mockAdapter, mockSpoke, crossChainAdmin, ...parentFixture };
-});
+}
 
 export async function enableTokensForLP(owner: Signer, hubPool: Contract, weth: Contract, tokens: Contract[]) {
   const lpTokens = [];
diff --git a/test/fixtures/SpokePool.Fixture.ts b/test/fixtures/SpokePool.Fixture.ts
index d6d8ce3f0..0856486c1 100644
--- a/test/fixtures/SpokePool.Fixture.ts
+++ b/test/fixtures/SpokePool.Fixture.ts
@@ -1,5 +1,6 @@
 import { TokenRolesEnum } from "@uma/common";
-import { getContractFactory, SignerWithAddress, Contract, hre, ethers, BigNumber, defaultAbiCoder } from "../utils";
+import { getContractFactory, SignerWithAddress, Contract, hre } from "../utils";
+import { ethers, BigNumber, defaultAbiCoder, toBN } from "../utils";
 import * as consts from "../constants";
 
 export const spokePoolFixture = hre.deployments.createFixture(async ({ ethers }) => {
@@ -116,12 +117,12 @@ export async function fillRelay(
     .fillRelay(
       ...getFillRelayParams(
         getRelayHash(
-          depositor.address,
-          recipient.address,
+          depositor.address ?? depositor,
+          recipient.address ?? recipient,
           depositId,
           originChainId,
           consts.destinationChainId,
-          destErc20.address,
+          destErc20.address ?? destErc20,
           depositAmount.toString(),
           realizedLpFeePct.toString(),
           relayerFeePct.toString()