diff --git a/packages/contracts/test/contracts/L1/messaging/L1CrossDomainMessenger.spec.ts b/packages/contracts/test/contracts/L1/messaging/L1CrossDomainMessenger.spec.ts
index 8b45d02e03b00..3d1508a8c65c5 100644
--- a/packages/contracts/test/contracts/L1/messaging/L1CrossDomainMessenger.spec.ts
+++ b/packages/contracts/test/contracts/L1/messaging/L1CrossDomainMessenger.spec.ts
@@ -6,7 +6,6 @@ import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers'
 
 import { expect } from '../../../setup'
 import {
-  setProxyTarget,
   NON_NULL_BYTES32,
   NON_ZERO_ADDRESS,
   DUMMY_BATCH_HEADERS,
@@ -57,10 +56,9 @@ describe('L1CrossDomainMessenger', () => {
       Fake__L2CrossDomainMessenger.address
     )
 
-    await setProxyTarget(
-      AddressManager,
+    await AddressManager.setAddress(
       'StateCommitmentChain',
-      Fake__StateCommitmentChain
+      Fake__StateCommitmentChain.address
     )
 
     CanonicalTransactionChain = await deploy('CanonicalTransactionChain', {
diff --git a/packages/contracts/test/contracts/L1/rollup/CanonicalTransactionChain.gas.spec.ts b/packages/contracts/test/contracts/L1/rollup/CanonicalTransactionChain.gas.spec.ts
index 24c2ee42e25eb..0c71003d94347 100644
--- a/packages/contracts/test/contracts/L1/rollup/CanonicalTransactionChain.gas.spec.ts
+++ b/packages/contracts/test/contracts/L1/rollup/CanonicalTransactionChain.gas.spec.ts
@@ -13,7 +13,6 @@ import { TransactionResponse } from '@ethersproject/abstract-provider'
 /* Internal Imports */
 import {
   deploy,
-  setProxyTarget,
   L2_GAS_DISCOUNT_DIVISOR,
   ENQUEUE_GAS_COST,
   getEthTime,
@@ -59,10 +58,9 @@ describe('[GAS BENCHMARK] CanonicalTransactionChain [ @skip-on-coverage ]', () =
       'StateCommitmentChain'
     )
 
-    await setProxyTarget(
-      AddressManager,
+    await AddressManager.setAddress(
       'StateCommitmentChain',
-      Fake__StateCommitmentChain
+      Fake__StateCommitmentChain.address
     )
 
     CanonicalTransactionChain = await deploy('CanonicalTransactionChain', {
diff --git a/packages/contracts/test/contracts/L1/rollup/CanonicalTransactionChain.spec.ts b/packages/contracts/test/contracts/L1/rollup/CanonicalTransactionChain.spec.ts
index 583797a5a4cd0..f0341bcd2cc08 100644
--- a/packages/contracts/test/contracts/L1/rollup/CanonicalTransactionChain.spec.ts
+++ b/packages/contracts/test/contracts/L1/rollup/CanonicalTransactionChain.spec.ts
@@ -12,7 +12,6 @@ import _ from 'lodash'
 import { expect } from '../../../setup'
 import {
   deploy,
-  setProxyTarget,
   L2_GAS_DISCOUNT_DIVISOR,
   ENQUEUE_GAS_COST,
   setEthTime,
@@ -67,10 +66,9 @@ describe('CanonicalTransactionChain', () => {
       'StateCommitmentChain'
     )
 
-    await setProxyTarget(
-      AddressManager,
+    await AddressManager.setAddress(
       'StateCommitmentChain',
-      Fake__StateCommitmentChain
+      Fake__StateCommitmentChain.address
     )
 
     CanonicalTransactionChain = await deploy('CanonicalTransactionChain', {
diff --git a/packages/contracts/test/contracts/L1/rollup/StateCommitmentChain.spec.ts b/packages/contracts/test/contracts/L1/rollup/StateCommitmentChain.spec.ts
index aff15f6e75a2b..43e7a84799343 100644
--- a/packages/contracts/test/contracts/L1/rollup/StateCommitmentChain.spec.ts
+++ b/packages/contracts/test/contracts/L1/rollup/StateCommitmentChain.spec.ts
@@ -6,7 +6,6 @@ import { smock, FakeContract } from '@defi-wonderland/smock'
 import { expect } from '../../../setup'
 import {
   deploy,
-  setProxyTarget,
   NON_NULL_BYTES32,
   getEthTime,
   increaseEthTime,
@@ -30,15 +29,14 @@ describe('StateCommitmentChain', () => {
       'CanonicalTransactionChain'
     )
 
-    await setProxyTarget(
-      AddressManager,
+    await AddressManager.setAddress(
       'CanonicalTransactionChain',
-      Fake__CanonicalTransactionChain
+      Fake__CanonicalTransactionChain.address
     )
 
     Fake__BondManager = await smock.fake<Contract>('BondManager')
 
-    await setProxyTarget(AddressManager, 'BondManager', Fake__BondManager)
+    await AddressManager.setAddress('BondManager', Fake__BondManager.address)
 
     Fake__BondManager.isCollateralized.returns(true)
 
diff --git a/packages/contracts/test/helpers/index.ts b/packages/contracts/test/helpers/index.ts
index f36d57b484c2b..c3093e1e55218 100644
--- a/packages/contracts/test/helpers/index.ts
+++ b/packages/contracts/test/helpers/index.ts
@@ -1,6 +1,5 @@
 export * from './dummy'
 export * from './constants'
-export * from './resolver'
 export * from './utils'
 export * from './codec'
 export * from './test-runner'
diff --git a/packages/contracts/test/helpers/resolver/address-manager.ts b/packages/contracts/test/helpers/resolver/address-manager.ts
deleted file mode 100644
index 13524df8b7612..0000000000000
--- a/packages/contracts/test/helpers/resolver/address-manager.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/* External Imports */
-import { ethers } from 'hardhat'
-import { Contract } from 'ethers'
-import { FakeContract } from '@defi-wonderland/smock'
-
-export const setProxyTarget = async (
-  AddressManager: Contract,
-  name: string,
-  target: FakeContract
-): Promise<void> => {
-  const SimpleProxy: Contract = await (
-    await ethers.getContractFactory('Helper_SimpleProxy')
-  ).deploy()
-
-  await SimpleProxy.setTarget(target.address)
-  await AddressManager.setAddress(name, SimpleProxy.address)
-}
diff --git a/packages/contracts/test/helpers/resolver/index.ts b/packages/contracts/test/helpers/resolver/index.ts
deleted file mode 100644
index 52516689c177d..0000000000000
--- a/packages/contracts/test/helpers/resolver/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './address-manager'