diff --git a/package.json b/package.json
index 2639df5..384a3fa 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     "url": "https://github.com/violetprotocol/mauve-periphery"
   },
   "files": [
+    "utils/**/*",
     "contracts/base",
     "contracts/interfaces",
     "contracts/libraries",
diff --git a/test/EATMulticall.spec.ts b/test/EATMulticall.spec.ts
index 6f29a65..4fc1d25 100644
--- a/test/EATMulticall.spec.ts
+++ b/test/EATMulticall.spec.ts
@@ -1,13 +1,13 @@
-import { BigNumber, Wallet } from 'ethers'
+import { Wallet } from 'ethers'
 import { ethers } from 'hardhat'
 import { TestEATMulticall } from '../typechain/TestEATMulticall'
 import { AccessTokenVerifier } from '../typechain/AccessTokenVerifier'
 import { expect } from './shared/expect'
-import { utils, messages } from '@violetprotocol/ethereum-access-token-helpers'
+import { messages } from '@violetprotocol/ethereum-access-token-helpers'
 
 import snapshotGasCost from './shared/snapshotGasCost'
-import { parseEther, splitSignature } from 'ethers/lib/utils'
-import { generateAccessTokenForMulticall } from './shared/generateAccessToken'
+import { parseEther } from 'ethers/lib/utils'
+import { generateAccessTokenForMulticall } from '../utils/generateAccessToken'
 
 // generated randomly from privatekeys.pw
 // DO NOT USE IN SENSITIVE PLACES
@@ -45,7 +45,7 @@ describe('EATMulticall', async () => {
 
   beforeEach('create multicall', async () => {
     const multicallTestFactory = await ethers.getContractFactory('TestEATMulticall')
-    testMulticall = (await multicallTestFactory.deploy(verifier.address)) as TestEATMulticall
+    testMulticall = await multicallTestFactory.deploy(verifier.address)
   })
 
   it('revert messages are returned', async () => {
diff --git a/test/MockSwapRouter.gas.spec.ts b/test/MockSwapRouter.gas.spec.ts
index a7051cd..eb087db 100644
--- a/test/MockSwapRouter.gas.spec.ts
+++ b/test/MockSwapRouter.gas.spec.ts
@@ -1,6 +1,6 @@
 import { abi as IMauvePoolABI } from '@violetprotocol/mauve-core/artifacts/contracts/interfaces/IMauvePool.sol/IMauvePool.json'
 import { Fixture } from 'ethereum-waffle'
-import { BigNumber, constants, ContractTransaction, Wallet } from 'ethers'
+import { BigNumber, constants, Contract, ContractTransaction, Wallet } from 'ethers'
 import { ethers, waffle } from 'hardhat'
 import {
   IMauvePool,
@@ -19,8 +19,8 @@ import { expect } from './shared/expect'
 import { encodePath } from './shared/path'
 import snapshotGasCost from './shared/snapshotGasCost'
 import { getMaxTick, getMinTick } from './shared/ticks'
-import { generateAccessTokenForMulticall } from './shared/generateAccessToken'
-import { swapRouterBytes32 } from './shared/roles'
+import { generateAccessTokenForMulticall } from '../utils'
+import { swapRouterBytes32 } from '../utils/roles'
 
 describe('MockSwapRouter gas tests', function () {
   this.timeout(40000)
diff --git a/test/MockSwapRouter.spec.ts b/test/MockSwapRouter.spec.ts
index f18cb85..e802b75 100644
--- a/test/MockSwapRouter.spec.ts
+++ b/test/MockSwapRouter.spec.ts
@@ -17,7 +17,7 @@ import { encodePath } from './shared/path'
 import { getMaxTick, getMinTick } from './shared/ticks'
 import { computePoolAddress } from './shared/computePoolAddress'
 import { CreatePoolIfNecessary } from './shared/createPoolIfNecessary'
-import { generateAccessTokenForMulticall } from './shared/generateAccessToken'
+import { generateAccessTokenForMulticall } from '../utils/'
 
 describe('MockSwapRouter', function () {
   this.timeout(40000)
diff --git a/test/NonfungiblePositionManager.spec.ts b/test/NonfungiblePositionManager.spec.ts
index 08702c8..160cf72 100644
--- a/test/NonfungiblePositionManager.spec.ts
+++ b/test/NonfungiblePositionManager.spec.ts
@@ -31,7 +31,7 @@ import poolAtAddress from './shared/poolAtAddress'
 import snapshotGasCost from './shared/snapshotGasCost'
 import { getMaxTick, getMinTick } from './shared/ticks'
 import { sortedTokens } from './shared/tokenSort'
-import { generateAccessToken, generateAccessTokenForMulticall } from './shared/generateAccessToken'
+import { generateAccessToken, generateAccessTokenForMulticall } from '../utils/generateAccessToken'
 
 describe('NonfungiblePositionManager', () => {
   let wallets: Wallet[]
diff --git a/test/NonfungibleTokenPositionDescriptor.spec.ts b/test/NonfungibleTokenPositionDescriptor.spec.ts
index 63bf3db..07c6890 100644
--- a/test/NonfungibleTokenPositionDescriptor.spec.ts
+++ b/test/NonfungibleTokenPositionDescriptor.spec.ts
@@ -15,7 +15,7 @@ import { getMaxTick, getMinTick } from './shared/ticks'
 import { sortedTokens } from './shared/tokenSort'
 import { extractJSONFromURI } from './shared/extractJSONFromURI'
 import { CreatePoolIfNecessary } from './shared/createPoolIfNecessary'
-import { generateAccessTokenForMulticall } from './shared/generateAccessToken'
+import { generateAccessTokenForMulticall } from '../utils/generateAccessToken'
 
 const DAI = '0x6B175474E89094C44Da98b954EedeAC495271d0F'
 const USDC = '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'
diff --git a/test/PositionValue.spec.ts b/test/PositionValue.spec.ts
index 0b204ba..dc62496 100644
--- a/test/PositionValue.spec.ts
+++ b/test/PositionValue.spec.ts
@@ -24,7 +24,7 @@ import { expect } from './shared/expect'
 
 import { abi as IMauvePoolABI } from '@violetprotocol/mauve-core/artifacts/contracts/interfaces/IMauvePool.sol/IMauvePool.json'
 import { CreatePoolIfNecessary } from './shared/createPoolIfNecessary'
-import { generateAccessTokenForMulticall } from './shared/generateAccessToken'
+import { generateAccessTokenForMulticall } from '../utils/generateAccessToken'
 
 describe('PositionValue', async () => {
   const [...wallets] = waffle.provider.getWallets()
diff --git a/test/TickLens.spec.ts b/test/TickLens.spec.ts
index 106f4ab..eaaaf7a 100644
--- a/test/TickLens.spec.ts
+++ b/test/TickLens.spec.ts
@@ -10,7 +10,7 @@ import { getMaxTick, getMinTick } from './shared/ticks'
 import { computePoolAddress } from './shared/computePoolAddress'
 import snapshotGasCost from './shared/snapshotGasCost'
 import { CreatePoolIfNecessary } from './shared/createPoolIfNecessary'
-import { generateAccessTokenForMulticall } from './shared/generateAccessToken'
+import { generateAccessTokenForMulticall } from '../utils/generateAccessToken'
 
 describe('TickLens', () => {
   let wallets: Wallet[]
diff --git a/test/shared/completeFixture.ts b/test/shared/completeFixture.ts
index 9c94bbc..d6b79df 100644
--- a/test/shared/completeFixture.ts
+++ b/test/shared/completeFixture.ts
@@ -15,7 +15,7 @@ import {
 import { CreatePoolIfNecessary, createPoolIfNecessary } from './createPoolIfNecessary'
 import { parseEther } from 'ethers/lib/utils'
 import { EAT_ISSUER_PK } from './eatSigner'
-import { positionManagerBytes32 } from './roles'
+import { positionManagerBytes32 } from '../../utils/roles'
 
 export type Domain = {
   name: string
diff --git a/test/shared/externalFixtures.ts b/test/shared/externalFixtures.ts
index a28d3ee..16c18b5 100644
--- a/test/shared/externalFixtures.ts
+++ b/test/shared/externalFixtures.ts
@@ -9,7 +9,7 @@ import { AccessTokenVerifier, IMauveFactoryReduced, IWETH9, MockTimeSwapRouter }
 import WETH9 from '../contracts/WETH9.json'
 import { Contract } from '@ethersproject/contracts'
 import { EAT_ISSUER_PK } from './eatSigner'
-import { swapRouterBytes32 } from './roles'
+import { swapRouterBytes32 } from '../../utils/roles'
 
 const wethFixture: Fixture<{ weth9: IWETH9 }> = async ([wallet]) => {
   const weth9 = (await waffle.deployContract(wallet, {
diff --git a/test/shared/quoter.ts b/test/shared/quoter.ts
index e596724..61b0fb1 100644
--- a/test/shared/quoter.ts
+++ b/test/shared/quoter.ts
@@ -4,7 +4,7 @@ import { FeeAmount, TICK_SPACINGS } from './constants'
 import { CreatePoolIfNecessary } from './createPoolIfNecessary'
 import { encodePriceSqrt } from './encodePriceSqrt'
 import { getMaxTick, getMinTick } from './ticks'
-import { generateAccessTokenForMulticall } from './generateAccessToken'
+import { generateAccessTokenForMulticall } from '../../utils'
 import { Domain } from './completeFixture'
 
 export async function createPool(
diff --git a/test/shared/generateAccessToken.ts b/utils/generateAccessToken.ts
similarity index 92%
rename from test/shared/generateAccessToken.ts
rename to utils/generateAccessToken.ts
index cf9ebf4..ddab506 100644
--- a/test/shared/generateAccessToken.ts
+++ b/utils/generateAccessToken.ts
@@ -1,15 +1,14 @@
-import { Wallet, BigNumber } from 'ethers'
+import { Contract } from '@ethersproject/contracts'
+import { ethers, Wallet, BigNumber } from 'ethers'
 import { messages, utils } from '@violetprotocol/ethereum-access-token-helpers'
-import { EATMulticall } from '../../typechain'
 import { splitSignature } from 'ethers/lib/utils'
-import { ethers } from 'hardhat'
 
 export const generateAccessToken = async (
   signer: Wallet,
   domain: messages.Domain,
   functionName: string,
   caller: Wallet,
-  contract: EATMulticall,
+  contract: Contract,
   parameters: any[],
   expiry?: BigNumber
 ) => {
@@ -32,7 +31,7 @@ export const generateAccessTokenForMulticall = async (
   signer: Wallet,
   domain: messages.Domain,
   caller: Wallet,
-  contract: EATMulticall,
+  contract: Contract,
   parameters: any[],
   expiry?: BigNumber
 ) => {
@@ -57,7 +56,7 @@ export const generateAccessTokenForMulticallWithDeadline = async (
   signer: Wallet,
   domain: messages.Domain,
   caller: Wallet,
-  contract: EATMulticall,
+  contract: Contract,
   parameters: any[],
   expiry?: BigNumber
 ) => {
diff --git a/utils/index.ts b/utils/index.ts
new file mode 100644
index 0000000..5ea1b1a
--- /dev/null
+++ b/utils/index.ts
@@ -0,0 +1,2 @@
+export * from './generateAccessToken'
+export * from './roles'
diff --git a/test/shared/roles.ts b/utils/roles.ts
similarity index 100%
rename from test/shared/roles.ts
rename to utils/roles.ts