diff --git a/contracts/test-utils/src/index.ts b/contracts/test-utils/src/index.ts
index c12a71bfda..b798999735 100644
--- a/contracts/test-utils/src/index.ts
+++ b/contracts/test-utils/src/index.ts
@@ -29,30 +29,31 @@ export { bytes32Values, testCombinatoriallyWithReferenceFuncAsync, uint256Values
 export { TransactionFactory } from './transaction_factory';
 export { testWithReferenceFuncAsync } from './test_with_reference';
 export {
-    MarketBuyOrders,
-    MarketSellOrders,
-    ERC721TokenIdsByOwner,
-    ERC1155FungibleHoldingsByOwner,
-    ERC1155NonFungibleHoldingsByOwner,
-    ERC1155HoldingsByOwner,
-    OrderStatus,
     AllowanceAmountScenario,
     AssetDataScenario,
     BalanceAmountScenario,
     ContractName,
+    ERC20BalancesByOwner,
+    ERC1155FungibleHoldingsByOwner,
+    ERC1155HoldingsByOwner,
+    ERC1155NonFungibleHoldingsByOwner,
+    ERC721TokenIdsByOwner,
     ExpirationTimeSecondsScenario,
-    TransferAmountsLoggedByMatchOrders,
-    TransferAmountsByMatchOrders,
-    OrderScenario,
-    TraderStateScenario,
-    TransactionDataParams,
-    Token,
-    FillScenario,
+    FeeAssetDataScenario,
     FeeRecipientAddressScenario,
+    FillResults,
+    FillScenario,
+    MarketBuyOrders,
+    MarketSellOrders,
     OrderAssetAmountScenario,
+    OrderInfo,
+    OrderScenario,
+    OrderStatus,
     TakerAssetFillAmountScenario,
     TakerScenario,
-    OrderInfo,
-    ERC20BalancesByOwner,
-    FillResults,
+    Token,
+    TraderStateScenario,
+    TransferAmountsByMatchOrders,
+    TransferAmountsLoggedByMatchOrders,
+    TransactionDataParams,
 } from './types';
diff --git a/contracts/test-utils/src/types.ts b/contracts/test-utils/src/types.ts
index acdcea433d..44d12a22ca 100644
--- a/contracts/test-utils/src/types.ts
+++ b/contracts/test-utils/src/types.ts
@@ -96,7 +96,6 @@ export enum ContractName {
     TokenRegistry = 'TokenRegistry',
     MultiSigWalletWithTimeLock = 'MultiSigWalletWithTimeLock',
     Exchange = 'Exchange',
-    ZRXToken = 'ZRXToken',
     DummyERC20Token = 'DummyERC20Token',
     EtherToken = 'WETH9',
     DutchAuction = 'DutchAuction',
@@ -188,12 +187,20 @@ export enum ExpirationTimeSecondsScenario {
 
 export enum AssetDataScenario {
     ERC20ZeroDecimals = 'ERC20_ZERO_DECIMALS',
-    ZRXFeeToken = 'ZRX_FEE_TOKEN',
     ERC20FiveDecimals = 'ERC20_FIVE_DECIMALS',
-    ERC20NonZRXEighteenDecimals = 'ERC20_NON_ZRX_EIGHTEEN_DECIMALS',
+    ERC20EighteenDecimals = 'ERC20_EIGHTEEN_DECIMALS',
     ERC721 = 'ERC721',
 }
 
+export enum FeeAssetDataScenario {
+    ERC20ZeroDecimals = 'ERC20_ZERO_DECIMALS',
+    ERC20FiveDecimals = 'ERC20_FIVE_DECIMALS',
+    ERC20EighteenDecimals = 'ERC20_EIGHTEEN_DECIMALS',
+    ERC721 = 'ERC721',
+    MakerToken = 'MAKER_TOKEN',
+    TakerToken = 'TAKER_TOKEN',
+}
+
 export enum TakerAssetFillAmountScenario {
     Zero = 'ZERO',
     GreaterThanRemainingFillableTakerAssetAmount = 'GREATER_THAN_REMAINING_FILLABLE_TAKER_ASSET_AMOUNT',
@@ -211,6 +218,8 @@ export interface OrderScenario {
     expirationTimeSecondsScenario: ExpirationTimeSecondsScenario;
     makerAssetDataScenario: AssetDataScenario;
     takerAssetDataScenario: AssetDataScenario;
+    makerFeeAssetDataScenario: FeeAssetDataScenario;
+    takerFeeAssetDataScenario: FeeAssetDataScenario;
 }
 
 export enum BalanceAmountScenario {
@@ -229,8 +238,8 @@ export enum AllowanceAmountScenario {
 export interface TraderStateScenario {
     traderAssetBalance: BalanceAmountScenario;
     traderAssetAllowance: AllowanceAmountScenario;
-    zrxFeeBalance: BalanceAmountScenario;
-    zrxFeeAllowance: AllowanceAmountScenario;
+    feeBalance: BalanceAmountScenario;
+    feeAllowance: AllowanceAmountScenario;
 }
 
 export interface FillScenario {