Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/website/instant-configurator

52 files changed, 312 insertions, 2980 deletions

diff --git a/contracts/core/test/asset_proxy/authorizable.ts b/contracts/core/test/asset_proxy/authorizable.ts
index e21af9b81..853d18be0 100644
--- a/contracts/core/test/asset_proxy/authorizable.ts
+++ b/contracts/core/test/asset_proxy/authorizable.ts
@@ -1,3 +1,11 @@
+import {
+    chaiSetup,
+    constants,
+    expectTransactionFailedAsync,
+    provider,
+    txDefaults,
+    web3Wrapper,
+} from '@0x/contracts-test-utils';
 import { BlockchainLifecycle } from '@0x/dev-utils';
 import { RevertReason } from '@0x/types';
 import { BigNumber } from '@0x/utils';
@@ -6,10 +14,6 @@ import * as _ from 'lodash';
 
 import { MixinAuthorizableContract } from '../../generated-wrappers/mixin_authorizable';
 import { artifacts } from '../../src/artifacts';
-import { expectTransactionFailedAsync } from '../utils/assertions';
-import { chaiSetup } from '../utils/chai_setup';
-import { constants } from '../utils/constants';
-import { provider, txDefaults, web3Wrapper } from '../utils/web3_wrapper';
 
 chaiSetup.configure();
 const expect = chai.expect;
diff --git a/contracts/core/test/asset_proxy/proxies.ts b/contracts/core/test/asset_proxy/proxies.ts
index 8fa1e602a..2527b0fbf 100644
--- a/contracts/core/test/asset_proxy/proxies.ts
+++ b/contracts/core/test/asset_proxy/proxies.ts
@@ -1,3 +1,13 @@
+import {
+    chaiSetup,
+    constants,
+    expectTransactionFailedAsync,
+    expectTransactionFailedWithoutReasonAsync,
+    LogDecoder,
+    provider,
+    txDefaults,
+    web3Wrapper,
+} from '@0x/contracts-test-utils';
 import { BlockchainLifecycle } from '@0x/dev-utils';
 import { assetDataUtils } from '@0x/order-utils';
 import { RevertReason } from '@0x/types';
@@ -16,13 +26,8 @@ import { IAssetDataContract } from '../../generated-wrappers/i_asset_data';
 import { IAssetProxyContract } from '../../generated-wrappers/i_asset_proxy';
 import { MultiAssetProxyContract } from '../../generated-wrappers/multi_asset_proxy';
 import { artifacts } from '../../src/artifacts';
-import { expectTransactionFailedAsync, expectTransactionFailedWithoutReasonAsync } from '../utils/assertions';
-import { chaiSetup } from '../utils/chai_setup';
-import { constants } from '../utils/constants';
 import { ERC20Wrapper } from '../utils/erc20_wrapper';
 import { ERC721Wrapper } from '../utils/erc721_wrapper';
-import { LogDecoder } from '../utils/log_decoder';
-import { provider, txDefaults, web3Wrapper } from '../utils/web3_wrapper';
 
 chaiSetup.configure();
 const expect = chai.expect;
@@ -553,7 +558,7 @@ describe('Asset Transfer Proxies', () => {
                     erc721Receiver.address,
                     amount,
                 );
-                const logDecoder = new LogDecoder(web3Wrapper);
+                const logDecoder = new LogDecoder(web3Wrapper, artifacts);
                 const tx = await logDecoder.getTxWithDecodedLogsAsync(
                     await web3Wrapper.sendTransactionAsync({
                         to: erc721Proxy.address,
diff --git a/contracts/core/test/exchange/core.ts b/contracts/core/test/exchange/core.ts
index 9159b0d8f..fd6b9ee6b 100644
--- a/contracts/core/test/exchange/core.ts
+++ b/contracts/core/test/exchange/core.ts
@@ -1,3 +1,16 @@
+import {
+    chaiSetup,
+    constants,
+    ERC20BalancesByOwner,
+    expectTransactionFailedAsync,
+    getLatestBlockTimestampAsync,
+    increaseTimeAndMineBlockAsync,
+    OrderFactory,
+    OrderStatus,
+    provider,
+    txDefaults,
+    web3Wrapper,
+} from '@0x/contracts-test-utils';
 import { BlockchainLifecycle } from '@0x/dev-utils';
 import { assetDataUtils, orderHashUtils } from '@0x/order-utils';
 import { RevertReason, SignatureType, SignedOrder } from '@0x/types';
@@ -19,16 +32,9 @@ import { MultiAssetProxyContract } from '../../generated-wrappers/multi_asset_pr
 import { ReentrantERC20TokenContract } from '../../generated-wrappers/reentrant_erc20_token';
 import { TestStaticCallReceiverContract } from '../../generated-wrappers/test_static_call_receiver';
 import { artifacts } from '../../src/artifacts';
-import { expectTransactionFailedAsync } from '../utils/assertions';
-import { getLatestBlockTimestampAsync, increaseTimeAndMineBlockAsync } from '../utils/block_timestamp';
-import { chaiSetup } from '../utils/chai_setup';
-import { constants } from '../utils/constants';
 import { ERC20Wrapper } from '../utils/erc20_wrapper';
 import { ERC721Wrapper } from '../utils/erc721_wrapper';
 import { ExchangeWrapper } from '../utils/exchange_wrapper';
-import { OrderFactory } from '../utils/order_factory';
-import { ERC20BalancesByOwner, OrderStatus } from '../utils/types';
-import { provider, txDefaults, web3Wrapper } from '../utils/web3_wrapper';
 
 chaiSetup.configure();
 const expect = chai.expect;
diff --git a/contracts/core/test/exchange/dispatcher.ts b/contracts/core/test/exchange/dispatcher.ts
index 3d3aa42c2..9bc5cbcce 100644
--- a/contracts/core/test/exchange/dispatcher.ts
+++ b/contracts/core/test/exchange/dispatcher.ts
@@ -1,3 +1,12 @@
+import {
+    chaiSetup,
+    constants,
+    expectTransactionFailedAsync,
+    LogDecoder,
+    provider,
+    txDefaults,
+    web3Wrapper,
+} from '@0x/contracts-test-utils';
 import { BlockchainLifecycle } from '@0x/dev-utils';
 import { assetDataUtils } from '@0x/order-utils';
 import { AssetProxyId, RevertReason } from '@0x/types';
@@ -14,13 +23,8 @@ import {
     TestAssetProxyDispatcherContract,
 } from '../../generated-wrappers/test_asset_proxy_dispatcher';
 import { artifacts } from '../../src/artifacts';
-import { expectTransactionFailedAsync } from '../utils/assertions';
-import { chaiSetup } from '../utils/chai_setup';
-import { constants } from '../utils/constants';
 import { ERC20Wrapper } from '../utils/erc20_wrapper';
 import { ERC721Wrapper } from '../utils/erc721_wrapper';
-import { LogDecoder } from '../utils/log_decoder';
-import { provider, txDefaults, web3Wrapper } from '../utils/web3_wrapper';
 
 chaiSetup.configure();
 const expect = chai.expect;
@@ -145,7 +149,7 @@ describe('AssetProxyDispatcher', () => {
         });
 
         it('should log an event with correct arguments when an asset proxy is registered', async () => {
-            const logDecoder = new LogDecoder(web3Wrapper);
+            const logDecoder = new LogDecoder(web3Wrapper, artifacts);
             const txReceipt = await logDecoder.getTxWithDecodedLogsAsync(
                 await assetProxyDispatcher.registerAssetProxy.sendTransactionAsync(erc20Proxy.address, { from: owner }),
             );
diff --git a/contracts/core/test/exchange/fill_order.ts b/contracts/core/test/exchange/fill_order.ts
index 37efaad2b..2bdbe4855 100644
--- a/contracts/core/test/exchange/fill_order.ts
+++ b/contracts/core/test/exchange/fill_order.ts
@@ -1,23 +1,25 @@
-import { BlockchainLifecycle } from '@0x/dev-utils';
-import * as _ from 'lodash';
-
-import { chaiSetup } from '../utils/chai_setup';
-import {
-    FillOrderCombinatorialUtils,
-    fillOrderCombinatorialUtilsFactoryAsync,
-} from '../utils/fill_order_combinatorial_utils';
 import {
     AllowanceAmountScenario,
     AssetDataScenario,
     BalanceAmountScenario,
+    chaiSetup,
     ExpirationTimeSecondsScenario,
     FeeRecipientAddressScenario,
     FillScenario,
     OrderAssetAmountScenario,
+    provider,
     TakerAssetFillAmountScenario,
     TakerScenario,
-} from '../utils/types';
-import { provider, txDefaults, web3Wrapper } from '../utils/web3_wrapper';
+    txDefaults,
+    web3Wrapper,
+} from '@0x/contracts-test-utils';
+import { BlockchainLifecycle } from '@0x/dev-utils';
+import * as _ from 'lodash';
+
+import {
+    FillOrderCombinatorialUtils,
+    fillOrderCombinatorialUtilsFactoryAsync,
+} from '../utils/fill_order_combinatorial_utils';
 
 chaiSetup.configure();
 const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
diff --git a/contracts/core/test/exchange/internal.ts b/contracts/core/test/exchange/internal.ts
index 109be29c6..972f5efb6 100644
--- a/contracts/core/test/exchange/internal.ts
+++ b/contracts/core/test/exchange/internal.ts
@@ -1,3 +1,15 @@
+import {
+    bytes32Values,
+    chaiSetup,
+    constants,
+    FillResults,
+    getRevertReasonOrErrorMessageForSendTransactionAsync,
+    provider,
+    testCombinatoriallyWithReferenceFuncAsync,
+    txDefaults,
+    uint256Values,
+    web3Wrapper,
+} from '@0x/contracts-test-utils';
 import { BlockchainLifecycle } from '@0x/dev-utils';
 import { Order, RevertReason, SignedOrder } from '@0x/types';
 import { BigNumber } from '@0x/utils';
@@ -6,12 +18,6 @@ import * as _ from 'lodash';
 
 import { TestExchangeInternalsContract } from '../../generated-wrappers/test_exchange_internals';
 import { artifacts } from '../../src/artifacts';
-import { getRevertReasonOrErrorMessageForSendTransactionAsync } from '../utils/assertions';
-import { chaiSetup } from '../utils/chai_setup';
-import { bytes32Values, testCombinatoriallyWithReferenceFuncAsync, uint256Values } from '../utils/combinatorial_utils';
-import { constants } from '../utils/constants';
-import { FillResults } from '../utils/types';
-import { provider, txDefaults, web3Wrapper } from '../utils/web3_wrapper';
 
 chaiSetup.configure();
 const expect = chai.expect;
diff --git a/contracts/core/test/exchange/libs.ts b/contracts/core/test/exchange/libs.ts
deleted file mode 100644
index 503ef0e0f..000000000
--- a/contracts/core/test/exchange/libs.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-import { BlockchainLifecycle } from '@0x/dev-utils';
-import { assetDataUtils, orderHashUtils } from '@0x/order-utils';
-import { SignedOrder } from '@0x/types';
-import { BigNumber } from '@0x/utils';
-import * as chai from 'chai';
-
-import { TestConstantsContract } from '../../generated-wrappers/test_constants';
-import { TestLibsContract } from '../../generated-wrappers/test_libs';
-import { artifacts } from '../../src/artifacts';
-import { addressUtils } from '../utils/address_utils';
-import { chaiSetup } from '../utils/chai_setup';
-import { constants } from '../utils/constants';
-import { OrderFactory } from '../utils/order_factory';
-import { provider, txDefaults, web3Wrapper } from '../utils/web3_wrapper';
-
-chaiSetup.configure();
-const expect = chai.expect;
-
-const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
-
-describe('Exchange libs', () => {
-    let signedOrder: SignedOrder;
-    let orderFactory: OrderFactory;
-    let libs: TestLibsContract;
-    let testConstants: TestConstantsContract;
-
-    before(async () => {
-        await blockchainLifecycle.startAsync();
-    });
-    after(async () => {
-        await blockchainLifecycle.revertAsync();
-    });
-    before(async () => {
-        const accounts = await web3Wrapper.getAvailableAddressesAsync();
-        const makerAddress = accounts[0];
-        libs = await TestLibsContract.deployFrom0xArtifactAsync(artifacts.TestLibs, provider, txDefaults);
-        testConstants = await TestConstantsContract.deployFrom0xArtifactAsync(
-            artifacts.TestConstants,
-            provider,
-            txDefaults,
-        );
-
-        const defaultOrderParams = {
-            ...constants.STATIC_ORDER_PARAMS,
-            exchangeAddress: libs.address,
-            makerAddress,
-            feeRecipientAddress: addressUtils.generatePseudoRandomAddress(),
-            makerAssetData: assetDataUtils.encodeERC20AssetData(addressUtils.generatePseudoRandomAddress()),
-            takerAssetData: assetDataUtils.encodeERC20AssetData(addressUtils.generatePseudoRandomAddress()),
-        };
-        const privateKey = constants.TESTRPC_PRIVATE_KEYS[accounts.indexOf(makerAddress)];
-        orderFactory = new OrderFactory(privateKey, defaultOrderParams);
-    });
-
-    beforeEach(async () => {
-        await blockchainLifecycle.startAsync();
-    });
-    afterEach(async () => {
-        await blockchainLifecycle.revertAsync();
-    });
-
-    describe('LibConstants', () => {
-        describe('ZRX_ASSET_DATA', () => {
-            it('should have the correct ZRX_ASSET_DATA', async () => {
-                const isValid = await testConstants.assertValidZrxAssetData.callAsync();
-                expect(isValid).to.be.equal(true);
-            });
-        });
-    });
-    // Note(albrow): These tests are designed to be supplemental to the
-    // combinatorial tests in test/exchange/internal. They test specific edge
-    // cases that are not covered by the combinatorial tests.
-    describe('LibMath', () => {
-        describe('isRoundingError', () => {
-            it('should return true if there is a rounding error of 0.1%', async () => {
-                const numerator = new BigNumber(20);
-                const denominator = new BigNumber(999);
-                const target = new BigNumber(50);
-                // rounding error = ((20*50/999) - floor(20*50/999)) / (20*50/999) = 0.1%
-                const isRoundingError = await libs.publicIsRoundingErrorFloor.callAsync(numerator, denominator, target);
-                expect(isRoundingError).to.be.true();
-            });
-            it('should return false if there is a rounding of 0.09%', async () => {
-                const numerator = new BigNumber(20);
-                const denominator = new BigNumber(9991);
-                const target = new BigNumber(500);
-                // rounding error = ((20*500/9991) - floor(20*500/9991)) / (20*500/9991) = 0.09%
-                const isRoundingError = await libs.publicIsRoundingErrorFloor.callAsync(numerator, denominator, target);
-                expect(isRoundingError).to.be.false();
-            });
-            it('should return true if there is a rounding error of 0.11%', async () => {
-                const numerator = new BigNumber(20);
-                const denominator = new BigNumber(9989);
-                const target = new BigNumber(500);
-                // rounding error = ((20*500/9989) - floor(20*500/9989)) / (20*500/9989) = 0.011%
-                const isRoundingError = await libs.publicIsRoundingErrorFloor.callAsync(numerator, denominator, target);
-                expect(isRoundingError).to.be.true();
-            });
-        });
-        describe('isRoundingErrorCeil', () => {
-            it('should return true if there is a rounding error of 0.1%', async () => {
-                const numerator = new BigNumber(20);
-                const denominator = new BigNumber(1001);
-                const target = new BigNumber(50);
-                // rounding error = (ceil(20*50/1001) - (20*50/1001)) / (20*50/1001) = 0.1%
-                const isRoundingError = await libs.publicIsRoundingErrorCeil.callAsync(numerator, denominator, target);
-                expect(isRoundingError).to.be.true();
-            });
-            it('should return false if there is a rounding of 0.09%', async () => {
-                const numerator = new BigNumber(20);
-                const denominator = new BigNumber(10009);
-                const target = new BigNumber(500);
-                // rounding error = (ceil(20*500/10009) - (20*500/10009)) / (20*500/10009) = 0.09%
-                const isRoundingError = await libs.publicIsRoundingErrorCeil.callAsync(numerator, denominator, target);
-                expect(isRoundingError).to.be.false();
-            });
-            it('should return true if there is a rounding error of 0.11%', async () => {
-                const numerator = new BigNumber(20);
-                const denominator = new BigNumber(10011);
-                const target = new BigNumber(500);
-                // rounding error = (ceil(20*500/10011) - (20*500/10011)) / (20*500/10011) = 0.11%
-                const isRoundingError = await libs.publicIsRoundingErrorCeil.callAsync(numerator, denominator, target);
-                expect(isRoundingError).to.be.true();
-            });
-        });
-    });
-
-    describe('LibOrder', () => {
-        describe('getOrderHash', () => {
-            it('should output the correct orderHash', async () => {
-                signedOrder = await orderFactory.newSignedOrderAsync();
-                const orderHashHex = await libs.publicGetOrderHash.callAsync(signedOrder);
-                expect(orderHashUtils.getOrderHashHex(signedOrder)).to.be.equal(orderHashHex);
-            });
-        });
-    });
-});
diff --git a/contracts/core/test/exchange/match_orders.ts b/contracts/core/test/exchange/match_orders.ts
index eea9992d9..0e841b359 100644
--- a/contracts/core/test/exchange/match_orders.ts
+++ b/contracts/core/test/exchange/match_orders.ts
@@ -1,3 +1,14 @@
+import {
+    chaiSetup,
+    constants,
+    ERC20BalancesByOwner,
+    ERC721TokenIdsByOwner,
+    expectTransactionFailedAsync,
+    OrderFactory,
+    provider,
+    txDefaults,
+    web3Wrapper,
+} from '@0x/contracts-test-utils';
 import { BlockchainLifecycle } from '@0x/dev-utils';
 import { assetDataUtils } from '@0x/order-utils';
 import { RevertReason } from '@0x/types';
@@ -14,16 +25,10 @@ import { ExchangeContract } from '../../generated-wrappers/exchange';
 import { ReentrantERC20TokenContract } from '../../generated-wrappers/reentrant_erc20_token';
 import { TestExchangeInternalsContract } from '../../generated-wrappers/test_exchange_internals';
 import { artifacts } from '../../src/artifacts';
-import { expectTransactionFailedAsync } from '../utils/assertions';
-import { chaiSetup } from '../utils/chai_setup';
-import { constants } from '../utils/constants';
 import { ERC20Wrapper } from '../utils/erc20_wrapper';
 import { ERC721Wrapper } from '../utils/erc721_wrapper';
 import { ExchangeWrapper } from '../utils/exchange_wrapper';
 import { MatchOrderTester } from '../utils/match_order_tester';
-import { OrderFactory } from '../utils/order_factory';
-import { ERC20BalancesByOwner, ERC721TokenIdsByOwner } from '../utils/types';
-import { provider, txDefaults, web3Wrapper } from '../utils/web3_wrapper';
 
 const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
 chaiSetup.configure();
diff --git a/contracts/core/test/exchange/signature_validator.ts b/contracts/core/test/exchange/signature_validator.ts
index 756c72766..b84a488a1 100644
--- a/contracts/core/test/exchange/signature_validator.ts
+++ b/contracts/core/test/exchange/signature_validator.ts
@@ -1,3 +1,14 @@
+import {
+    addressUtils,
+    chaiSetup,
+    constants,
+    expectContractCallFailedAsync,
+    LogDecoder,
+    OrderFactory,
+    provider,
+    txDefaults,
+    web3Wrapper,
+} from '@0x/contracts-test-utils';
 import { BlockchainLifecycle } from '@0x/dev-utils';
 import { assetDataUtils, orderHashUtils, signatureUtils } from '@0x/order-utils';
 import { RevertReason, SignatureType, SignedOrder } from '@0x/types';
@@ -13,13 +24,6 @@ import { TestStaticCallReceiverContract } from '../../generated-wrappers/test_st
 import { ValidatorContract } from '../../generated-wrappers/validator';
 import { WalletContract } from '../../generated-wrappers/wallet';
 import { artifacts } from '../../src/artifacts';
-import { addressUtils } from '../utils/address_utils';
-import { expectContractCallFailedAsync } from '../utils/assertions';
-import { chaiSetup } from '../utils/chai_setup';
-import { constants } from '../utils/constants';
-import { LogDecoder } from '../utils/log_decoder';
-import { OrderFactory } from '../utils/order_factory';
-import { provider, txDefaults, web3Wrapper } from '../utils/web3_wrapper';
 
 chaiSetup.configure();
 const expect = chai.expect;
@@ -73,7 +77,7 @@ describe('MixinSignatureValidator', () => {
             provider,
             txDefaults,
         );
-        signatureValidatorLogDecoder = new LogDecoder(web3Wrapper);
+        signatureValidatorLogDecoder = new LogDecoder(web3Wrapper, artifacts);
         await web3Wrapper.awaitTransactionSuccessAsync(
             await signatureValidator.setSignatureValidatorApproval.sendTransactionAsync(testValidator.address, true, {
                 from: signerAddress,
diff --git a/contracts/core/test/exchange/transactions.ts b/contracts/core/test/exchange/transactions.ts
index 1b5eef295..c4086d9be 100644
--- a/contracts/core/test/exchange/transactions.ts
+++ b/contracts/core/test/exchange/transactions.ts
@@ -1,3 +1,16 @@
+import {
+    chaiSetup,
+    constants,
+    ERC20BalancesByOwner,
+    expectTransactionFailedAsync,
+    OrderFactory,
+    orderUtils,
+    provider,
+    SignedTransaction,
+    TransactionFactory,
+    txDefaults,
+    web3Wrapper,
+} from '@0x/contracts-test-utils';
 import { BlockchainLifecycle } from '@0x/dev-utils';
 import { assetDataUtils, generatePseudoRandomSalt } from '@0x/order-utils';
 import { OrderWithoutExchangeAddress, RevertReason, SignedOrder } from '@0x/types';
@@ -11,16 +24,8 @@ import { ExchangeContract } from '../../generated-wrappers/exchange';
 import { ExchangeWrapperContract } from '../../generated-wrappers/exchange_wrapper';
 import { WhitelistContract } from '../../generated-wrappers/whitelist';
 import { artifacts } from '../../src/artifacts';
-import { expectTransactionFailedAsync } from '../utils/assertions';
-import { chaiSetup } from '../utils/chai_setup';
-import { constants } from '../utils/constants';
 import { ERC20Wrapper } from '../utils/erc20_wrapper';
 import { ExchangeWrapper } from '../utils/exchange_wrapper';
-import { OrderFactory } from '../utils/order_factory';
-import { orderUtils } from '../utils/order_utils';
-import { TransactionFactory } from '../utils/transaction_factory';
-import { ERC20BalancesByOwner, SignedTransaction } from '../utils/types';
-import { provider, txDefaults, web3Wrapper } from '../utils/web3_wrapper';
 
 chaiSetup.configure();
 const expect = chai.expect;
diff --git a/contracts/core/test/exchange/wrapper.ts b/contracts/core/test/exchange/wrapper.ts
index 6b660aac5..17cb7a3bb 100644
--- a/contracts/core/test/exchange/wrapper.ts
+++ b/contracts/core/test/exchange/wrapper.ts
@@ -1,3 +1,16 @@
+import {
+    chaiSetup,
+    constants,
+    ERC20BalancesByOwner,
+    expectTransactionFailedAsync,
+    getLatestBlockTimestampAsync,
+    increaseTimeAndMineBlockAsync,
+    OrderFactory,
+    OrderStatus,
+    provider,
+    txDefaults,
+    web3Wrapper,
+} from '@0x/contracts-test-utils';
 import { BlockchainLifecycle } from '@0x/dev-utils';
 import { assetDataUtils, orderHashUtils } from '@0x/order-utils';
 import { RevertReason, SignedOrder } from '@0x/types';
@@ -13,16 +26,9 @@ import { ERC721ProxyContract } from '../../generated-wrappers/erc721_proxy';
 import { ExchangeContract } from '../../generated-wrappers/exchange';
 import { ReentrantERC20TokenContract } from '../../generated-wrappers/reentrant_erc20_token';
 import { artifacts } from '../../src/artifacts';
-import { expectTransactionFailedAsync } from '../utils/assertions';
-import { getLatestBlockTimestampAsync, increaseTimeAndMineBlockAsync } from '../utils/block_timestamp';
-import { chaiSetup } from '../utils/chai_setup';
-import { constants } from '../utils/constants';
 import { ERC20Wrapper } from '../utils/erc20_wrapper';
 import { ERC721Wrapper } from '../utils/erc721_wrapper';
 import { ExchangeWrapper } from '../utils/exchange_wrapper';
-import { OrderFactory } from '../utils/order_factory';
-import { ERC20BalancesByOwner, OrderStatus } from '../utils/types';
-import { provider, txDefaults, web3Wrapper } from '../utils/web3_wrapper';
 
 chaiSetup.configure();
 const expect = chai.expect;
diff --git a/contracts/core/test/extensions/dutch_auction.ts b/contracts/core/test/extensions/dutch_auction.ts
index c133d8c60..54e6092d7 100644
--- a/contracts/core/test/extensions/dutch_auction.ts
+++ b/contracts/core/test/extensions/dutch_auction.ts
@@ -1,3 +1,15 @@
+import {
+    chaiSetup,
+    constants,
+    ContractName,
+    ERC20BalancesByOwner,
+    expectTransactionFailedAsync,
+    getLatestBlockTimestampAsync,
+    OrderFactory,
+    provider,
+    txDefaults,
+    web3Wrapper,
+} from '@0x/contracts-test-utils';
 import { BlockchainLifecycle } from '@0x/dev-utils';
 import { assetDataUtils, generatePseudoRandomSalt } from '@0x/order-utils';
 import { RevertReason, SignedOrder } from '@0x/types';
@@ -14,16 +26,9 @@ import { DutchAuctionContract } from '../../generated-wrappers/dutch_auction';
 import { ExchangeContract } from '../../generated-wrappers/exchange';
 import { WETH9Contract } from '../../generated-wrappers/weth9';
 import { artifacts } from '../../src/artifacts';
-import { expectTransactionFailedAsync } from '../utils/assertions';
-import { getLatestBlockTimestampAsync } from '../utils/block_timestamp';
-import { chaiSetup } from '../utils/chai_setup';
-import { constants } from '../utils/constants';
 import { ERC20Wrapper } from '../utils/erc20_wrapper';
 import { ERC721Wrapper } from '../utils/erc721_wrapper';
 import { ExchangeWrapper } from '../utils/exchange_wrapper';
-import { OrderFactory } from '../utils/order_factory';
-import { ContractName, ERC20BalancesByOwner } from '../utils/types';
-import { provider, txDefaults, web3Wrapper } from '../utils/web3_wrapper';
 
 chaiSetup.configure();
 const expect = chai.expect;
@@ -57,16 +62,6 @@ describe(ContractName.DutchAuction, () => {
     let erc721MakerAssetIds: BigNumber[];
     const tenMinutesInSeconds = 10 * 60;
 
-    async function increaseTimeAsync(): Promise<void> {
-        const timestampBefore = await getLatestBlockTimestampAsync();
-        await web3Wrapper.increaseTimeAsync(5);
-        const timestampAfter = await getLatestBlockTimestampAsync();
-        // HACK send some transactions when a time increase isn't supported
-        if (timestampAfter === timestampBefore) {
-            await web3Wrapper.sendTransactionAsync({ to: makerAddress, from: makerAddress, value: new BigNumber(1) });
-        }
-    }
-
     function extendMakerAssetData(makerAssetData: string, beginTimeSeconds: BigNumber, beginAmount: BigNumber): string {
         return ethUtil.bufferToHex(
             Buffer.concat([
@@ -271,34 +266,6 @@ describe(ContractName.DutchAuction, () => {
                 erc20Balances[takerAddress][wethContract.address].minus(beforeAuctionDetails.currentAmount),
             );
         });
-        it('should have valid getAuctionDetails at some block in the future', async () => {
-            let auctionDetails = await dutchAuctionContract.getAuctionDetails.callAsync(sellOrder);
-            const beforeAmount = auctionDetails.currentAmount;
-            await increaseTimeAsync();
-            auctionDetails = await dutchAuctionContract.getAuctionDetails.callAsync(sellOrder);
-            const currentAmount = auctionDetails.currentAmount;
-            expect(beforeAmount).to.be.bignumber.greaterThan(currentAmount);
-
-            buyOrder = await buyerOrderFactory.newSignedOrderAsync({
-                makerAssetAmount: currentAmount,
-            });
-            const txHash = await dutchAuctionContract.matchOrders.sendTransactionAsync(
-                buyOrder,
-                sellOrder,
-                buyOrder.signature,
-                sellOrder.signature,
-                {
-                    from: takerAddress,
-                    // HACK geth seems to miscalculate the gas required intermittently
-                    gas: 400000,
-                },
-            );
-            await web3Wrapper.awaitTransactionSuccessAsync(txHash);
-            const newBalances = await erc20Wrapper.getBalancesAsync();
-            expect(newBalances[makerAddress][wethContract.address]).to.be.bignumber.equal(
-                erc20Balances[makerAddress][wethContract.address].plus(currentAmount),
-            );
-        });
         it('maker fees on sellOrder are paid to the fee receipient', async () => {
             sellOrder = await sellerOrderFactory.newSignedOrderAsync({
                 makerFee: new BigNumber(1),
@@ -370,7 +337,6 @@ describe(ContractName.DutchAuction, () => {
             );
         });
         it('cannot be filled for less than the current price', async () => {
-            await increaseTimeAsync();
             buyOrder = await buyerOrderFactory.newSignedOrderAsync({
                 makerAssetAmount: sellOrder.takerAssetAmount,
             });
diff --git a/contracts/core/test/extensions/forwarder.ts b/contracts/core/test/extensions/forwarder.ts
index c006be0fe..44ad4d6ff 100644
--- a/contracts/core/test/extensions/forwarder.ts
+++ b/contracts/core/test/extensions/forwarder.ts
@@ -1,3 +1,16 @@
+import {
+    chaiSetup,
+    constants,
+    ContractName,
+    ERC20BalancesByOwner,
+    expectContractCreationFailedAsync,
+    expectTransactionFailedAsync,
+    OrderFactory,
+    provider,
+    sendTransactionResult,
+    txDefaults,
+    web3Wrapper,
+} from '@0x/contracts-test-utils';
 import { BlockchainLifecycle } from '@0x/dev-utils';
 import { assetDataUtils } from '@0x/order-utils';
 import { RevertReason, SignedOrder } from '@0x/types';
@@ -12,20 +25,10 @@ import { ExchangeContract } from '../../generated-wrappers/exchange';
 import { ForwarderContract } from '../../generated-wrappers/forwarder';
 import { WETH9Contract } from '../../generated-wrappers/weth9';
 import { artifacts } from '../../src/artifacts';
-import {
-    expectContractCreationFailedAsync,
-    expectTransactionFailedAsync,
-    sendTransactionResult,
-} from '../utils/assertions';
-import { chaiSetup } from '../utils/chai_setup';
-import { constants } from '../utils/constants';
 import { ERC20Wrapper } from '../utils/erc20_wrapper';
 import { ERC721Wrapper } from '../utils/erc721_wrapper';
 import { ExchangeWrapper } from '../utils/exchange_wrapper';
 import { ForwarderWrapper } from '../utils/forwarder_wrapper';
-import { OrderFactory } from '../utils/order_factory';
-import { ContractName, ERC20BalancesByOwner } from '../utils/types';
-import { provider, txDefaults, web3Wrapper } from '../utils/web3_wrapper';
 
 chaiSetup.configure();
 const expect = chai.expect;
diff --git a/contracts/core/test/extensions/order_validator.ts b/contracts/core/test/extensions/order_validator.ts
index 37d7c4c5a..3dbe76f6e 100644
--- a/contracts/core/test/extensions/order_validator.ts
+++ b/contracts/core/test/extensions/order_validator.ts
@@ -1,3 +1,12 @@
+import {
+    chaiSetup,
+    constants,
+    OrderFactory,
+    OrderStatus,
+    provider,
+    txDefaults,
+    web3Wrapper,
+} from '@0x/contracts-test-utils';
 import { BlockchainLifecycle } from '@0x/dev-utils';
 import { assetDataUtils, orderHashUtils } from '@0x/order-utils';
 import { SignedOrder } from '@0x/types';
@@ -12,14 +21,9 @@ import { ERC721ProxyContract } from '../../generated-wrappers/erc721_proxy';
 import { ExchangeContract } from '../../generated-wrappers/exchange';
 import { OrderValidatorContract } from '../../generated-wrappers/order_validator';
 import { artifacts } from '../../src/artifacts';
-import { chaiSetup } from '../utils/chai_setup';
-import { constants } from '../utils/constants';
 import { ERC20Wrapper } from '../utils/erc20_wrapper';
 import { ERC721Wrapper } from '../utils/erc721_wrapper';
 import { ExchangeWrapper } from '../utils/exchange_wrapper';
-import { OrderFactory } from '../utils/order_factory';
-import { OrderStatus } from '../utils/types';
-import { provider, txDefaults, web3Wrapper } from '../utils/web3_wrapper';
 
 chaiSetup.configure();
 const expect = chai.expect;
diff --git a/contracts/core/test/global_hooks.ts b/contracts/core/test/global_hooks.ts
index 2e9ac9e21..f8ace376a 100644
--- a/contracts/core/test/global_hooks.ts
+++ b/contracts/core/test/global_hooks.ts
@@ -1,8 +1,9 @@
 import { env, EnvVars } from '@0x/dev-utils';
 
-import { coverage } from './utils/coverage';
-import { profiler } from './utils/profiler';
-
+import { coverage, profiler, provider } from '@0x/contracts-test-utils';
+before('start web3 provider', () => {
+    provider.start();
+});
 after('generate coverage report', async () => {
     if (env.parseBoolean(EnvVars.SolidityCoverage)) {
         const coverageSubprovider = coverage.getCoverageSubproviderSingleton();
@@ -12,4 +13,5 @@ after('generate coverage report', async () => {
         const profilerSubprovider = profiler.getProfilerSubproviderSingleton();
         await profilerSubprovider.writeProfilerOutputAsync();
     }
+    provider.stop();
 });
diff --git a/contracts/core/test/libraries/lib_bytes.ts b/contracts/core/test/libraries/lib_bytes.ts
deleted file mode 100644
index b1a389f00..000000000
--- a/contracts/core/test/libraries/lib_bytes.ts
+++ /dev/null
@@ -1,871 +0,0 @@
-import { BlockchainLifecycle } from '@0x/dev-utils';
-import { generatePseudoRandomSalt } from '@0x/order-utils';
-import { RevertReason } from '@0x/types';
-import { BigNumber } from '@0x/utils';
-import BN = require('bn.js');
-import * as chai from 'chai';
-import ethUtil = require('ethereumjs-util');
-import * as _ from 'lodash';
-
-import { TestLibBytesContract } from '../../generated-wrappers/test_lib_bytes';
-import { artifacts } from '../../src/artifacts';
-import { expectContractCallFailedAsync } from '../utils/assertions';
-import { chaiSetup } from '../utils/chai_setup';
-import { constants } from '../utils/constants';
-import { typeEncodingUtils } from '../utils/type_encoding_utils';
-import { provider, txDefaults, web3Wrapper } from '../utils/web3_wrapper';
-
-chaiSetup.configure();
-const expect = chai.expect;
-const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
-
-// BUG: Ideally we would use Buffer.from(memory).toString('hex')
-// https://github.com/Microsoft/TypeScript/issues/23155
-const toHex = (buf: Uint8Array): string => buf.reduce((a, v) => a + ('00' + v.toString(16)).slice(-2), '0x');
-
-const fromHex = (str: string): Uint8Array => Uint8Array.from(Buffer.from(str.slice(2), 'hex'));
-
-describe('LibBytes', () => {
-    let libBytes: TestLibBytesContract;
-    const byteArrayShorterThan32Bytes = '0x012345';
-    const byteArrayShorterThan20Bytes = byteArrayShorterThan32Bytes;
-    const byteArrayLongerThan32Bytes =
-        '0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef';
-    const byteArrayLongerThan32BytesFirstBytesSwapped =
-        '0x2301456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef';
-    const byteArrayLongerThan32BytesLastBytesSwapped =
-        '0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abefcd';
-    let testAddress: string;
-    let testAddressB: string;
-    const testBytes32 = '0x102030405060708090a0b0c0d0e0f0102030405060708090a0b0c0d0e0f01020';
-    const testBytes32B = '0x534877abd8443578526845cdfef020047528759477fedef87346527659aced32';
-    const testUint256 = new BigNumber(testBytes32, 16);
-    const testUint256B = new BigNumber(testBytes32B, 16);
-    const testBytes4 = '0xabcdef12';
-    const testByte = '0xab';
-    let shortData: string;
-    let shortTestBytes: string;
-    let shortTestBytesAsBuffer: Buffer;
-    let wordOfData: string;
-    let wordOfTestBytes: string;
-    let wordOfTestBytesAsBuffer: Buffer;
-    let longData: string;
-    let longTestBytes: string;
-    let longTestBytesAsBuffer: Buffer;
-
-    before(async () => {
-        await blockchainLifecycle.startAsync();
-    });
-    after(async () => {
-        await blockchainLifecycle.revertAsync();
-    });
-    before(async () => {
-        // Setup accounts & addresses
-        const accounts = await web3Wrapper.getAvailableAddressesAsync();
-        testAddress = accounts[1];
-        testAddressB = accounts[2];
-        // Deploy LibBytes
-        libBytes = await TestLibBytesContract.deployFrom0xArtifactAsync(artifacts.TestLibBytes, provider, txDefaults);
-        // Verify lengths of test data
-        const byteArrayShorterThan32BytesLength = ethUtil.toBuffer(byteArrayShorterThan32Bytes).byteLength;
-        expect(byteArrayShorterThan32BytesLength).to.be.lessThan(32);
-        const byteArrayLongerThan32BytesLength = ethUtil.toBuffer(byteArrayLongerThan32Bytes).byteLength;
-        expect(byteArrayLongerThan32BytesLength).to.be.greaterThan(32);
-        const testBytes32Length = ethUtil.toBuffer(testBytes32).byteLength;
-        expect(testBytes32Length).to.be.equal(32);
-        // Create short test bytes
-        shortData = '0xffffaa';
-        const encodedShortData = ethUtil.toBuffer(shortData);
-        const shortDataLength = new BigNumber(encodedShortData.byteLength);
-        const encodedShortDataLength = typeEncodingUtils.encodeUint256(shortDataLength);
-        shortTestBytesAsBuffer = Buffer.concat([encodedShortDataLength, encodedShortData]);
-        shortTestBytes = ethUtil.bufferToHex(shortTestBytesAsBuffer);
-        // Create test bytes one word in length
-        wordOfData = ethUtil.bufferToHex(typeEncodingUtils.encodeUint256(generatePseudoRandomSalt()));
-        const encodedWordOfData = ethUtil.toBuffer(wordOfData);
-        const wordOfDataLength = new BigNumber(encodedWordOfData.byteLength);
-        const encodedWordOfDataLength = typeEncodingUtils.encodeUint256(wordOfDataLength);
-        wordOfTestBytesAsBuffer = Buffer.concat([encodedWordOfDataLength, encodedWordOfData]);
-        wordOfTestBytes = ethUtil.bufferToHex(wordOfTestBytesAsBuffer);
-        // Create long test bytes (combines short test bytes with word of test bytes)
-        longData = ethUtil.bufferToHex(Buffer.concat([encodedShortData, encodedWordOfData]));
-        const longDataLength = new BigNumber(encodedShortData.byteLength + encodedWordOfData.byteLength);
-        const encodedLongDataLength = typeEncodingUtils.encodeUint256(longDataLength);
-        longTestBytesAsBuffer = Buffer.concat([encodedLongDataLength, encodedShortData, encodedWordOfData]);
-        longTestBytes = ethUtil.bufferToHex(longTestBytesAsBuffer);
-    });
-    beforeEach(async () => {
-        await blockchainLifecycle.startAsync();
-    });
-    afterEach(async () => {
-        await blockchainLifecycle.revertAsync();
-    });
-
-    describe('popLastByte', () => {
-        it('should revert if length is 0', async () => {
-            return expectContractCallFailedAsync(
-                libBytes.publicPopLastByte.callAsync(constants.NULL_BYTES),
-                RevertReason.LibBytesGreaterThanZeroLengthRequired,
-            );
-        });
-        it('should pop the last byte from the input and return it when array holds more than 1 byte', async () => {
-            const [newBytes, poppedByte] = await libBytes.publicPopLastByte.callAsync(byteArrayLongerThan32Bytes);
-            const expectedNewBytes = byteArrayLongerThan32Bytes.slice(0, -2);
-            const expectedPoppedByte = `0x${byteArrayLongerThan32Bytes.slice(-2)}`;
-            expect(newBytes).to.equal(expectedNewBytes);
-            expect(poppedByte).to.equal(expectedPoppedByte);
-        });
-        it('should pop the last byte from the input and return it when array is exactly 1 byte', async () => {
-            const [newBytes, poppedByte] = await libBytes.publicPopLastByte.callAsync(testByte);
-            const expectedNewBytes = '0x';
-            expect(newBytes).to.equal(expectedNewBytes);
-            return expect(poppedByte).to.be.equal(testByte);
-        });
-    });
-
-    describe('popLast20Bytes', () => {
-        it('should revert if length is less than 20', async () => {
-            return expectContractCallFailedAsync(
-                libBytes.publicPopLast20Bytes.callAsync(byteArrayShorterThan20Bytes),
-                RevertReason.LibBytesGreaterOrEqualTo20LengthRequired,
-            );
-        });
-        it('should pop the last 20 bytes from the input and return it when array holds more than 20 bytes', async () => {
-            const [newBytes, poppedAddress] = await libBytes.publicPopLast20Bytes.callAsync(byteArrayLongerThan32Bytes);
-            const expectedNewBytes = byteArrayLongerThan32Bytes.slice(0, -40);
-            const expectedPoppedAddress = `0x${byteArrayLongerThan32Bytes.slice(-40)}`;
-            expect(newBytes).to.equal(expectedNewBytes);
-            expect(poppedAddress).to.equal(expectedPoppedAddress);
-        });
-        it('should pop the last 20 bytes from the input and return it when array is exactly 20 bytes', async () => {
-            const [newBytes, poppedAddress] = await libBytes.publicPopLast20Bytes.callAsync(testAddress);
-            const expectedNewBytes = '0x';
-            const expectedPoppedAddress = testAddress;
-            expect(newBytes).to.equal(expectedNewBytes);
-            expect(poppedAddress).to.equal(expectedPoppedAddress);
-        });
-    });
-
-    describe('equals', () => {
-        it('should return true if byte arrays are equal (both arrays < 32 bytes)', async () => {
-            const isEqual = await libBytes.publicEquals.callAsync(
-                byteArrayShorterThan32Bytes,
-                byteArrayShorterThan32Bytes,
-            );
-            return expect(isEqual).to.be.true();
-        });
-        it('should return true if byte arrays are equal (both arrays > 32 bytes)', async () => {
-            const isEqual = await libBytes.publicEquals.callAsync(
-                byteArrayLongerThan32Bytes,
-                byteArrayLongerThan32Bytes,
-            );
-            return expect(isEqual).to.be.true();
-        });
-        it('should return false if byte arrays are not equal (first array < 32 bytes, second array > 32 bytes)', async () => {
-            const isEqual = await libBytes.publicEquals.callAsync(
-                byteArrayShorterThan32Bytes,
-                byteArrayLongerThan32Bytes,
-            );
-            return expect(isEqual).to.be.false();
-        });
-        it('should return false if byte arrays are not equal (first array > 32 bytes, second array < 32 bytes)', async () => {
-            const isEqual = await libBytes.publicEquals.callAsync(
-                byteArrayLongerThan32Bytes,
-                byteArrayShorterThan32Bytes,
-            );
-            return expect(isEqual).to.be.false();
-        });
-        it('should return false if byte arrays are not equal (same length, but a byte in first word differs)', async () => {
-            const isEqual = await libBytes.publicEquals.callAsync(
-                byteArrayLongerThan32BytesFirstBytesSwapped,
-                byteArrayLongerThan32Bytes,
-            );
-            return expect(isEqual).to.be.false();
-        });
-        it('should return false if byte arrays are not equal (same length, but a byte in last word differs)', async () => {
-            const isEqual = await libBytes.publicEquals.callAsync(
-                byteArrayLongerThan32BytesLastBytesSwapped,
-                byteArrayLongerThan32Bytes,
-            );
-            return expect(isEqual).to.be.false();
-        });
-
-        describe('should ignore trailing data', () => {
-            it('should return true when both < 32 bytes', async () => {
-                const isEqual = await libBytes.publicEqualsPop1.callAsync('0x0102', '0x0103');
-                return expect(isEqual).to.be.true();
-            });
-        });
-    });
-
-    describe('deepCopyBytes', () => {
-        it('should revert if dest is shorter than source', async () => {
-            return expectContractCallFailedAsync(
-                libBytes.publicDeepCopyBytes.callAsync(byteArrayShorterThan32Bytes, byteArrayLongerThan32Bytes),
-                RevertReason.LibBytesGreaterOrEqualToSourceBytesLengthRequired,
-            );
-        });
-        it('should overwrite dest with source if source and dest have equal length', async () => {
-            const zeroedByteArrayLongerThan32Bytes = `0x${_.repeat('0', byteArrayLongerThan32Bytes.length - 2)}`;
-            const zeroedBytesAfterCopy = await libBytes.publicDeepCopyBytes.callAsync(
-                zeroedByteArrayLongerThan32Bytes,
-                byteArrayLongerThan32Bytes,
-            );
-            return expect(zeroedBytesAfterCopy).to.be.equal(byteArrayLongerThan32Bytes);
-        });
-        it('should overwrite the leftmost len(source) bytes of dest if dest is larger than source', async () => {
-            const zeroedByteArrayLongerThan32Bytes = `0x${_.repeat('0', byteArrayLongerThan32Bytes.length * 2)}`;
-            const zeroedBytesAfterCopy = await libBytes.publicDeepCopyBytes.callAsync(
-                zeroedByteArrayLongerThan32Bytes,
-                byteArrayLongerThan32Bytes,
-            );
-            const copiedBytes = zeroedBytesAfterCopy.slice(0, byteArrayLongerThan32Bytes.length);
-            return expect(copiedBytes).to.be.equal(byteArrayLongerThan32Bytes);
-        });
-        it('should not overwrite the rightmost bytes of dest if dest is larger than source', async () => {
-            const zeroedByteArrayLongerThan32Bytes = `0x${_.repeat('0', byteArrayLongerThan32Bytes.length * 2)}`;
-            const zeroedBytesAfterCopy = await libBytes.publicDeepCopyBytes.callAsync(
-                zeroedByteArrayLongerThan32Bytes,
-                byteArrayLongerThan32Bytes,
-            );
-            const expectedNotCopiedBytes = zeroedByteArrayLongerThan32Bytes.slice(byteArrayLongerThan32Bytes.length);
-            const notCopiedBytes = zeroedBytesAfterCopy.slice(byteArrayLongerThan32Bytes.length);
-            return expect(notCopiedBytes).to.be.equal(expectedNotCopiedBytes);
-        });
-    });
-
-    describe('readAddress', () => {
-        it('should successfully read address when the address takes up the whole array', async () => {
-            const byteArray = ethUtil.addHexPrefix(testAddress);
-            const testAddressOffset = new BigNumber(0);
-            const address = await libBytes.publicReadAddress.callAsync(byteArray, testAddressOffset);
-            return expect(address).to.be.equal(testAddress);
-        });
-        it('should successfully read address when it is offset in the array', async () => {
-            const addressByteArrayBuffer = ethUtil.toBuffer(testAddress);
-            const prefixByteArrayBuffer = ethUtil.toBuffer('0xabcdef');
-            const combinedByteArrayBuffer = Buffer.concat([prefixByteArrayBuffer, addressByteArrayBuffer]);
-            const combinedByteArray = ethUtil.bufferToHex(combinedByteArrayBuffer);
-            const testAddressOffset = new BigNumber(prefixByteArrayBuffer.byteLength);
-            const address = await libBytes.publicReadAddress.callAsync(combinedByteArray, testAddressOffset);
-            return expect(address).to.be.equal(testAddress);
-        });
-        it('should fail if the byte array is too short to hold an address', async () => {
-            const shortByteArray = '0xabcdef';
-            const offset = new BigNumber(0);
-            return expectContractCallFailedAsync(
-                libBytes.publicReadAddress.callAsync(shortByteArray, offset),
-                RevertReason.LibBytesGreaterOrEqualTo20LengthRequired,
-            );
-        });
-        it('should fail if the length between the offset and end of the byte array is too short to hold an address', async () => {
-            const byteArray = testAddress;
-            const badOffset = new BigNumber(ethUtil.toBuffer(byteArray).byteLength);
-            return expectContractCallFailedAsync(
-                libBytes.publicReadAddress.callAsync(byteArray, badOffset),
-                RevertReason.LibBytesGreaterOrEqualTo20LengthRequired,
-            );
-        });
-    });
-
-    describe('writeAddress', () => {
-        it('should successfully write address when the address takes up the whole array', async () => {
-            const byteArray = testAddress;
-            const testAddressOffset = new BigNumber(0);
-            const newByteArray = await libBytes.publicWriteAddress.callAsync(
-                byteArray,
-                testAddressOffset,
-                testAddressB,
-            );
-            return expect(newByteArray).to.be.equal(testAddressB);
-        });
-        it('should successfully write address when it is offset in the array', async () => {
-            const addressByteArrayBuffer = ethUtil.toBuffer(testAddress);
-            const prefixByteArrayBuffer = ethUtil.toBuffer('0xabcdef');
-            const combinedByteArrayBuffer = Buffer.concat([prefixByteArrayBuffer, addressByteArrayBuffer]);
-            const combinedByteArray = ethUtil.bufferToHex(combinedByteArrayBuffer);
-            const testAddressOffset = new BigNumber(prefixByteArrayBuffer.byteLength);
-            const newByteArray = await libBytes.publicWriteAddress.callAsync(
-                combinedByteArray,
-                testAddressOffset,
-                testAddressB,
-            );
-            const newByteArrayBuffer = ethUtil.toBuffer(newByteArray);
-            const addressFromOffsetBuffer = newByteArrayBuffer.slice(prefixByteArrayBuffer.byteLength);
-            const addressFromOffset = ethUtil.addHexPrefix(ethUtil.bufferToHex(addressFromOffsetBuffer));
-            return expect(addressFromOffset).to.be.equal(testAddressB);
-        });
-        it('should fail if the byte array is too short to hold an address', async () => {
-            const offset = new BigNumber(0);
-            return expectContractCallFailedAsync(
-                libBytes.publicWriteAddress.callAsync(byteArrayShorterThan20Bytes, offset, testAddress),
-                RevertReason.LibBytesGreaterOrEqualTo20LengthRequired,
-            );
-        });
-        it('should fail if the length between the offset and end of the byte array is too short to hold an address', async () => {
-            const byteArray = byteArrayLongerThan32Bytes;
-            const badOffset = new BigNumber(ethUtil.toBuffer(byteArray).byteLength);
-            return expectContractCallFailedAsync(
-                libBytes.publicWriteAddress.callAsync(byteArray, badOffset, testAddress),
-                RevertReason.LibBytesGreaterOrEqualTo20LengthRequired,
-            );
-        });
-    });
-
-    describe('readBytes32', () => {
-        it('should successfully read bytes32 when the bytes32 takes up the whole array', async () => {
-            const testBytes32Offset = new BigNumber(0);
-            const bytes32 = await libBytes.publicReadBytes32.callAsync(testBytes32, testBytes32Offset);
-            return expect(bytes32).to.be.equal(testBytes32);
-        });
-        it('should successfully read bytes32 when it is offset in the array', async () => {
-            const bytes32ByteArrayBuffer = ethUtil.toBuffer(testBytes32);
-            const prefixByteArrayBuffer = ethUtil.toBuffer('0xabcdef');
-            const combinedByteArrayBuffer = Buffer.concat([prefixByteArrayBuffer, bytes32ByteArrayBuffer]);
-            const combinedByteArray = ethUtil.bufferToHex(combinedByteArrayBuffer);
-            const testBytes32Offset = new BigNumber(prefixByteArrayBuffer.byteLength);
-            const bytes32 = await libBytes.publicReadBytes32.callAsync(combinedByteArray, testBytes32Offset);
-            return expect(bytes32).to.be.equal(testBytes32);
-        });
-        it('should fail if the byte array is too short to hold a bytes32', async () => {
-            const offset = new BigNumber(0);
-            return expectContractCallFailedAsync(
-                libBytes.publicReadBytes32.callAsync(byteArrayShorterThan32Bytes, offset),
-                RevertReason.LibBytesGreaterOrEqualTo32LengthRequired,
-            );
-        });
-        it('should fail if the length between the offset and end of the byte array is too short to hold a bytes32', async () => {
-            const badOffset = new BigNumber(ethUtil.toBuffer(testBytes32).byteLength);
-            return expectContractCallFailedAsync(
-                libBytes.publicReadBytes32.callAsync(testBytes32, badOffset),
-                RevertReason.LibBytesGreaterOrEqualTo32LengthRequired,
-            );
-        });
-    });
-
-    describe('writeBytes32', () => {
-        it('should successfully write bytes32 when the address takes up the whole array', async () => {
-            const byteArray = testBytes32;
-            const testBytes32Offset = new BigNumber(0);
-            const newByteArray = await libBytes.publicWriteBytes32.callAsync(
-                byteArray,
-                testBytes32Offset,
-                testBytes32B,
-            );
-            return expect(newByteArray).to.be.equal(testBytes32B);
-        });
-        it('should successfully write bytes32 when it is offset in the array', async () => {
-            const bytes32ByteArrayBuffer = ethUtil.toBuffer(testBytes32);
-            const prefixByteArrayBuffer = ethUtil.toBuffer('0xabcdef');
-            const combinedByteArrayBuffer = Buffer.concat([prefixByteArrayBuffer, bytes32ByteArrayBuffer]);
-            const combinedByteArray = ethUtil.bufferToHex(combinedByteArrayBuffer);
-            const testBytes32Offset = new BigNumber(prefixByteArrayBuffer.byteLength);
-            const newByteArray = await libBytes.publicWriteBytes32.callAsync(
-                combinedByteArray,
-                testBytes32Offset,
-                testBytes32B,
-            );
-            const newByteArrayBuffer = ethUtil.toBuffer(newByteArray);
-            const bytes32FromOffsetBuffer = newByteArrayBuffer.slice(prefixByteArrayBuffer.byteLength);
-            const bytes32FromOffset = ethUtil.addHexPrefix(ethUtil.bufferToHex(bytes32FromOffsetBuffer));
-            return expect(bytes32FromOffset).to.be.equal(testBytes32B);
-        });
-        it('should fail if the byte array is too short to hold a bytes32', async () => {
-            const offset = new BigNumber(0);
-            return expectContractCallFailedAsync(
-                libBytes.publicWriteBytes32.callAsync(byteArrayShorterThan32Bytes, offset, testBytes32),
-                RevertReason.LibBytesGreaterOrEqualTo32LengthRequired,
-            );
-        });
-        it('should fail if the length between the offset and end of the byte array is too short to hold a bytes32', async () => {
-            const byteArray = byteArrayLongerThan32Bytes;
-            const badOffset = new BigNumber(ethUtil.toBuffer(byteArray).byteLength);
-            return expectContractCallFailedAsync(
-                libBytes.publicWriteBytes32.callAsync(byteArray, badOffset, testBytes32),
-                RevertReason.LibBytesGreaterOrEqualTo32LengthRequired,
-            );
-        });
-    });
-
-    describe('readUint256', () => {
-        it('should successfully read uint256 when the uint256 takes up the whole array', async () => {
-            const formattedTestUint256 = new BN(testUint256.toString(10));
-            const testUint256AsBuffer = ethUtil.toBuffer(formattedTestUint256);
-            const byteArray = ethUtil.bufferToHex(testUint256AsBuffer);
-            const testUint256Offset = new BigNumber(0);
-            const uint256 = await libBytes.publicReadUint256.callAsync(byteArray, testUint256Offset);
-            return expect(uint256).to.bignumber.equal(testUint256);
-        });
-        it('should successfully read uint256 when it is offset in the array', async () => {
-            const prefixByteArrayBuffer = ethUtil.toBuffer('0xabcdef');
-            const formattedTestUint256 = new BN(testUint256.toString(10));
-            const testUint256AsBuffer = ethUtil.toBuffer(formattedTestUint256);
-            const combinedByteArrayBuffer = Buffer.concat([prefixByteArrayBuffer, testUint256AsBuffer]);
-            const combinedByteArray = ethUtil.bufferToHex(combinedByteArrayBuffer);
-            const testUint256Offset = new BigNumber(prefixByteArrayBuffer.byteLength);
-            const uint256 = await libBytes.publicReadUint256.callAsync(combinedByteArray, testUint256Offset);
-            return expect(uint256).to.bignumber.equal(testUint256);
-        });
-        it('should fail if the byte array is too short to hold a uint256', async () => {
-            const offset = new BigNumber(0);
-            return expectContractCallFailedAsync(
-                libBytes.publicReadUint256.callAsync(byteArrayShorterThan32Bytes, offset),
-                RevertReason.LibBytesGreaterOrEqualTo32LengthRequired,
-            );
-        });
-        it('should fail if the length between the offset and end of the byte array is too short to hold a uint256', async () => {
-            const formattedTestUint256 = new BN(testUint256.toString(10));
-            const testUint256AsBuffer = ethUtil.toBuffer(formattedTestUint256);
-            const byteArray = ethUtil.bufferToHex(testUint256AsBuffer);
-            const badOffset = new BigNumber(testUint256AsBuffer.byteLength);
-            return expectContractCallFailedAsync(
-                libBytes.publicReadUint256.callAsync(byteArray, badOffset),
-                RevertReason.LibBytesGreaterOrEqualTo32LengthRequired,
-            );
-        });
-    });
-
-    describe('writeUint256', () => {
-        it('should successfully write uint256 when the address takes up the whole array', async () => {
-            const byteArray = testBytes32;
-            const testUint256Offset = new BigNumber(0);
-            const newByteArray = await libBytes.publicWriteUint256.callAsync(
-                byteArray,
-                testUint256Offset,
-                testUint256B,
-            );
-            const newByteArrayAsUint256 = new BigNumber(newByteArray, 16);
-            return expect(newByteArrayAsUint256).to.be.bignumber.equal(testUint256B);
-        });
-        it('should successfully write uint256 when it is offset in the array', async () => {
-            const bytes32ByteArrayBuffer = ethUtil.toBuffer(testBytes32);
-            const prefixByteArrayBuffer = ethUtil.toBuffer('0xabcdef');
-            const combinedByteArrayBuffer = Buffer.concat([prefixByteArrayBuffer, bytes32ByteArrayBuffer]);
-            const combinedByteArray = ethUtil.bufferToHex(combinedByteArrayBuffer);
-            const testUint256Offset = new BigNumber(prefixByteArrayBuffer.byteLength);
-            const newByteArray = await libBytes.publicWriteUint256.callAsync(
-                combinedByteArray,
-                testUint256Offset,
-                testUint256B,
-            );
-            const newByteArrayBuffer = ethUtil.toBuffer(newByteArray);
-            const uint256FromOffsetBuffer = newByteArrayBuffer.slice(prefixByteArrayBuffer.byteLength);
-            const uint256FromOffset = new BigNumber(
-                ethUtil.addHexPrefix(ethUtil.bufferToHex(uint256FromOffsetBuffer)),
-                16,
-            );
-            return expect(uint256FromOffset).to.be.bignumber.equal(testUint256B);
-        });
-        it('should fail if the byte array is too short to hold a uint256', async () => {
-            const offset = new BigNumber(0);
-            return expectContractCallFailedAsync(
-                libBytes.publicWriteUint256.callAsync(byteArrayShorterThan32Bytes, offset, testUint256),
-                RevertReason.LibBytesGreaterOrEqualTo32LengthRequired,
-            );
-        });
-        it('should fail if the length between the offset and end of the byte array is too short to hold a uint256', async () => {
-            const byteArray = byteArrayLongerThan32Bytes;
-            const badOffset = new BigNumber(ethUtil.toBuffer(byteArray).byteLength);
-            return expectContractCallFailedAsync(
-                libBytes.publicWriteUint256.callAsync(byteArray, badOffset, testUint256),
-                RevertReason.LibBytesGreaterOrEqualTo32LengthRequired,
-            );
-        });
-    });
-
-    describe('readBytes4', () => {
-        // AssertionError: expected promise to be rejected with an error including 'revert' but it was fulfilled with '0x08c379a0'
-        it('should revert if byte array has a length < 4', async () => {
-            const byteArrayLessThan4Bytes = '0x010101';
-            const offset = new BigNumber(0);
-            return expectContractCallFailedAsync(
-                libBytes.publicReadBytes4.callAsync(byteArrayLessThan4Bytes, offset),
-                RevertReason.LibBytesGreaterOrEqualTo4LengthRequired,
-            );
-        });
-        it('should return the first 4 bytes of a byte array of arbitrary length', async () => {
-            const first4Bytes = await libBytes.publicReadBytes4.callAsync(byteArrayLongerThan32Bytes, new BigNumber(0));
-            const expectedFirst4Bytes = byteArrayLongerThan32Bytes.slice(0, 10);
-            expect(first4Bytes).to.equal(expectedFirst4Bytes);
-        });
-        it('should successfully read bytes4 when the bytes4 takes up the whole array', async () => {
-            const testBytes4Offset = new BigNumber(0);
-            const bytes4 = await libBytes.publicReadBytes4.callAsync(testBytes4, testBytes4Offset);
-            return expect(bytes4).to.be.equal(testBytes4);
-        });
-        it('should successfully read bytes4 when it is offset in the array', async () => {
-            const bytes4ByteArrayBuffer = ethUtil.toBuffer(testBytes4);
-            const prefixByteArrayBuffer = ethUtil.toBuffer('0xabcdef');
-            const combinedByteArrayBuffer = Buffer.concat([prefixByteArrayBuffer, bytes4ByteArrayBuffer]);
-            const combinedByteArray = ethUtil.bufferToHex(combinedByteArrayBuffer);
-            const testBytes4Offset = new BigNumber(prefixByteArrayBuffer.byteLength);
-            const bytes4 = await libBytes.publicReadBytes4.callAsync(combinedByteArray, testBytes4Offset);
-            return expect(bytes4).to.be.equal(testBytes4);
-        });
-        it('should fail if the length between the offset and end of the byte array is too short to hold a bytes4', async () => {
-            const badOffset = new BigNumber(ethUtil.toBuffer(testBytes4).byteLength);
-            return expectContractCallFailedAsync(
-                libBytes.publicReadBytes4.callAsync(testBytes4, badOffset),
-                RevertReason.LibBytesGreaterOrEqualTo4LengthRequired,
-            );
-        });
-    });
-
-    describe('readBytesWithLength', () => {
-        it('should successfully read short, nested array of bytes when it takes up the whole array', async () => {
-            const testBytesOffset = new BigNumber(0);
-            const bytes = await libBytes.publicReadBytesWithLength.callAsync(shortTestBytes, testBytesOffset);
-            return expect(bytes).to.be.equal(shortData);
-        });
-        it('should successfully read short, nested array of bytes when it is offset in the array', async () => {
-            const prefixByteArrayBuffer = ethUtil.toBuffer('0xabcdef');
-            const combinedByteArrayBuffer = Buffer.concat([prefixByteArrayBuffer, shortTestBytesAsBuffer]);
-            const combinedByteArray = ethUtil.bufferToHex(combinedByteArrayBuffer);
-            const testUint256Offset = new BigNumber(prefixByteArrayBuffer.byteLength);
-            const bytes = await libBytes.publicReadBytesWithLength.callAsync(combinedByteArray, testUint256Offset);
-            return expect(bytes).to.be.equal(shortData);
-        });
-        it('should successfully read a nested array of bytes - one word in length - when it takes up the whole array', async () => {
-            const testBytesOffset = new BigNumber(0);
-            const bytes = await libBytes.publicReadBytesWithLength.callAsync(wordOfTestBytes, testBytesOffset);
-            return expect(bytes).to.be.equal(wordOfData);
-        });
-        it('should successfully read a nested array of bytes - one word in length - when it is offset in the array', async () => {
-            const prefixByteArrayBuffer = ethUtil.toBuffer('0xabcdef');
-            const combinedByteArrayBuffer = Buffer.concat([prefixByteArrayBuffer, wordOfTestBytesAsBuffer]);
-            const combinedByteArray = ethUtil.bufferToHex(combinedByteArrayBuffer);
-            const testUint256Offset = new BigNumber(prefixByteArrayBuffer.byteLength);
-            const bytes = await libBytes.publicReadBytesWithLength.callAsync(combinedByteArray, testUint256Offset);
-            return expect(bytes).to.be.equal(wordOfData);
-        });
-        it('should successfully read long, nested array of bytes when it takes up the whole array', async () => {
-            const testBytesOffset = new BigNumber(0);
-            const bytes = await libBytes.publicReadBytesWithLength.callAsync(longTestBytes, testBytesOffset);
-            return expect(bytes).to.be.equal(longData);
-        });
-        it('should successfully read long, nested array of bytes when it is offset in the array', async () => {
-            const prefixByteArrayBuffer = ethUtil.toBuffer('0xabcdef');
-            const combinedByteArrayBuffer = Buffer.concat([prefixByteArrayBuffer, longTestBytesAsBuffer]);
-            const combinedByteArray = ethUtil.bufferToHex(combinedByteArrayBuffer);
-            const testUint256Offset = new BigNumber(prefixByteArrayBuffer.byteLength);
-            const bytes = await libBytes.publicReadBytesWithLength.callAsync(combinedByteArray, testUint256Offset);
-            return expect(bytes).to.be.equal(longData);
-        });
-        it('should fail if the byte array is too short to hold the length of a nested byte array', async () => {
-            // The length of the nested array is 32 bytes. By storing less than 32 bytes, a length cannot be read.
-            const offset = new BigNumber(0);
-            return expectContractCallFailedAsync(
-                libBytes.publicReadBytesWithLength.callAsync(byteArrayShorterThan32Bytes, offset),
-                RevertReason.LibBytesGreaterOrEqualTo32LengthRequired,
-            );
-        });
-        it('should fail if we store a nested byte array length, without a nested byte array', async () => {
-            const offset = new BigNumber(0);
-            return expectContractCallFailedAsync(
-                libBytes.publicReadBytesWithLength.callAsync(testBytes32, offset),
-                RevertReason.LibBytesGreaterOrEqualToNestedBytesLengthRequired,
-            );
-        });
-        it('should fail if the length between the offset and end of the byte array is too short to hold the length of a nested byte array', async () => {
-            const badOffset = new BigNumber(ethUtil.toBuffer(byteArrayShorterThan32Bytes).byteLength);
-            return expectContractCallFailedAsync(
-                libBytes.publicReadBytesWithLength.callAsync(byteArrayShorterThan32Bytes, badOffset),
-                RevertReason.LibBytesGreaterOrEqualTo32LengthRequired,
-            );
-        });
-        it('should fail if the length between the offset and end of the byte array is too short to hold the nested byte array', async () => {
-            const badOffset = new BigNumber(ethUtil.toBuffer(testBytes32).byteLength);
-            return expectContractCallFailedAsync(
-                libBytes.publicReadBytesWithLength.callAsync(testBytes32, badOffset),
-                RevertReason.LibBytesGreaterOrEqualTo32LengthRequired,
-            );
-        });
-    });
-
-    describe('writeBytesWithLength', () => {
-        it('should successfully write short, nested array of bytes when it takes up the whole array', async () => {
-            const testBytesOffset = new BigNumber(0);
-            const emptyByteArray = ethUtil.bufferToHex(new Buffer(shortTestBytesAsBuffer.byteLength));
-            const bytesWritten = await libBytes.publicWriteBytesWithLength.callAsync(
-                emptyByteArray,
-                testBytesOffset,
-                shortData,
-            );
-            const bytesRead = await libBytes.publicReadBytesWithLength.callAsync(bytesWritten, testBytesOffset);
-            return expect(bytesRead).to.be.equal(shortData);
-        });
-        it('should successfully write short, nested array of bytes when it is offset in the array', async () => {
-            // Write a prefix to the array
-            const prefixData = '0xabcdef';
-            const prefixDataAsBuffer = ethUtil.toBuffer(prefixData);
-            const prefixOffset = new BigNumber(0);
-            const emptyByteArray = ethUtil.bufferToHex(
-                new Buffer(prefixDataAsBuffer.byteLength + shortTestBytesAsBuffer.byteLength),
-            );
-            let bytesWritten = await libBytes.publicWriteBytesWithLength.callAsync(
-                emptyByteArray,
-                prefixOffset,
-                prefixData,
-            );
-            // Write data after prefix
-            const testBytesOffset = new BigNumber(prefixDataAsBuffer.byteLength);
-            bytesWritten = await libBytes.publicWriteBytesWithLength.callAsync(
-                bytesWritten,
-                testBytesOffset,
-                shortData,
-            );
-            // Read data after prefix and validate
-            const bytes = await libBytes.publicReadBytesWithLength.callAsync(bytesWritten, testBytesOffset);
-            return expect(bytes).to.be.equal(shortData);
-        });
-        it('should successfully write a nested array of bytes - one word in length - when it takes up the whole array', async () => {
-            const testBytesOffset = new BigNumber(0);
-            const emptyByteArray = ethUtil.bufferToHex(new Buffer(wordOfTestBytesAsBuffer.byteLength));
-            const bytesWritten = await libBytes.publicWriteBytesWithLength.callAsync(
-                emptyByteArray,
-                testBytesOffset,
-                wordOfData,
-            );
-            const bytesRead = await libBytes.publicReadBytesWithLength.callAsync(bytesWritten, testBytesOffset);
-            return expect(bytesRead).to.be.equal(wordOfData);
-        });
-        it('should successfully write a nested array of bytes - one word in length - when it is offset in the array', async () => {
-            // Write a prefix to the array
-            const prefixData = '0xabcdef';
-            const prefixDataAsBuffer = ethUtil.toBuffer(prefixData);
-            const prefixOffset = new BigNumber(0);
-            const emptyByteArray = ethUtil.bufferToHex(
-                new Buffer(prefixDataAsBuffer.byteLength + wordOfTestBytesAsBuffer.byteLength),
-            );
-            let bytesWritten = await libBytes.publicWriteBytesWithLength.callAsync(
-                emptyByteArray,
-                prefixOffset,
-                prefixData,
-            );
-            // Write data after prefix
-            const testBytesOffset = new BigNumber(prefixDataAsBuffer.byteLength);
-            bytesWritten = await libBytes.publicWriteBytesWithLength.callAsync(
-                bytesWritten,
-                testBytesOffset,
-                wordOfData,
-            );
-            // Read data after prefix and validate
-            const bytes = await libBytes.publicReadBytesWithLength.callAsync(bytesWritten, testBytesOffset);
-            return expect(bytes).to.be.equal(wordOfData);
-        });
-        it('should successfully write a long, nested bytes when it takes up the whole array', async () => {
-            const testBytesOffset = new BigNumber(0);
-            const emptyByteArray = ethUtil.bufferToHex(new Buffer(longTestBytesAsBuffer.byteLength));
-            const bytesWritten = await libBytes.publicWriteBytesWithLength.callAsync(
-                emptyByteArray,
-                testBytesOffset,
-                longData,
-            );
-            const bytesRead = await libBytes.publicReadBytesWithLength.callAsync(bytesWritten, testBytesOffset);
-            return expect(bytesRead).to.be.equal(longData);
-        });
-        it('should successfully write long, nested array of bytes when it is offset in the array', async () => {
-            // Write a prefix to the array
-            const prefixData = '0xabcdef';
-            const prefixDataAsBuffer = ethUtil.toBuffer(prefixData);
-            const prefixOffset = new BigNumber(0);
-            const emptyByteArray = ethUtil.bufferToHex(
-                new Buffer(prefixDataAsBuffer.byteLength + longTestBytesAsBuffer.byteLength),
-            );
-            let bytesWritten = await libBytes.publicWriteBytesWithLength.callAsync(
-                emptyByteArray,
-                prefixOffset,
-                prefixData,
-            );
-            // Write data after prefix
-            const testBytesOffset = new BigNumber(prefixDataAsBuffer.byteLength);
-            bytesWritten = await libBytes.publicWriteBytesWithLength.callAsync(bytesWritten, testBytesOffset, longData);
-            // Read data after prefix and validate
-            const bytes = await libBytes.publicReadBytesWithLength.callAsync(bytesWritten, testBytesOffset);
-            return expect(bytes).to.be.equal(longData);
-        });
-        it('should fail if the byte array is too short to hold the length of a nested byte array', async () => {
-            const offset = new BigNumber(0);
-            const emptyByteArray = ethUtil.bufferToHex(new Buffer(1));
-            return expectContractCallFailedAsync(
-                libBytes.publicWriteBytesWithLength.callAsync(emptyByteArray, offset, longData),
-                RevertReason.LibBytesGreaterOrEqualToNestedBytesLengthRequired,
-            );
-        });
-        it('should fail if the length between the offset and end of the byte array is too short to hold the length of a nested byte array', async () => {
-            const emptyByteArray = ethUtil.bufferToHex(new Buffer(shortTestBytesAsBuffer.byteLength));
-            const badOffset = new BigNumber(ethUtil.toBuffer(shortTestBytesAsBuffer).byteLength);
-            return expectContractCallFailedAsync(
-                libBytes.publicWriteBytesWithLength.callAsync(emptyByteArray, badOffset, shortData),
-                RevertReason.LibBytesGreaterOrEqualToNestedBytesLengthRequired,
-            );
-        });
-    });
-
-    describe('memCopy', () => {
-        // Create memory 0x000102...FF
-        const memSize = 256;
-        // tslint:disable:no-shadowed-variable
-        const memory = new Uint8Array(memSize).map((_, i) => i);
-        const memHex = toHex(memory);
-
-        // Reference implementation to test against
-        const refMemcpy = (mem: Uint8Array, dest: number, source: number, length: number): Uint8Array =>
-            Uint8Array.from(mem).copyWithin(dest, source, source + length);
-
-        // Test vectors: destination, source, length, job description
-        type Tests = Array<[number, number, number, string]>;
-
-        const test = (tests: Tests) =>
-            tests.forEach(([dest, source, length, job]) =>
-                it(job, async () => {
-                    const expected = refMemcpy(memory, dest, source, length);
-                    const resultStr = await libBytes.testMemcpy.callAsync(
-                        memHex,
-                        new BigNumber(dest),
-                        new BigNumber(source),
-                        new BigNumber(length),
-                    );
-                    const result = fromHex(resultStr);
-                    expect(result).to.deep.equal(expected);
-                }),
-            );
-
-        test([[0, 0, 0, 'copies zero bytes with overlap']]);
-
-        describe('copies forward', () =>
-            test([
-                [128, 0, 0, 'zero bytes'],
-                [128, 0, 1, 'one byte'],
-                [128, 0, 11, 'eleven bytes'],
-                [128, 0, 31, 'thirty-one bytes'],
-                [128, 0, 32, 'one word'],
-                [128, 0, 64, 'two words'],
-                [128, 0, 96, 'three words'],
-                [128, 0, 33, 'one word and one byte'],
-                [128, 0, 72, 'two words and eight bytes'],
-                [128, 0, 100, 'three words and four bytes'],
-            ]));
-
-        describe('copies forward within one word', () =>
-            test([
-                [16, 0, 0, 'zero bytes'],
-                [16, 0, 1, 'one byte'],
-                [16, 0, 11, 'eleven bytes'],
-                [16, 0, 16, 'sixteen bytes'],
-            ]));
-
-        describe('copies forward with one byte overlap', () =>
-            test([
-                [0, 0, 1, 'one byte'],
-                [10, 0, 11, 'eleven bytes'],
-                [30, 0, 31, 'thirty-one bytes'],
-                [31, 0, 32, 'one word'],
-                [32, 0, 33, 'one word and one byte'],
-                [71, 0, 72, 'two words and eight bytes'],
-                [99, 0, 100, 'three words and four bytes'],
-            ]));
-
-        describe('copies forward with thirty-one bytes overlap', () =>
-            test([
-                [0, 0, 31, 'thirty-one bytes'],
-                [1, 0, 32, 'one word'],
-                [2, 0, 33, 'one word and one byte'],
-                [41, 0, 72, 'two words and eight bytes'],
-                [69, 0, 100, 'three words and four bytes'],
-            ]));
-
-        describe('copies forward with one word overlap', () =>
-            test([
-                [0, 0, 32, 'one word'],
-                [1, 0, 33, 'one word and one byte'],
-                [41, 0, 72, 'two words and eight bytes'],
-                [69, 0, 100, 'three words and four bytes'],
-            ]));
-
-        describe('copies forward with one word and one byte overlap', () =>
-            test([
-                [0, 0, 33, 'one word and one byte'],
-                [40, 0, 72, 'two words and eight bytes'],
-                [68, 0, 100, 'three words and four bytes'],
-            ]));
-
-        describe('copies forward with two words overlap', () =>
-            test([
-                [0, 0, 64, 'two words'],
-                [8, 0, 72, 'two words and eight bytes'],
-                [36, 0, 100, 'three words and four bytes'],
-            ]));
-
-        describe('copies forward within one word and one byte overlap', () =>
-            test([[0, 0, 1, 'one byte'], [10, 0, 11, 'eleven bytes'], [15, 0, 16, 'sixteen bytes']]));
-
-        describe('copies backward', () =>
-            test([
-                [0, 128, 0, 'zero bytes'],
-                [0, 128, 1, 'one byte'],
-                [0, 128, 11, 'eleven bytes'],
-                [0, 128, 31, 'thirty-one bytes'],
-                [0, 128, 32, 'one word'],
-                [0, 128, 64, 'two words'],
-                [0, 128, 96, 'three words'],
-                [0, 128, 33, 'one word and one byte'],
-                [0, 128, 72, 'two words and eight bytes'],
-                [0, 128, 100, 'three words and four bytes'],
-            ]));
-
-        describe('copies backward within one word', () =>
-            test([
-                [0, 16, 0, 'zero bytes'],
-                [0, 16, 1, 'one byte'],
-                [0, 16, 11, 'eleven bytes'],
-                [0, 16, 16, 'sixteen bytes'],
-            ]));
-
-        describe('copies backward with one byte overlap', () =>
-            test([
-                [0, 0, 1, 'one byte'],
-                [0, 10, 11, 'eleven bytes'],
-                [0, 30, 31, 'thirty-one bytes'],
-                [0, 31, 32, 'one word'],
-                [0, 32, 33, 'one word and one byte'],
-                [0, 71, 72, 'two words and eight bytes'],
-                [0, 99, 100, 'three words and four bytes'],
-            ]));
-
-        describe('copies backward with thirty-one bytes overlap', () =>
-            test([
-                [0, 0, 31, 'thirty-one bytes'],
-                [0, 1, 32, 'one word'],
-                [0, 2, 33, 'one word and one byte'],
-                [0, 41, 72, 'two words and eight bytes'],
-                [0, 69, 100, 'three words and four bytes'],
-            ]));
-
-        describe('copies backward with one word overlap', () =>
-            test([
-                [0, 0, 32, 'one word'],
-                [0, 1, 33, 'one word and one byte'],
-                [0, 41, 72, 'two words and eight bytes'],
-                [0, 69, 100, 'three words and four bytes'],
-            ]));
-
-        describe('copies backward with one word and one byte overlap', () =>
-            test([
-                [0, 0, 33, 'one word and one byte'],
-                [0, 40, 72, 'two words and eight bytes'],
-                [0, 68, 100, 'three words and four bytes'],
-            ]));
-
-        describe('copies backward with two words overlap', () =>
-            test([
-                [0, 0, 64, 'two words'],
-                [0, 8, 72, 'two words and eight bytes'],
-                [0, 36, 100, 'three words and four bytes'],
-            ]));
-
-        describe('copies forward within one word and one byte overlap', () =>
-            test([[0, 0, 1, 'one byte'], [0, 10, 11, 'eleven bytes'], [0, 15, 16, 'sixteen bytes']]));
-    });
-});
-// tslint:disable:max-file-line-count
diff --git a/contracts/core/test/multisig/asset_proxy_owner.ts b/contracts/core/test/multisig/asset_proxy_owner.ts
index 087152316..daebfb7fb 100644
--- a/contracts/core/test/multisig/asset_proxy_owner.ts
+++ b/contracts/core/test/multisig/asset_proxy_owner.ts
@@ -1,3 +1,16 @@
+import {
+    chaiSetup,
+    constants,
+    expectContractCallFailedAsync,
+    expectContractCreationFailedAsync,
+    expectTransactionFailedAsync,
+    expectTransactionFailedWithoutReasonAsync,
+    increaseTimeAndMineBlockAsync,
+    provider,
+    sendTransactionResult,
+    txDefaults,
+    web3Wrapper,
+} from '@0x/contracts-test-utils';
 import { BlockchainLifecycle } from '@0x/dev-utils';
 import { RevertReason } from '@0x/types';
 import { BigNumber } from '@0x/utils';
@@ -14,18 +27,7 @@ import {
 import { MixinAuthorizableContract } from '../../generated-wrappers/mixin_authorizable';
 import { TestAssetProxyOwnerContract } from '../../generated-wrappers/test_asset_proxy_owner';
 import { artifacts } from '../../src/artifacts';
-import {
-    expectContractCallFailedAsync,
-    expectContractCreationFailedAsync,
-    expectTransactionFailedAsync,
-    expectTransactionFailedWithoutReasonAsync,
-    sendTransactionResult,
-} from '../utils/assertions';
-import { increaseTimeAndMineBlockAsync } from '../utils/block_timestamp';
-import { chaiSetup } from '../utils/chai_setup';
-import { constants } from '../utils/constants';
-import { MultiSigWrapper } from '../utils/multi_sig_wrapper';
-import { provider, txDefaults, web3Wrapper } from '../utils/web3_wrapper';
+import { AssetProxyOwnerWrapper } from '../utils/asset_proxy_owner_wrapper';
 
 chaiSetup.configure();
 const expect = chai.expect;
@@ -41,7 +43,7 @@ describe('AssetProxyOwner', () => {
     let erc20Proxy: MixinAuthorizableContract;
     let erc721Proxy: MixinAuthorizableContract;
     let testAssetProxyOwner: TestAssetProxyOwnerContract;
-    let multiSigWrapper: MultiSigWrapper;
+    let assetProxyOwnerWrapper: AssetProxyOwnerWrapper;
 
     before(async () => {
         await blockchainLifecycle.startAsync();
@@ -75,7 +77,7 @@ describe('AssetProxyOwner', () => {
             REQUIRED_APPROVALS,
             SECONDS_TIME_LOCKED,
         );
-        multiSigWrapper = new MultiSigWrapper(testAssetProxyOwner, provider);
+        assetProxyOwnerWrapper = new AssetProxyOwnerWrapper(testAssetProxyOwner, provider);
         await web3Wrapper.awaitTransactionSuccessAsync(
             await erc20Proxy.transferOwnership.sendTransactionAsync(testAssetProxyOwner.address, {
                 from: initialOwner,
@@ -172,7 +174,7 @@ describe('AssetProxyOwner', () => {
                 addressToRegister,
                 isRegistered,
             );
-            const submitTxRes = await multiSigWrapper.submitTransactionAsync(
+            const submitTxRes = await assetProxyOwnerWrapper.submitTransactionAsync(
                 testAssetProxyOwner.address,
                 registerAssetProxyData,
                 owners[0],
@@ -181,10 +183,10 @@ describe('AssetProxyOwner', () => {
             const log = submitTxRes.logs[0] as LogWithDecodedArgs<AssetProxyOwnerSubmissionEventArgs>;
             const txId = log.args.transactionId;
 
-            await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
+            await assetProxyOwnerWrapper.confirmTransactionAsync(txId, owners[1]);
             await increaseTimeAndMineBlockAsync(SECONDS_TIME_LOCKED.toNumber());
 
-            const executeTxRes = await multiSigWrapper.executeTransactionAsync(txId, owners[0]);
+            const executeTxRes = await assetProxyOwnerWrapper.executeTransactionAsync(txId, owners[0]);
             const registerLog = executeTxRes.logs[0] as LogWithDecodedArgs<
                 AssetProxyOwnerAssetProxyRegistrationEventArgs
             >;
@@ -204,7 +206,7 @@ describe('AssetProxyOwner', () => {
                 addressToRegister,
                 isRegistered,
             );
-            const submitTxRes = await multiSigWrapper.submitTransactionAsync(
+            const submitTxRes = await assetProxyOwnerWrapper.submitTransactionAsync(
                 testAssetProxyOwner.address,
                 registerAssetProxyData,
                 owners[0],
@@ -212,10 +214,10 @@ describe('AssetProxyOwner', () => {
             const log = submitTxRes.logs[0] as LogWithDecodedArgs<AssetProxyOwnerSubmissionEventArgs>;
             const txId = log.args.transactionId;
 
-            await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
+            await assetProxyOwnerWrapper.confirmTransactionAsync(txId, owners[1]);
             await increaseTimeAndMineBlockAsync(SECONDS_TIME_LOCKED.toNumber());
 
-            const executeTxRes = await multiSigWrapper.executeTransactionAsync(txId, owners[0]);
+            const executeTxRes = await assetProxyOwnerWrapper.executeTransactionAsync(txId, owners[0]);
             const failureLog = executeTxRes.logs[0] as LogWithDecodedArgs<AssetProxyOwnerExecutionFailureEventArgs>;
             expect(failureLog.args.transactionId).to.be.bignumber.equal(txId);
 
@@ -237,7 +239,7 @@ describe('AssetProxyOwner', () => {
                 addressToRegister,
                 isRegistered,
             );
-            const registerAssetProxySubmitRes = await multiSigWrapper.submitTransactionAsync(
+            const registerAssetProxySubmitRes = await assetProxyOwnerWrapper.submitTransactionAsync(
                 testAssetProxyOwner.address,
                 registerAssetProxyData,
                 owners[0],
@@ -247,12 +249,12 @@ describe('AssetProxyOwner', () => {
             >;
 
             const addAuthorizedAddressData = erc20Proxy.addAuthorizedAddress.getABIEncodedTransactionData(authorized);
-            const erc20AddAuthorizedAddressSubmitRes = await multiSigWrapper.submitTransactionAsync(
+            const erc20AddAuthorizedAddressSubmitRes = await assetProxyOwnerWrapper.submitTransactionAsync(
                 erc20Proxy.address,
                 addAuthorizedAddressData,
                 owners[0],
             );
-            const erc721AddAuthorizedAddressSubmitRes = await multiSigWrapper.submitTransactionAsync(
+            const erc721AddAuthorizedAddressSubmitRes = await assetProxyOwnerWrapper.submitTransactionAsync(
                 erc721Proxy.address,
                 addAuthorizedAddressData,
                 owners[0],
@@ -267,15 +269,15 @@ describe('AssetProxyOwner', () => {
             const erc20AddAuthorizedAddressTxId = erc20AddAuthorizedAddressSubmitLog.args.transactionId;
             const erc721AddAuthorizedAddressTxId = erc721AddAuthorizedAddressSubmitLog.args.transactionId;
 
-            await multiSigWrapper.confirmTransactionAsync(registerAssetProxyTxId, owners[1]);
-            await multiSigWrapper.confirmTransactionAsync(erc20AddAuthorizedAddressTxId, owners[1]);
-            await multiSigWrapper.confirmTransactionAsync(erc721AddAuthorizedAddressTxId, owners[1]);
+            await assetProxyOwnerWrapper.confirmTransactionAsync(registerAssetProxyTxId, owners[1]);
+            await assetProxyOwnerWrapper.confirmTransactionAsync(erc20AddAuthorizedAddressTxId, owners[1]);
+            await assetProxyOwnerWrapper.confirmTransactionAsync(erc721AddAuthorizedAddressTxId, owners[1]);
             await increaseTimeAndMineBlockAsync(SECONDS_TIME_LOCKED.toNumber());
-            await multiSigWrapper.executeTransactionAsync(registerAssetProxyTxId, owners[0]);
-            await multiSigWrapper.executeTransactionAsync(erc20AddAuthorizedAddressTxId, owners[0], {
+            await assetProxyOwnerWrapper.executeTransactionAsync(registerAssetProxyTxId, owners[0]);
+            await assetProxyOwnerWrapper.executeTransactionAsync(erc20AddAuthorizedAddressTxId, owners[0], {
                 gas: constants.MAX_EXECUTE_TRANSACTION_GAS,
             });
-            await multiSigWrapper.executeTransactionAsync(erc721AddAuthorizedAddressTxId, owners[0], {
+            await assetProxyOwnerWrapper.executeTransactionAsync(erc721AddAuthorizedAddressTxId, owners[0], {
                 gas: constants.MAX_EXECUTE_TRANSACTION_GAS,
             });
         });
@@ -285,7 +287,7 @@ describe('AssetProxyOwner', () => {
                 const notRemoveAuthorizedAddressData = erc20Proxy.addAuthorizedAddress.getABIEncodedTransactionData(
                     authorized,
                 );
-                const submitTxRes = await multiSigWrapper.submitTransactionAsync(
+                const submitTxRes = await assetProxyOwnerWrapper.submitTransactionAsync(
                     erc20Proxy.address,
                     notRemoveAuthorizedAddressData,
                     owners[0],
@@ -303,7 +305,7 @@ describe('AssetProxyOwner', () => {
                     authorized,
                     erc20Index,
                 );
-                const submitTxRes = await multiSigWrapper.submitTransactionAsync(
+                const submitTxRes = await assetProxyOwnerWrapper.submitTransactionAsync(
                     erc20Proxy.address,
                     removeAuthorizedAddressAtIndexData,
                     owners[0],
@@ -321,7 +323,7 @@ describe('AssetProxyOwner', () => {
                     authorized,
                     erc721Index,
                 );
-                const submitTxRes = await multiSigWrapper.submitTransactionAsync(
+                const submitTxRes = await assetProxyOwnerWrapper.submitTransactionAsync(
                     erc721Proxy.address,
                     removeAuthorizedAddressAtIndexData,
                     owners[0],
@@ -341,7 +343,7 @@ describe('AssetProxyOwner', () => {
                     authorized,
                     erc20Index,
                 );
-                const res = await multiSigWrapper.submitTransactionAsync(
+                const res = await assetProxyOwnerWrapper.submitTransactionAsync(
                     erc20Proxy.address,
                     removeAuthorizedAddressAtIndexData,
                     owners[0],
@@ -362,7 +364,7 @@ describe('AssetProxyOwner', () => {
                     authorized,
                     erc721Index,
                 );
-                const res = await multiSigWrapper.submitTransactionAsync(
+                const res = await assetProxyOwnerWrapper.submitTransactionAsync(
                     erc721Proxy.address,
                     removeAuthorizedAddressAtIndexData,
                     owners[0],
@@ -370,7 +372,7 @@ describe('AssetProxyOwner', () => {
                 const log = res.logs[0] as LogWithDecodedArgs<AssetProxyOwnerSubmissionEventArgs>;
                 const txId = log.args.transactionId;
 
-                await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
+                await assetProxyOwnerWrapper.confirmTransactionAsync(txId, owners[1]);
 
                 return expectTransactionFailedAsync(
                     testAssetProxyOwner.executeRemoveAuthorizedAddressAtIndex.sendTransactionAsync(txId, {
@@ -385,7 +387,7 @@ describe('AssetProxyOwner', () => {
                 const addAuthorizedAddressData = erc20Proxy.addAuthorizedAddress.getABIEncodedTransactionData(
                     newAuthorized,
                 );
-                const res = await multiSigWrapper.submitTransactionAsync(
+                const res = await assetProxyOwnerWrapper.submitTransactionAsync(
                     erc20Proxy.address,
                     addAuthorizedAddressData,
                     owners[0],
@@ -393,7 +395,7 @@ describe('AssetProxyOwner', () => {
                 const log = res.logs[0] as LogWithDecodedArgs<AssetProxyOwnerSubmissionEventArgs>;
                 const txId = log.args.transactionId;
 
-                await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
+                await assetProxyOwnerWrapper.confirmTransactionAsync(txId, owners[1]);
 
                 return expectTransactionFailedAsync(
                     testAssetProxyOwner.executeRemoveAuthorizedAddressAtIndex.sendTransactionAsync(txId, {
@@ -411,7 +413,7 @@ describe('AssetProxyOwner', () => {
                     authorized,
                     erc20Index,
                 );
-                const submitRes = await multiSigWrapper.submitTransactionAsync(
+                const submitRes = await assetProxyOwnerWrapper.submitTransactionAsync(
                     erc20Proxy.address,
                     removeAuthorizedAddressAtIndexData,
                     owners[0],
@@ -419,9 +421,12 @@ describe('AssetProxyOwner', () => {
                 const submitLog = submitRes.logs[0] as LogWithDecodedArgs<AssetProxyOwnerSubmissionEventArgs>;
                 const txId = submitLog.args.transactionId;
 
-                await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
+                await assetProxyOwnerWrapper.confirmTransactionAsync(txId, owners[1]);
 
-                const execRes = await multiSigWrapper.executeRemoveAuthorizedAddressAtIndexAsync(txId, owners[0]);
+                const execRes = await assetProxyOwnerWrapper.executeRemoveAuthorizedAddressAtIndexAsync(
+                    txId,
+                    owners[0],
+                );
                 const execLog = execRes.logs[1] as LogWithDecodedArgs<AssetProxyOwnerExecutionEventArgs>;
                 expect(execLog.args.transactionId).to.be.bignumber.equal(txId);
 
@@ -441,7 +446,7 @@ describe('AssetProxyOwner', () => {
                     authorized,
                     erc20Index,
                 );
-                const submitRes = await multiSigWrapper.submitTransactionAsync(
+                const submitRes = await assetProxyOwnerWrapper.submitTransactionAsync(
                     erc20Proxy.address,
                     removeAuthorizedAddressAtIndexData,
                     owners[0],
@@ -449,9 +454,9 @@ describe('AssetProxyOwner', () => {
                 const submitLog = submitRes.logs[0] as LogWithDecodedArgs<AssetProxyOwnerSubmissionEventArgs>;
                 const txId = submitLog.args.transactionId;
 
-                await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
+                await assetProxyOwnerWrapper.confirmTransactionAsync(txId, owners[1]);
 
-                const execRes = await multiSigWrapper.executeRemoveAuthorizedAddressAtIndexAsync(txId, notOwner);
+                const execRes = await assetProxyOwnerWrapper.executeRemoveAuthorizedAddressAtIndexAsync(txId, notOwner);
                 const execLog = execRes.logs[1] as LogWithDecodedArgs<AssetProxyOwnerExecutionEventArgs>;
                 expect(execLog.args.transactionId).to.be.bignumber.equal(txId);
 
@@ -468,7 +473,7 @@ describe('AssetProxyOwner', () => {
                     authorized,
                     erc20Index,
                 );
-                const submitRes = await multiSigWrapper.submitTransactionAsync(
+                const submitRes = await assetProxyOwnerWrapper.submitTransactionAsync(
                     erc20Proxy.address,
                     removeAuthorizedAddressAtIndexData,
                     owners[0],
@@ -476,9 +481,12 @@ describe('AssetProxyOwner', () => {
                 const submitLog = submitRes.logs[0] as LogWithDecodedArgs<AssetProxyOwnerSubmissionEventArgs>;
                 const txId = submitLog.args.transactionId;
 
-                await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
+                await assetProxyOwnerWrapper.confirmTransactionAsync(txId, owners[1]);
 
-                const execRes = await multiSigWrapper.executeRemoveAuthorizedAddressAtIndexAsync(txId, owners[0]);
+                const execRes = await assetProxyOwnerWrapper.executeRemoveAuthorizedAddressAtIndexAsync(
+                    txId,
+                    owners[0],
+                );
                 const execLog = execRes.logs[1] as LogWithDecodedArgs<AssetProxyOwnerExecutionEventArgs>;
                 expect(execLog.args.transactionId).to.be.bignumber.equal(txId);
 
@@ -495,4 +503,4 @@ describe('AssetProxyOwner', () => {
         });
     });
 });
-// tslint:enable:no-unnecessary-type-assertion
+// tslint:disable-line max-file-line-count
diff --git a/contracts/core/test/multisig/multi_sig_with_time_lock.ts b/contracts/core/test/multisig/multi_sig_with_time_lock.ts
deleted file mode 100644
index 1c0cb0515..000000000
--- a/contracts/core/test/multisig/multi_sig_with_time_lock.ts
+++ /dev/null
@@ -1,347 +0,0 @@
-import { BlockchainLifecycle } from '@0x/dev-utils';
-import { RevertReason } from '@0x/types';
-import { BigNumber } from '@0x/utils';
-import * as chai from 'chai';
-import { LogWithDecodedArgs } from 'ethereum-types';
-import * as _ from 'lodash';
-
-import { DummyERC20TokenContract } from '../../generated-wrappers/dummy_erc20_token';
-import {
-    MultiSigWalletWithTimeLockConfirmationEventArgs,
-    MultiSigWalletWithTimeLockConfirmationTimeSetEventArgs,
-    MultiSigWalletWithTimeLockContract,
-    MultiSigWalletWithTimeLockExecutionEventArgs,
-    MultiSigWalletWithTimeLockExecutionFailureEventArgs,
-    MultiSigWalletWithTimeLockSubmissionEventArgs,
-} from '../../generated-wrappers/multi_sig_wallet_with_time_lock';
-import { artifacts } from '../../src/artifacts';
-import { expectTransactionFailedAsync, expectTransactionFailedWithoutReasonAsync } from '../utils/assertions';
-import { increaseTimeAndMineBlockAsync } from '../utils/block_timestamp';
-import { chaiSetup } from '../utils/chai_setup';
-import { constants } from '../utils/constants';
-import { MultiSigWrapper } from '../utils/multi_sig_wrapper';
-import { provider, txDefaults, web3Wrapper } from '../utils/web3_wrapper';
-
-chaiSetup.configure();
-const expect = chai.expect;
-const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
-// tslint:disable:no-unnecessary-type-assertion
-describe('MultiSigWalletWithTimeLock', () => {
-    let owners: string[];
-    let notOwner: string;
-    const REQUIRED_APPROVALS = new BigNumber(2);
-    const SECONDS_TIME_LOCKED = new BigNumber(1000000);
-
-    before(async () => {
-        await blockchainLifecycle.startAsync();
-    });
-    after(async () => {
-        await blockchainLifecycle.revertAsync();
-    });
-    before(async () => {
-        const accounts = await web3Wrapper.getAvailableAddressesAsync();
-        owners = [accounts[0], accounts[1], accounts[2]];
-        notOwner = accounts[3];
-    });
-
-    let multiSig: MultiSigWalletWithTimeLockContract;
-    let multiSigWrapper: MultiSigWrapper;
-
-    beforeEach(async () => {
-        await blockchainLifecycle.startAsync();
-    });
-    afterEach(async () => {
-        await blockchainLifecycle.revertAsync();
-    });
-
-    describe('external_call', () => {
-        it('should be internal', async () => {
-            const secondsTimeLocked = new BigNumber(0);
-            multiSig = await MultiSigWalletWithTimeLockContract.deployFrom0xArtifactAsync(
-                artifacts.MultiSigWalletWithTimeLock,
-                provider,
-                txDefaults,
-                owners,
-                REQUIRED_APPROVALS,
-                secondsTimeLocked,
-            );
-            expect(_.isUndefined((multiSig as any).external_call)).to.be.equal(true);
-        });
-    });
-    describe('confirmTransaction', () => {
-        let txId: BigNumber;
-        beforeEach(async () => {
-            const secondsTimeLocked = new BigNumber(0);
-            multiSig = await MultiSigWalletWithTimeLockContract.deployFrom0xArtifactAsync(
-                artifacts.MultiSigWalletWithTimeLock,
-                provider,
-                txDefaults,
-                owners,
-                REQUIRED_APPROVALS,
-                secondsTimeLocked,
-            );
-            multiSigWrapper = new MultiSigWrapper(multiSig, provider);
-            const destination = notOwner;
-            const data = constants.NULL_BYTES;
-            const txReceipt = await multiSigWrapper.submitTransactionAsync(destination, data, owners[0]);
-            txId = (txReceipt.logs[0] as LogWithDecodedArgs<MultiSigWalletWithTimeLockSubmissionEventArgs>).args
-                .transactionId;
-        });
-        it('should revert if called by a non-owner', async () => {
-            await expectTransactionFailedWithoutReasonAsync(multiSigWrapper.confirmTransactionAsync(txId, notOwner));
-        });
-        it('should revert if transaction does not exist', async () => {
-            const nonexistentTxId = new BigNumber(123456789);
-            await expectTransactionFailedWithoutReasonAsync(
-                multiSigWrapper.confirmTransactionAsync(nonexistentTxId, owners[1]),
-            );
-        });
-        it('should revert if transaction is already confirmed by caller', async () => {
-            await expectTransactionFailedWithoutReasonAsync(multiSigWrapper.confirmTransactionAsync(txId, owners[0]));
-        });
-        it('should confirm transaction for caller and log a Confirmation event', async () => {
-            const txReceipt = await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
-            const log = txReceipt.logs[0] as LogWithDecodedArgs<MultiSigWalletWithTimeLockConfirmationEventArgs>;
-            expect(log.event).to.be.equal('Confirmation');
-            expect(log.args.sender).to.be.equal(owners[1]);
-            expect(log.args.transactionId).to.be.bignumber.equal(txId);
-        });
-        it('should revert if fully confirmed', async () => {
-            await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
-            await expectTransactionFailedAsync(
-                multiSigWrapper.confirmTransactionAsync(txId, owners[2]),
-                RevertReason.TxFullyConfirmed,
-            );
-        });
-        it('should set the confirmation time of the transaction if it becomes fully confirmed', async () => {
-            const txReceipt = await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
-            const blockNum = await web3Wrapper.getBlockNumberAsync();
-            const timestamp = new BigNumber(await web3Wrapper.getBlockTimestampAsync(blockNum));
-            const log = txReceipt.logs[1] as LogWithDecodedArgs<MultiSigWalletWithTimeLockConfirmationTimeSetEventArgs>;
-            expect(log.args.confirmationTime).to.be.bignumber.equal(timestamp);
-            expect(log.args.transactionId).to.be.bignumber.equal(txId);
-        });
-    });
-    describe('executeTransaction', () => {
-        let txId: BigNumber;
-        const secondsTimeLocked = new BigNumber(1000000);
-        beforeEach(async () => {
-            multiSig = await MultiSigWalletWithTimeLockContract.deployFrom0xArtifactAsync(
-                artifacts.MultiSigWalletWithTimeLock,
-                provider,
-                txDefaults,
-                owners,
-                REQUIRED_APPROVALS,
-                secondsTimeLocked,
-            );
-            multiSigWrapper = new MultiSigWrapper(multiSig, provider);
-            const destination = notOwner;
-            const data = constants.NULL_BYTES;
-            const txReceipt = await multiSigWrapper.submitTransactionAsync(destination, data, owners[0]);
-            txId = (txReceipt.logs[0] as LogWithDecodedArgs<MultiSigWalletWithTimeLockSubmissionEventArgs>).args
-                .transactionId;
-        });
-        it('should revert if transaction has not been fully confirmed', async () => {
-            await increaseTimeAndMineBlockAsync(secondsTimeLocked.toNumber());
-            await expectTransactionFailedAsync(
-                multiSigWrapper.executeTransactionAsync(txId, owners[1]),
-                RevertReason.TxNotFullyConfirmed,
-            );
-        });
-        it('should revert if time lock has not passed', async () => {
-            await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
-            await expectTransactionFailedAsync(
-                multiSigWrapper.executeTransactionAsync(txId, owners[1]),
-                RevertReason.TimeLockIncomplete,
-            );
-        });
-        it('should execute a transaction and log an Execution event if successful and called by owner', async () => {
-            await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
-            await increaseTimeAndMineBlockAsync(secondsTimeLocked.toNumber());
-            const txReceipt = await multiSigWrapper.executeTransactionAsync(txId, owners[1]);
-            const log = txReceipt.logs[0] as LogWithDecodedArgs<MultiSigWalletWithTimeLockExecutionEventArgs>;
-            expect(log.event).to.be.equal('Execution');
-            expect(log.args.transactionId).to.be.bignumber.equal(txId);
-        });
-        it('should execute a transaction and log an Execution event if successful and called by non-owner', async () => {
-            await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
-            await increaseTimeAndMineBlockAsync(secondsTimeLocked.toNumber());
-            const txReceipt = await multiSigWrapper.executeTransactionAsync(txId, notOwner);
-            const log = txReceipt.logs[0] as LogWithDecodedArgs<MultiSigWalletWithTimeLockExecutionEventArgs>;
-            expect(log.event).to.be.equal('Execution');
-            expect(log.args.transactionId).to.be.bignumber.equal(txId);
-        });
-        it('should revert if a required confirmation is revoked before executeTransaction is called', async () => {
-            await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
-            await increaseTimeAndMineBlockAsync(secondsTimeLocked.toNumber());
-            await multiSigWrapper.revokeConfirmationAsync(txId, owners[0]);
-            await expectTransactionFailedAsync(
-                multiSigWrapper.executeTransactionAsync(txId, owners[1]),
-                RevertReason.TxNotFullyConfirmed,
-            );
-        });
-        it('should revert if transaction has been executed', async () => {
-            await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
-            await increaseTimeAndMineBlockAsync(secondsTimeLocked.toNumber());
-            const txReceipt = await multiSigWrapper.executeTransactionAsync(txId, owners[1]);
-            const log = txReceipt.logs[0] as LogWithDecodedArgs<MultiSigWalletWithTimeLockExecutionEventArgs>;
-            expect(log.args.transactionId).to.be.bignumber.equal(txId);
-            await expectTransactionFailedWithoutReasonAsync(multiSigWrapper.executeTransactionAsync(txId, owners[1]));
-        });
-        it("should log an ExecutionFailure event and not update the transaction's execution state if unsuccessful", async () => {
-            const contractWithoutFallback = await DummyERC20TokenContract.deployFrom0xArtifactAsync(
-                artifacts.DummyERC20Token,
-                provider,
-                txDefaults,
-                constants.DUMMY_TOKEN_NAME,
-                constants.DUMMY_TOKEN_SYMBOL,
-                constants.DUMMY_TOKEN_DECIMALS,
-                constants.DUMMY_TOKEN_TOTAL_SUPPLY,
-            );
-            const data = constants.NULL_BYTES;
-            const value = new BigNumber(10);
-            const submissionTxReceipt = await multiSigWrapper.submitTransactionAsync(
-                contractWithoutFallback.address,
-                data,
-                owners[0],
-                { value },
-            );
-            const newTxId = (submissionTxReceipt.logs[0] as LogWithDecodedArgs<
-                MultiSigWalletWithTimeLockSubmissionEventArgs
-            >).args.transactionId;
-            await multiSigWrapper.confirmTransactionAsync(newTxId, owners[1]);
-            await increaseTimeAndMineBlockAsync(secondsTimeLocked.toNumber());
-            const txReceipt = await multiSigWrapper.executeTransactionAsync(newTxId, owners[1]);
-            const executionFailureLog = txReceipt.logs[0] as LogWithDecodedArgs<
-                MultiSigWalletWithTimeLockExecutionFailureEventArgs
-            >;
-            expect(executionFailureLog.event).to.be.equal('ExecutionFailure');
-            expect(executionFailureLog.args.transactionId).to.be.bignumber.equal(newTxId);
-        });
-    });
-    describe('changeTimeLock', () => {
-        describe('initially non-time-locked', async () => {
-            before(async () => {
-                await blockchainLifecycle.startAsync();
-            });
-            after(async () => {
-                await blockchainLifecycle.revertAsync();
-            });
-            before('deploy a wallet', async () => {
-                const secondsTimeLocked = new BigNumber(0);
-                multiSig = await MultiSigWalletWithTimeLockContract.deployFrom0xArtifactAsync(
-                    artifacts.MultiSigWalletWithTimeLock,
-                    provider,
-                    txDefaults,
-                    owners,
-                    REQUIRED_APPROVALS,
-                    secondsTimeLocked,
-                );
-                multiSigWrapper = new MultiSigWrapper(multiSig, provider);
-            });
-
-            it('should throw when not called by wallet', async () => {
-                return expectTransactionFailedWithoutReasonAsync(
-                    multiSig.changeTimeLock.sendTransactionAsync(SECONDS_TIME_LOCKED, { from: owners[0] }),
-                );
-            });
-
-            it('should throw without enough confirmations', async () => {
-                const destination = multiSig.address;
-                const changeTimeLockData = multiSig.changeTimeLock.getABIEncodedTransactionData(SECONDS_TIME_LOCKED);
-                const res = await multiSigWrapper.submitTransactionAsync(destination, changeTimeLockData, owners[0]);
-                const log = res.logs[0] as LogWithDecodedArgs<MultiSigWalletWithTimeLockSubmissionEventArgs>;
-                const txId = log.args.transactionId;
-                return expectTransactionFailedAsync(
-                    multiSig.executeTransaction.sendTransactionAsync(txId, { from: owners[0] }),
-                    RevertReason.TxNotFullyConfirmed,
-                );
-            });
-
-            it('should set confirmation time with enough confirmations', async () => {
-                const destination = multiSig.address;
-                const changeTimeLockData = multiSig.changeTimeLock.getABIEncodedTransactionData(SECONDS_TIME_LOCKED);
-                const subRes = await multiSigWrapper.submitTransactionAsync(destination, changeTimeLockData, owners[0]);
-                const subLog = subRes.logs[0] as LogWithDecodedArgs<MultiSigWalletWithTimeLockSubmissionEventArgs>;
-                const txId = subLog.args.transactionId;
-
-                const confirmRes = await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
-                expect(confirmRes.logs).to.have.length(2);
-
-                const blockNum = await web3Wrapper.getBlockNumberAsync();
-                const blockInfo = await web3Wrapper.getBlockIfExistsAsync(blockNum);
-                if (_.isUndefined(blockInfo)) {
-                    throw new Error(`Unexpectedly failed to fetch block at #${blockNum}`);
-                }
-                const timestamp = new BigNumber(blockInfo.timestamp);
-                const confirmationTimeBigNum = new BigNumber(await multiSig.confirmationTimes.callAsync(txId));
-
-                expect(timestamp).to.be.bignumber.equal(confirmationTimeBigNum);
-            });
-
-            it('should be executable with enough confirmations and secondsTimeLocked of 0', async () => {
-                const destination = multiSig.address;
-                const changeTimeLockData = multiSig.changeTimeLock.getABIEncodedTransactionData(SECONDS_TIME_LOCKED);
-                const subRes = await multiSigWrapper.submitTransactionAsync(destination, changeTimeLockData, owners[0]);
-                const subLog = subRes.logs[0] as LogWithDecodedArgs<MultiSigWalletWithTimeLockSubmissionEventArgs>;
-                const txId = subLog.args.transactionId;
-
-                await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
-                await multiSigWrapper.executeTransactionAsync(txId, owners[1]);
-
-                const secondsTimeLocked = new BigNumber(await multiSig.secondsTimeLocked.callAsync());
-                expect(secondsTimeLocked).to.be.bignumber.equal(SECONDS_TIME_LOCKED);
-            });
-        });
-        describe('initially time-locked', async () => {
-            before(async () => {
-                await blockchainLifecycle.startAsync();
-            });
-            after(async () => {
-                await blockchainLifecycle.revertAsync();
-            });
-            let txId: BigNumber;
-            const newSecondsTimeLocked = new BigNumber(0);
-            before('deploy a wallet, submit transaction to change timelock, and confirm the transaction', async () => {
-                multiSig = await MultiSigWalletWithTimeLockContract.deployFrom0xArtifactAsync(
-                    artifacts.MultiSigWalletWithTimeLock,
-                    provider,
-                    txDefaults,
-                    owners,
-                    REQUIRED_APPROVALS,
-                    SECONDS_TIME_LOCKED,
-                );
-                multiSigWrapper = new MultiSigWrapper(multiSig, provider);
-
-                const changeTimeLockData = multiSig.changeTimeLock.getABIEncodedTransactionData(newSecondsTimeLocked);
-                const res = await multiSigWrapper.submitTransactionAsync(
-                    multiSig.address,
-                    changeTimeLockData,
-                    owners[0],
-                );
-                const log = res.logs[0] as LogWithDecodedArgs<MultiSigWalletWithTimeLockSubmissionEventArgs>;
-                txId = log.args.transactionId;
-                await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
-            });
-
-            it('should throw if it has enough confirmations but is not past the time lock', async () => {
-                return expectTransactionFailedAsync(
-                    multiSig.executeTransaction.sendTransactionAsync(txId, { from: owners[0] }),
-                    RevertReason.TimeLockIncomplete,
-                );
-            });
-
-            it('should execute if it has enough confirmations and is past the time lock', async () => {
-                await increaseTimeAndMineBlockAsync(SECONDS_TIME_LOCKED.toNumber());
-                await web3Wrapper.awaitTransactionSuccessAsync(
-                    await multiSig.executeTransaction.sendTransactionAsync(txId, { from: owners[0] }),
-                    constants.AWAIT_TRANSACTION_MINED_MS,
-                );
-
-                const secondsTimeLocked = new BigNumber(await multiSig.secondsTimeLocked.callAsync());
-                expect(secondsTimeLocked).to.be.bignumber.equal(newSecondsTimeLocked);
-            });
-        });
-    });
-});
-// tslint:enable:no-unnecessary-type-assertion
diff --git a/contracts/core/test/tokens/erc721_token.ts b/contracts/core/test/tokens/erc721_token.ts
index 72407748f..3b0a5f001 100644
--- a/contracts/core/test/tokens/erc721_token.ts
+++ b/contracts/core/test/tokens/erc721_token.ts
@@ -1,3 +1,13 @@
+import {
+    chaiSetup,
+    constants,
+    expectTransactionFailedAsync,
+    expectTransactionFailedWithoutReasonAsync,
+    LogDecoder,
+    provider,
+    txDefaults,
+    web3Wrapper,
+} from '@0x/contracts-test-utils';
 import { BlockchainLifecycle } from '@0x/dev-utils';
 import { RevertReason } from '@0x/types';
 import { BigNumber } from '@0x/utils';
@@ -14,11 +24,6 @@ import {
 } from '../../generated-wrappers/dummy_erc721_token';
 import { InvalidERC721ReceiverContract } from '../../generated-wrappers/invalid_erc721_receiver';
 import { artifacts } from '../../src/artifacts';
-import { expectTransactionFailedAsync, expectTransactionFailedWithoutReasonAsync } from '../utils/assertions';
-import { chaiSetup } from '../utils/chai_setup';
-import { constants } from '../utils/constants';
-import { LogDecoder } from '../utils/log_decoder';
-import { provider, txDefaults, web3Wrapper } from '../utils/web3_wrapper';
 
 chaiSetup.configure();
 const expect = chai.expect;
@@ -53,7 +58,7 @@ describe('ERC721Token', () => {
             provider,
             txDefaults,
         );
-        logDecoder = new LogDecoder(web3Wrapper);
+        logDecoder = new LogDecoder(web3Wrapper, artifacts);
         await web3Wrapper.awaitTransactionSuccessAsync(
             await token.mint.sendTransactionAsync(owner, tokenId, { from: owner }),
             constants.AWAIT_TRANSACTION_MINED_MS,
diff --git a/contracts/core/test/tokens/unlimited_allowance_token.ts b/contracts/core/test/tokens/unlimited_allowance_token.ts
index ea5a50522..c3e4072c5 100644
--- a/contracts/core/test/tokens/unlimited_allowance_token.ts
+++ b/contracts/core/test/tokens/unlimited_allowance_token.ts
@@ -1,3 +1,11 @@
+import {
+    chaiSetup,
+    constants,
+    expectContractCallFailedAsync,
+    provider,
+    txDefaults,
+    web3Wrapper,
+} from '@0x/contracts-test-utils';
 import { BlockchainLifecycle } from '@0x/dev-utils';
 import { RevertReason } from '@0x/types';
 import { BigNumber } from '@0x/utils';
@@ -5,10 +13,6 @@ import * as chai from 'chai';
 
 import { DummyERC20TokenContract } from '../../generated-wrappers/dummy_erc20_token';
 import { artifacts } from '../../src/artifacts';
-import { expectContractCallFailedAsync } from '../utils/assertions';
-import { chaiSetup } from '../utils/chai_setup';
-import { constants } from '../utils/constants';
-import { provider, txDefaults, web3Wrapper } from '../utils/web3_wrapper';
 
 chaiSetup.configure();
 const expect = chai.expect;
diff --git a/contracts/core/test/tokens/weth9.ts b/contracts/core/test/tokens/weth9.ts
index 9a31dc3f2..225481904 100644
--- a/contracts/core/test/tokens/weth9.ts
+++ b/contracts/core/test/tokens/weth9.ts
@@ -1,3 +1,12 @@
+import {
+    chaiSetup,
+    constants,
+    expectInsufficientFundsAsync,
+    expectTransactionFailedWithoutReasonAsync,
+    provider,
+    txDefaults,
+    web3Wrapper,
+} from '@0x/contracts-test-utils';
 import { BlockchainLifecycle } from '@0x/dev-utils';
 import { BigNumber } from '@0x/utils';
 import { Web3Wrapper } from '@0x/web3-wrapper';
@@ -5,10 +14,6 @@ import * as chai from 'chai';
 
 import { WETH9Contract } from '../../generated-wrappers/weth9';
 import { artifacts } from '../../src/artifacts';
-import { expectInsufficientFundsAsync, expectTransactionFailedWithoutReasonAsync } from '../utils/assertions';
-import { chaiSetup } from '../utils/chai_setup';
-import { constants } from '../utils/constants';
-import { provider, txDefaults, web3Wrapper } from '../utils/web3_wrapper';
 
 chaiSetup.configure();
 const expect = chai.expect;
diff --git a/contracts/core/test/tokens/zrx_token.ts b/contracts/core/test/tokens/zrx_token.ts
index cab62c205..6bc5e164c 100644
--- a/contracts/core/test/tokens/zrx_token.ts
+++ b/contracts/core/test/tokens/zrx_token.ts
@@ -1,3 +1,4 @@
+import { chaiSetup, constants, provider, txDefaults, web3Wrapper } from '@0x/contracts-test-utils';
 import { BlockchainLifecycle } from '@0x/dev-utils';
 import { BigNumber } from '@0x/utils';
 import { Web3Wrapper } from '@0x/web3-wrapper';
@@ -5,9 +6,6 @@ import * as chai from 'chai';
 
 import { ZRXTokenContract } from '../../generated-wrappers/zrx_token';
 import { artifacts } from '../../src/artifacts';
-import { chaiSetup } from '../utils/chai_setup';
-import { constants } from '../utils/constants';
-import { provider, txDefaults, web3Wrapper } from '../utils/web3_wrapper';
 
 chaiSetup.configure();
 const expect = chai.expect;
diff --git a/contracts/core/test/utils/abstract_asset_wrapper.ts b/contracts/core/test/utils/abstract_asset_wrapper.ts
deleted file mode 100644
index 4b56a8502..000000000
--- a/contracts/core/test/utils/abstract_asset_wrapper.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export abstract class AbstractAssetWrapper {
-    public abstract getProxyId(): string;
-}
diff --git a/contracts/core/test/utils/address_utils.ts b/contracts/core/test/utils/address_utils.ts
deleted file mode 100644
index 634da0c16..000000000
--- a/contracts/core/test/utils/address_utils.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { generatePseudoRandomSalt } from '@0x/order-utils';
-import { crypto } from '@0x/order-utils/lib/src/crypto';
-
-export const addressUtils = {
-    generatePseudoRandomAddress(): string {
-        const randomBigNum = generatePseudoRandomSalt();
-        const randomBuff = crypto.solSHA3([randomBigNum]);
-        const randomAddress = `0x${randomBuff.slice(0, 20).toString('hex')}`;
-        return randomAddress;
-    },
-};
diff --git a/contracts/core/test/utils/assertions.ts b/contracts/core/test/utils/assertions.ts
deleted file mode 100644
index 5b1cedfcc..000000000
--- a/contracts/core/test/utils/assertions.ts
+++ /dev/null
@@ -1,199 +0,0 @@
-import { RevertReason } from '@0x/types';
-import { logUtils } from '@0x/utils';
-import { NodeType } from '@0x/web3-wrapper';
-import * as chai from 'chai';
-import { TransactionReceipt, TransactionReceiptStatus, TransactionReceiptWithDecodedLogs } from 'ethereum-types';
-import * as _ from 'lodash';
-
-import { web3Wrapper } from './web3_wrapper';
-
-const expect = chai.expect;
-
-let nodeType: NodeType | undefined;
-
-// Represents the return value of a `sendTransaction` call. The Promise should
-// resolve with either a transaction receipt or a transaction hash.
-export type sendTransactionResult = Promise<TransactionReceipt | TransactionReceiptWithDecodedLogs | string>;
-
-/**
- * Returns ganacheError if the backing Ethereum node is Ganache and gethError
- * if it is Geth.
- * @param ganacheError the error to be returned if the backing node is Ganache.
- * @param gethError the error to be returned if the backing node is Geth.
- * @returns either the given ganacheError or gethError depending on the backing
- * node.
- */
-async function _getGanacheOrGethError(ganacheError: string, gethError: string): Promise<string> {
-    if (_.isUndefined(nodeType)) {
-        nodeType = await web3Wrapper.getNodeTypeAsync();
-    }
-    switch (nodeType) {
-        case NodeType.Ganache:
-            return ganacheError;
-        case NodeType.Geth:
-            return gethError;
-        default:
-            throw new Error(`Unknown node type: ${nodeType}`);
-    }
-}
-
-async function _getInsufficientFundsErrorMessageAsync(): Promise<string> {
-    return _getGanacheOrGethError("sender doesn't have enough funds", 'insufficient funds');
-}
-
-async function _getTransactionFailedErrorMessageAsync(): Promise<string> {
-    return _getGanacheOrGethError('revert', 'always failing transaction');
-}
-
-async function _getContractCallFailedErrorMessageAsync(): Promise<string> {
-    return _getGanacheOrGethError('revert', 'Contract call failed');
-}
-
-/**
- * Returns the expected error message for an 'invalid opcode' resulting from a
- * contract call. The exact error message depends on the backing Ethereum node.
- */
-export async function getInvalidOpcodeErrorMessageForCallAsync(): Promise<string> {
-    return _getGanacheOrGethError('invalid opcode', 'Contract call failed');
-}
-
-/**
- * Returns the expected error message for the given revert reason resulting from
- * a sendTransaction call. The exact error message depends on the backing
- * Ethereum node and whether it supports revert reasons.
- * @param reason a specific revert reason.
- * @returns the expected error message.
- */
-export async function getRevertReasonOrErrorMessageForSendTransactionAsync(reason: RevertReason): Promise<string> {
-    return _getGanacheOrGethError(reason, 'always failing transaction');
-}
-
-/**
- * Rejects if the given Promise does not reject with an error indicating
- * insufficient funds.
- * @param p a promise resulting from a contract call or sendTransaction call.
- * @returns a new Promise which will reject if the conditions are not met and
- * otherwise resolve with no value.
- */
-export async function expectInsufficientFundsAsync<T>(p: Promise<T>): Promise<void> {
-    const errMessage = await _getInsufficientFundsErrorMessageAsync();
-    return expect(p).to.be.rejectedWith(errMessage);
-}
-
-/**
- * Resolves if the the sendTransaction call fails with the given revert reason.
- * However, since Geth does not support revert reasons for sendTransaction, this
- * falls back to expectTransactionFailedWithoutReasonAsync if the backing
- * Ethereum node is Geth.
- * @param p a Promise resulting from a sendTransaction call
- * @param reason a specific revert reason
- * @returns a new Promise which will reject if the conditions are not met and
- * otherwise resolve with no value.
- */
-export async function expectTransactionFailedAsync(p: sendTransactionResult, reason: RevertReason): Promise<void> {
-    // HACK(albrow): This dummy `catch` should not be necessary, but if you
-    // remove it, there is an uncaught exception and the Node process will
-    // forcibly exit. It's possible this is a false positive in
-    // make-promises-safe.
-    p.catch(e => {
-        _.noop(e);
-    });
-
-    if (_.isUndefined(nodeType)) {
-        nodeType = await web3Wrapper.getNodeTypeAsync();
-    }
-    switch (nodeType) {
-        case NodeType.Ganache:
-            return expect(p).to.be.rejectedWith(reason);
-        case NodeType.Geth:
-            logUtils.warn(
-                'WARNING: Geth does not support revert reasons for sendTransaction. This test will pass if the transaction fails for any reason.',
-            );
-            return expectTransactionFailedWithoutReasonAsync(p);
-        default:
-            throw new Error(`Unknown node type: ${nodeType}`);
-    }
-}
-
-/**
- * Resolves if the transaction fails without a revert reason, or if the
- * corresponding transactionReceipt has a status of 0 or '0', indicating
- * failure.
- * @param p a Promise resulting from a sendTransaction call
- * @returns a new Promise which will reject if the conditions are not met and
- * otherwise resolve with no value.
- */
-export async function expectTransactionFailedWithoutReasonAsync(p: sendTransactionResult): Promise<void> {
-    return p
-        .then(async result => {
-            let txReceiptStatus: TransactionReceiptStatus;
-            if (_.isString(result)) {
-                // Result is a txHash. We need to make a web3 call to get the
-                // receipt, then get the status from the receipt.
-                const txReceipt = await web3Wrapper.awaitTransactionMinedAsync(result);
-                txReceiptStatus = txReceipt.status;
-            } else if ('status' in result) {
-                // Result is a transaction receipt, so we can get the status
-                // directly.
-                txReceiptStatus = result.status;
-            } else {
-                throw new Error('Unexpected result type: ' + typeof result);
-            }
-            expect(_.toString(txReceiptStatus)).to.equal(
-                '0',
-                'Expected transaction to fail but receipt had a non-zero status, indicating success',
-            );
-        })
-        .catch(async err => {
-            // If the promise rejects, we expect a specific error message,
-            // depending on the backing Ethereum node type.
-            const errMessage = await _getTransactionFailedErrorMessageAsync();
-            expect(err.message).to.include(errMessage);
-        });
-}
-
-/**
- * Resolves if the the contract call fails with the given revert reason.
- * @param p a Promise resulting from a contract call
- * @param reason a specific revert reason
- * @returns a new Promise which will reject if the conditions are not met and
- * otherwise resolve with no value.
- */
-export async function expectContractCallFailedAsync<T>(p: Promise<T>, reason: RevertReason): Promise<void> {
-    return expect(p).to.be.rejectedWith(reason);
-}
-
-/**
- * Resolves if the contract call fails without a revert reason.
- * @param p a Promise resulting from a contract call
- * @returns a new Promise which will reject if the conditions are not met and
- * otherwise resolve with no value.
- */
-export async function expectContractCallFailedWithoutReasonAsync<T>(p: Promise<T>): Promise<void> {
-    const errMessage = await _getContractCallFailedErrorMessageAsync();
-    return expect(p).to.be.rejectedWith(errMessage);
-}
-
-/**
- * Resolves if the contract creation/deployment fails without a revert reason.
- * @param p a Promise resulting from a contract creation/deployment
- * @returns a new Promise which will reject if the conditions are not met and
- * otherwise resolve with no value.
- */
-export async function expectContractCreationFailedAsync<T>(
-    p: sendTransactionResult,
-    reason: RevertReason,
-): Promise<void> {
-    return expectTransactionFailedAsync(p, reason);
-}
-
-/**
- * Resolves if the contract creation/deployment fails without a revert reason.
- * @param p a Promise resulting from a contract creation/deployment
- * @returns a new Promise which will reject if the conditions are not met and
- * otherwise resolve with no value.
- */
-export async function expectContractCreationFailedWithoutReasonAsync<T>(p: Promise<T>): Promise<void> {
-    const errMessage = await _getTransactionFailedErrorMessageAsync();
-    return expect(p).to.be.rejectedWith(errMessage);
-}
diff --git a/contracts/core/test/utils/multi_sig_wrapper.ts b/contracts/core/test/utils/asset_proxy_owner_wrapper.ts
index 74fd3b4d6..d5aaaf519 100644
--- a/contracts/core/test/utils/multi_sig_wrapper.ts
+++ b/contracts/core/test/utils/asset_proxy_owner_wrapper.ts
@@ -1,21 +1,20 @@
+import { LogDecoder } from '@0x/contracts-test-utils';
 import { BigNumber } from '@0x/utils';
 import { Web3Wrapper } from '@0x/web3-wrapper';
 import { Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types';
 import * as _ from 'lodash';
 
 import { AssetProxyOwnerContract } from '../../generated-wrappers/asset_proxy_owner';
-import { MultiSigWalletContract } from '../../generated-wrappers/multi_sig_wallet';
+import { artifacts } from '../../src/artifacts';
 
-import { LogDecoder } from './log_decoder';
-
-export class MultiSigWrapper {
-    private readonly _multiSig: MultiSigWalletContract;
+export class AssetProxyOwnerWrapper {
+    private readonly _assetProxyOwner: AssetProxyOwnerContract;
     private readonly _web3Wrapper: Web3Wrapper;
     private readonly _logDecoder: LogDecoder;
-    constructor(multiSigContract: MultiSigWalletContract, provider: Provider) {
-        this._multiSig = multiSigContract;
+    constructor(assetproxyOwnerContract: AssetProxyOwnerContract, provider: Provider) {
+        this._assetProxyOwner = assetproxyOwnerContract;
         this._web3Wrapper = new Web3Wrapper(provider);
-        this._logDecoder = new LogDecoder(this._web3Wrapper);
+        this._logDecoder = new LogDecoder(this._web3Wrapper, artifacts);
     }
     public async submitTransactionAsync(
         destination: string,
@@ -24,19 +23,19 @@ export class MultiSigWrapper {
         opts: { value?: BigNumber } = {},
     ): Promise<TransactionReceiptWithDecodedLogs> {
         const value = _.isUndefined(opts.value) ? new BigNumber(0) : opts.value;
-        const txHash = await this._multiSig.submitTransaction.sendTransactionAsync(destination, value, data, {
+        const txHash = await this._assetProxyOwner.submitTransaction.sendTransactionAsync(destination, value, data, {
             from,
         });
         const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
         return tx;
     }
     public async confirmTransactionAsync(txId: BigNumber, from: string): Promise<TransactionReceiptWithDecodedLogs> {
-        const txHash = await this._multiSig.confirmTransaction.sendTransactionAsync(txId, { from });
+        const txHash = await this._assetProxyOwner.confirmTransaction.sendTransactionAsync(txId, { from });
         const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
         return tx;
     }
     public async revokeConfirmationAsync(txId: BigNumber, from: string): Promise<TransactionReceiptWithDecodedLogs> {
-        const txHash = await this._multiSig.revokeConfirmation.sendTransactionAsync(txId, { from });
+        const txHash = await this._assetProxyOwner.revokeConfirmation.sendTransactionAsync(txId, { from });
         const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
         return tx;
     }
@@ -45,7 +44,7 @@ export class MultiSigWrapper {
         from: string,
         opts: { gas?: number } = {},
     ): Promise<TransactionReceiptWithDecodedLogs> {
-        const txHash = await this._multiSig.executeTransaction.sendTransactionAsync(txId, {
+        const txHash = await this._assetProxyOwner.executeTransaction.sendTransactionAsync(txId, {
             from,
             gas: opts.gas,
         });
@@ -58,9 +57,12 @@ export class MultiSigWrapper {
     ): Promise<TransactionReceiptWithDecodedLogs> {
         // tslint:disable-next-line:no-unnecessary-type-assertion
         const txHash = await (this
-            ._multiSig as AssetProxyOwnerContract).executeRemoveAuthorizedAddressAtIndex.sendTransactionAsync(txId, {
-            from,
-        });
+            ._assetProxyOwner as AssetProxyOwnerContract).executeRemoveAuthorizedAddressAtIndex.sendTransactionAsync(
+            txId,
+            {
+                from,
+            },
+        );
         const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
         return tx;
     }
diff --git a/contracts/core/test/utils/asset_wrapper.ts b/contracts/core/test/utils/asset_wrapper.ts
index 4e7696066..e4090ad74 100644
--- a/contracts/core/test/utils/asset_wrapper.ts
+++ b/contracts/core/test/utils/asset_wrapper.ts
@@ -1,10 +1,9 @@
+import { AbstractAssetWrapper, constants } from '@0x/contracts-test-utils';
 import { assetDataUtils } from '@0x/order-utils';
 import { AssetProxyId } from '@0x/types';
 import { BigNumber, errorUtils } from '@0x/utils';
 import * as _ from 'lodash';
 
-import { AbstractAssetWrapper } from './abstract_asset_wrapper';
-import { constants } from './constants';
 import { ERC20Wrapper } from './erc20_wrapper';
 import { ERC721Wrapper } from './erc721_wrapper';
 
diff --git a/contracts/core/test/utils/block_timestamp.ts b/contracts/core/test/utils/block_timestamp.ts
deleted file mode 100644
index 66c13eed1..000000000
--- a/contracts/core/test/utils/block_timestamp.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import * as _ from 'lodash';
-
-import { constants } from './constants';
-import { web3Wrapper } from './web3_wrapper';
-
-let firstAccount: string | undefined;
-
-/**
- * Increases time by the given number of seconds and then mines a block so that
- * the current block timestamp has the offset applied.
- * @param seconds the number of seconds by which to incrase the time offset.
- * @returns a new Promise which will resolve with the new total time offset or
- * reject if the time could not be increased.
- */
-export async function increaseTimeAndMineBlockAsync(seconds: number): Promise<number> {
-    if (_.isUndefined(firstAccount)) {
-        const accounts = await web3Wrapper.getAvailableAddressesAsync();
-        firstAccount = accounts[0];
-    }
-
-    const offset = await web3Wrapper.increaseTimeAsync(seconds);
-    // Note: we need to send a transaction after increasing time so
-    // that a block is actually mined. The contract looks at the
-    // last mined block for the timestamp.
-    await web3Wrapper.awaitTransactionSuccessAsync(
-        await web3Wrapper.sendTransactionAsync({ from: firstAccount, to: firstAccount, value: 0 }),
-        constants.AWAIT_TRANSACTION_MINED_MS,
-    );
-
-    return offset;
-}
-
-/**
- * Returns the timestamp of the latest block in seconds since the Unix epoch.
- * @returns a new Promise which will resolve with the timestamp in seconds.
- */
-export async function getLatestBlockTimestampAsync(): Promise<number> {
-    const currentBlockIfExists = await web3Wrapper.getBlockIfExistsAsync('latest');
-    if (_.isUndefined(currentBlockIfExists)) {
-        throw new Error(`Unable to fetch latest block.`);
-    }
-    return currentBlockIfExists.timestamp;
-}
diff --git a/contracts/core/test/utils/chai_setup.ts b/contracts/core/test/utils/chai_setup.ts
deleted file mode 100644
index 1a8733093..000000000
--- a/contracts/core/test/utils/chai_setup.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import * as chai from 'chai';
-import chaiAsPromised = require('chai-as-promised');
-import ChaiBigNumber = require('chai-bignumber');
-import * as dirtyChai from 'dirty-chai';
-
-export const chaiSetup = {
-    configure(): void {
-        chai.config.includeStack = true;
-        chai.use(ChaiBigNumber());
-        chai.use(dirtyChai);
-        chai.use(chaiAsPromised);
-    },
-};
diff --git a/contracts/core/test/utils/combinatorial_utils.ts b/contracts/core/test/utils/combinatorial_utils.ts
deleted file mode 100644
index bb1b55b4d..000000000
--- a/contracts/core/test/utils/combinatorial_utils.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-import { BigNumber } from '@0x/utils';
-import * as combinatorics from 'js-combinatorics';
-
-import { testWithReferenceFuncAsync } from './test_with_reference';
-
-// A set of values corresponding to the uint256 type in Solidity. This set
-// contains some notable edge cases, including some values which will overflow
-// the uint256 type when used in different mathematical operations.
-export const uint256Values = [
-    new BigNumber(0),
-    new BigNumber(1),
-    new BigNumber(2),
-    // Non-trivial big number.
-    new BigNumber(2).pow(64),
-    // Max that does not overflow when squared.
-    new BigNumber(2).pow(128).minus(1),
-    // Min that does overflow when squared.
-    new BigNumber(2).pow(128),
-    // Max that does not overflow when doubled.
-    new BigNumber(2).pow(255).minus(1),
-    // Min that does overflow when doubled.
-    new BigNumber(2).pow(255),
-    // Max that does not overflow.
-    new BigNumber(2).pow(256).minus(1),
-];
-
-// A set of values corresponding to the bytes32 type in Solidity.
-export const bytes32Values = [
-    // Min
-    '0x0000000000000000000000000000000000000000000000000000000000000000',
-    '0x0000000000000000000000000000000000000000000000000000000000000001',
-    '0x0000000000000000000000000000000000000000000000000000000000000002',
-    // Non-trivial big number.
-    '0x000000000000f000000000000000000000000000000000000000000000000000',
-    // Max
-    '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
-];
-
-export async function testCombinatoriallyWithReferenceFuncAsync<P0, P1, R>(
-    name: string,
-    referenceFunc: (p0: P0, p1: P1) => Promise<R>,
-    testFunc: (p0: P0, p1: P1) => Promise<R>,
-    allValues: [P0[], P1[]],
-): Promise<void>;
-export async function testCombinatoriallyWithReferenceFuncAsync<P0, P1, P2, R>(
-    name: string,
-    referenceFunc: (p0: P0, p1: P1, p2: P2) => Promise<R>,
-    testFunc: (p0: P0, p1: P1, p2: P2) => Promise<R>,
-    allValues: [P0[], P1[], P2[]],
-): Promise<void>;
-export async function testCombinatoriallyWithReferenceFuncAsync<P0, P1, P2, P3, R>(
-    name: string,
-    referenceFunc: (p0: P0, p1: P1, p2: P2, p3: P3) => Promise<R>,
-    testFunc: (p0: P0, p1: P1, p2: P2, p3: P3) => Promise<R>,
-    allValues: [P0[], P1[], P2[], P3[]],
-): Promise<void>;
-export async function testCombinatoriallyWithReferenceFuncAsync<P0, P1, P2, P3, P4, R>(
-    name: string,
-    referenceFunc: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4) => Promise<R>,
-    testFunc: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4) => Promise<R>,
-    allValues: [P0[], P1[], P2[], P3[], P4[]],
-): Promise<void>;
-
-/**
- * Uses combinatorics to test the behavior of a test function by comparing it to
- * the expected behavior (defined by a reference function) for a large number of
- * possible input values.
- *
- * First generates test cases by taking the cartesian product of the given
- * values. Each test case is a set of N values corresponding to the N arguments
- * for the test func and the reference func. For each test case, first the
- * reference function will be called to obtain an "expected result", or if the
- * reference function throws/rejects, an "expected error". Next, the test
- * function will be called to obtain an "actual result", or if the test function
- * throws/rejects, an "actual error". Each test case passes if at least one of
- * the following conditions is met:
- *
- * 1) Neither the reference function or the test function throw and the
- * "expected result" equals the "actual result".
- *
- * 2) Both the reference function and the test function throw and the "actual
- * error" message *contains* the "expected error" message.
- *
- * The first test case which does not meet one of these conditions will cause
- * the entire test to fail and this function will throw/reject.
- *
- * @param referenceFuncAsync a reference function implemented in pure
- * JavaScript/TypeScript which accepts N arguments and returns the "expected
- * result" or "expected error" for a given test case.
- * @param testFuncAsync a test function which, e.g., makes a call or sends a
- * transaction to a contract. It accepts the same N arguments returns the
- * "actual result" or "actual error" for a given test case.
- * @param values an array of N arrays. Each inner array is a set of possible
- * values which are passed into both the reference function and the test
- * function.
- * @return A Promise that resolves if the test passes and rejects if the test
- * fails, according to the rules described above.
- */
-export async function testCombinatoriallyWithReferenceFuncAsync(
-    name: string,
-    referenceFuncAsync: (...args: any[]) => Promise<any>,
-    testFuncAsync: (...args: any[]) => Promise<any>,
-    allValues: any[],
-): Promise<void> {
-    const testCases = combinatorics.cartesianProduct(...allValues);
-    let counter = 0;
-    testCases.forEach(async testCase => {
-        counter += 1;
-        it(`${name} ${counter}/${testCases.length}`, async () => {
-            await testWithReferenceFuncAsync(referenceFuncAsync, testFuncAsync, testCase as any);
-        });
-    });
-}
diff --git a/contracts/core/test/utils/constants.ts b/contracts/core/test/utils/constants.ts
deleted file mode 100644
index d2c3ab512..000000000
--- a/contracts/core/test/utils/constants.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { BigNumber } from '@0x/utils';
-import { Web3Wrapper } from '@0x/web3-wrapper';
-import * as ethUtil from 'ethereumjs-util';
-import * as _ from 'lodash';
-
-const TESTRPC_PRIVATE_KEYS_STRINGS = [
-    '0xf2f48ee19680706196e2e339e5da3491186e0c4c5030670656b0e0164837257d',
-    '0x5d862464fe9303452126c8bc94274b8c5f9874cbd219789b3eb2128075a76f72',
-    '0xdf02719c4df8b9b8ac7f551fcb5d9ef48fa27eef7a66453879f4d8fdc6e78fb1',
-    '0xff12e391b79415e941a94de3bf3a9aee577aed0731e297d5cfa0b8a1e02fa1d0',
-    '0x752dd9cf65e68cfaba7d60225cbdbc1f4729dd5e5507def72815ed0d8abc6249',
-    '0xefb595a0178eb79a8df953f87c5148402a224cdf725e88c0146727c6aceadccd',
-    '0x83c6d2cc5ddcf9711a6d59b417dc20eb48afd58d45290099e5987e3d768f328f',
-    '0xbb2d3f7c9583780a7d3904a2f55d792707c345f21de1bacb2d389934d82796b2',
-    '0xb2fd4d29c1390b71b8795ae81196bfd60293adf99f9d32a0aff06288fcdac55f',
-    '0x23cb7121166b9a2f93ae0b7c05bde02eae50d64449b2cbb42bc84e9d38d6cc89',
-];
-
-export const constants = {
-    BASE_16: 16,
-    INVALID_OPCODE: 'invalid opcode',
-    TESTRPC_NETWORK_ID: 50,
-    // Note(albrow): In practice V8 and most other engines limit the minimum
-    // interval for setInterval to 10ms. We still set it to 0 here in order to
-    // ensure we always use the minimum interval.
-    AWAIT_TRANSACTION_MINED_MS: 0,
-    MAX_ETHERTOKEN_WITHDRAW_GAS: 43000,
-    MAX_EXECUTE_TRANSACTION_GAS: 1000000,
-    MAX_TOKEN_TRANSFERFROM_GAS: 80000,
-    MAX_TOKEN_APPROVE_GAS: 60000,
-    MAX_TRANSFER_FROM_GAS: 150000,
-    DUMMY_TOKEN_NAME: '',
-    DUMMY_TOKEN_SYMBOL: '',
-    DUMMY_TOKEN_DECIMALS: new BigNumber(18),
-    DUMMY_TOKEN_TOTAL_SUPPLY: new BigNumber(0),
-    NULL_BYTES: '0x',
-    NUM_DUMMY_ERC20_TO_DEPLOY: 3,
-    NUM_DUMMY_ERC721_TO_DEPLOY: 2,
-    NUM_ERC721_TOKENS_TO_MINT: 2,
-    NULL_ADDRESS: '0x0000000000000000000000000000000000000000',
-    UNLIMITED_ALLOWANCE_IN_BASE_UNITS: new BigNumber(2).pow(256).minus(1),
-    TESTRPC_PRIVATE_KEYS: _.map(TESTRPC_PRIVATE_KEYS_STRINGS, privateKeyString => ethUtil.toBuffer(privateKeyString)),
-    INITIAL_ERC20_BALANCE: Web3Wrapper.toBaseUnitAmount(new BigNumber(10000), 18),
-    INITIAL_ERC20_ALLOWANCE: Web3Wrapper.toBaseUnitAmount(new BigNumber(10000), 18),
-    STATIC_ORDER_PARAMS: {
-        makerAssetAmount: Web3Wrapper.toBaseUnitAmount(new BigNumber(100), 18),
-        takerAssetAmount: Web3Wrapper.toBaseUnitAmount(new BigNumber(200), 18),
-        makerFee: Web3Wrapper.toBaseUnitAmount(new BigNumber(1), 18),
-        takerFee: Web3Wrapper.toBaseUnitAmount(new BigNumber(1), 18),
-    },
-    WORD_LENGTH: 32,
-    ZERO_AMOUNT: new BigNumber(0),
-    PERCENTAGE_DENOMINATOR: new BigNumber(10).pow(18),
-    FUNCTIONS_WITH_MUTEX: [
-        'FILL_ORDER',
-        'FILL_OR_KILL_ORDER',
-        'BATCH_FILL_ORDERS',
-        'BATCH_FILL_OR_KILL_ORDERS',
-        'MARKET_BUY_ORDERS',
-        'MARKET_SELL_ORDERS',
-        'MATCH_ORDERS',
-        'CANCEL_ORDER',
-        'BATCH_CANCEL_ORDERS',
-        'CANCEL_ORDERS_UP_TO',
-        'SET_SIGNATURE_VALIDATOR_APPROVAL',
-    ],
-};
diff --git a/contracts/core/test/utils/coverage.ts b/contracts/core/test/utils/coverage.ts
deleted file mode 100644
index 5becfa1b6..000000000
--- a/contracts/core/test/utils/coverage.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { devConstants } from '@0x/dev-utils';
-import { CoverageSubprovider, SolCompilerArtifactAdapter } from '@0x/sol-cov';
-import * as _ from 'lodash';
-
-let coverageSubprovider: CoverageSubprovider;
-
-export const coverage = {
-    getCoverageSubproviderSingleton(): CoverageSubprovider {
-        if (_.isUndefined(coverageSubprovider)) {
-            coverageSubprovider = coverage._getCoverageSubprovider();
-        }
-        return coverageSubprovider;
-    },
-    _getCoverageSubprovider(): CoverageSubprovider {
-        const defaultFromAddress = devConstants.TESTRPC_FIRST_ADDRESS;
-        const solCompilerArtifactAdapter = new SolCompilerArtifactAdapter();
-        const isVerbose = true;
-        const subprovider = new CoverageSubprovider(solCompilerArtifactAdapter, defaultFromAddress, isVerbose);
-        return subprovider;
-    },
-};
diff --git a/contracts/core/test/utils/erc20_wrapper.ts b/contracts/core/test/utils/erc20_wrapper.ts
index c281a2abf..d6210646c 100644
--- a/contracts/core/test/utils/erc20_wrapper.ts
+++ b/contracts/core/test/utils/erc20_wrapper.ts
@@ -1,3 +1,4 @@
+import { constants, ERC20BalancesByOwner, txDefaults } from '@0x/contracts-test-utils';
 import { assetDataUtils } from '@0x/order-utils';
 import { BigNumber } from '@0x/utils';
 import { Web3Wrapper } from '@0x/web3-wrapper';
@@ -8,10 +9,6 @@ import { DummyERC20TokenContract } from '../../generated-wrappers/dummy_erc20_to
 import { ERC20ProxyContract } from '../../generated-wrappers/erc20_proxy';
 import { artifacts } from '../../src/artifacts';
 
-import { constants } from './constants';
-import { ERC20BalancesByOwner } from './types';
-import { txDefaults } from './web3_wrapper';
-
 export class ERC20Wrapper {
     private readonly _tokenOwnerAddresses: string[];
     private readonly _contractOwnerAddress: string;
diff --git a/contracts/core/test/utils/erc721_wrapper.ts b/contracts/core/test/utils/erc721_wrapper.ts
index e9da553d0..b5ae34e60 100644
--- a/contracts/core/test/utils/erc721_wrapper.ts
+++ b/contracts/core/test/utils/erc721_wrapper.ts
@@ -1,3 +1,4 @@
+import { constants, ERC721TokenIdsByOwner, txDefaults } from '@0x/contracts-test-utils';
 import { generatePseudoRandomSalt } from '@0x/order-utils';
 import { BigNumber } from '@0x/utils';
 import { Web3Wrapper } from '@0x/web3-wrapper';
@@ -8,10 +9,6 @@ import { DummyERC721TokenContract } from '../../generated-wrappers/dummy_erc721_
 import { ERC721ProxyContract } from '../../generated-wrappers/erc721_proxy';
 import { artifacts } from '../../src/artifacts';
 
-import { constants } from './constants';
-import { ERC721TokenIdsByOwner } from './types';
-import { txDefaults } from './web3_wrapper';
-
 export class ERC721Wrapper {
     private readonly _tokenOwnerAddresses: string[];
     private readonly _contractOwnerAddress: string;
diff --git a/contracts/core/test/utils/exchange_wrapper.ts b/contracts/core/test/utils/exchange_wrapper.ts
index c28989d3f..2a24b880f 100644
--- a/contracts/core/test/utils/exchange_wrapper.ts
+++ b/contracts/core/test/utils/exchange_wrapper.ts
@@ -1,14 +1,18 @@
+import {
+    FillResults,
+    formatters,
+    LogDecoder,
+    OrderInfo,
+    orderUtils,
+    SignedTransaction,
+} from '@0x/contracts-test-utils';
 import { SignedOrder } from '@0x/types';
 import { BigNumber } from '@0x/utils';
 import { Web3Wrapper } from '@0x/web3-wrapper';
 import { Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types';
 
 import { ExchangeContract } from '../../generated-wrappers/exchange';
-
-import { formatters } from './formatters';
-import { LogDecoder } from './log_decoder';
-import { orderUtils } from './order_utils';
-import { FillResults, OrderInfo, SignedTransaction } from './types';
+import { artifacts } from '../../src/artifacts';
 
 export class ExchangeWrapper {
     private readonly _exchange: ExchangeContract;
@@ -17,7 +21,7 @@ export class ExchangeWrapper {
     constructor(exchangeContract: ExchangeContract, provider: Provider) {
         this._exchange = exchangeContract;
         this._web3Wrapper = new Web3Wrapper(provider);
-        this._logDecoder = new LogDecoder(this._web3Wrapper);
+        this._logDecoder = new LogDecoder(this._web3Wrapper, artifacts);
     }
     public async fillOrderAsync(
         signedOrder: SignedOrder,
diff --git a/contracts/core/test/utils/fill_order_combinatorial_utils.ts b/contracts/core/test/utils/fill_order_combinatorial_utils.ts
index 8046771f9..5d0ea07a8 100644
--- a/contracts/core/test/utils/fill_order_combinatorial_utils.ts
+++ b/contracts/core/test/utils/fill_order_combinatorial_utils.ts
@@ -1,3 +1,21 @@
+import { artifacts as libsArtifacts, TestLibsContract } from '@0x/contracts-libs';
+import {
+    AllowanceAmountScenario,
+    AssetDataScenario,
+    BalanceAmountScenario,
+    chaiSetup,
+    constants,
+    expectTransactionFailedAsync,
+    ExpirationTimeSecondsScenario,
+    FeeRecipientAddressScenario,
+    FillScenario,
+    OrderAssetAmountScenario,
+    orderUtils,
+    signingUtils,
+    TakerAssetFillAmountScenario,
+    TakerScenario,
+    TraderStateScenario,
+} from '@0x/contracts-test-utils';
 import {
     assetDataUtils,
     BalanceAndProxyAllowanceLazyStore,
@@ -15,33 +33,15 @@ import * as _ from 'lodash';
 import 'make-promises-safe';
 
 import { ExchangeContract, ExchangeFillEventArgs } from '../../generated-wrappers/exchange';
-import { TestLibsContract } from '../../generated-wrappers/test_libs';
 import { artifacts } from '../../src/artifacts';
 
-import { expectTransactionFailedAsync } from './assertions';
 import { AssetWrapper } from './asset_wrapper';
-import { chaiSetup } from './chai_setup';
-import { constants } from './constants';
 import { ERC20Wrapper } from './erc20_wrapper';
 import { ERC721Wrapper } from './erc721_wrapper';
 import { ExchangeWrapper } from './exchange_wrapper';
 import { OrderFactoryFromScenario } from './order_factory_from_scenario';
-import { orderUtils } from './order_utils';
-import { signingUtils } from './signing_utils';
 import { SimpleAssetBalanceAndProxyAllowanceFetcher } from './simple_asset_balance_and_proxy_allowance_fetcher';
 import { SimpleOrderFilledCancelledFetcher } from './simple_order_filled_cancelled_fetcher';
-import {
-    AllowanceAmountScenario,
-    AssetDataScenario,
-    BalanceAmountScenario,
-    ExpirationTimeSecondsScenario,
-    FeeRecipientAddressScenario,
-    FillScenario,
-    OrderAssetAmountScenario,
-    TakerAssetFillAmountScenario,
-    TakerScenario,
-    TraderStateScenario,
-} from './types';
 
 chaiSetup.configure();
 const expect = chai.expect;
@@ -131,7 +131,11 @@ export async function fillOrderCombinatorialUtilsFactoryAsync(
         exchangeContract.address,
     );
 
-    const testLibsContract = await TestLibsContract.deployFrom0xArtifactAsync(artifacts.TestLibs, provider, txDefaults);
+    const testLibsContract = await TestLibsContract.deployFrom0xArtifactAsync(
+        libsArtifacts.TestLibs,
+        provider,
+        txDefaults,
+    );
 
     const fillOrderCombinatorialUtils = new FillOrderCombinatorialUtils(
         orderFactory,
diff --git a/contracts/core/test/utils/formatters.ts b/contracts/core/test/utils/formatters.ts
deleted file mode 100644
index 813eb45db..000000000
--- a/contracts/core/test/utils/formatters.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { SignedOrder } from '@0x/types';
-import { BigNumber } from '@0x/utils';
-import * as _ from 'lodash';
-
-import { constants } from './constants';
-import { orderUtils } from './order_utils';
-import { BatchCancelOrders, BatchFillOrders, MarketBuyOrders, MarketSellOrders } from './types';
-
-export const formatters = {
-    createBatchFill(signedOrders: SignedOrder[], takerAssetFillAmounts: BigNumber[] = []): BatchFillOrders {
-        const batchFill: BatchFillOrders = {
-            orders: [],
-            signatures: [],
-            takerAssetFillAmounts,
-        };
-        _.forEach(signedOrders, signedOrder => {
-            const orderWithoutExchangeAddress = orderUtils.getOrderWithoutExchangeAddress(signedOrder);
-            batchFill.orders.push(orderWithoutExchangeAddress);
-            batchFill.signatures.push(signedOrder.signature);
-            if (takerAssetFillAmounts.length < signedOrders.length) {
-                batchFill.takerAssetFillAmounts.push(signedOrder.takerAssetAmount);
-            }
-        });
-        return batchFill;
-    },
-    createMarketSellOrders(signedOrders: SignedOrder[], takerAssetFillAmount: BigNumber): MarketSellOrders {
-        const marketSellOrders: MarketSellOrders = {
-            orders: [],
-            signatures: [],
-            takerAssetFillAmount,
-        };
-        _.forEach(signedOrders, (signedOrder, i) => {
-            const orderWithoutExchangeAddress = orderUtils.getOrderWithoutExchangeAddress(signedOrder);
-            if (i !== 0) {
-                orderWithoutExchangeAddress.takerAssetData = constants.NULL_BYTES;
-            }
-            marketSellOrders.orders.push(orderWithoutExchangeAddress);
-            marketSellOrders.signatures.push(signedOrder.signature);
-        });
-        return marketSellOrders;
-    },
-    createMarketBuyOrders(signedOrders: SignedOrder[], makerAssetFillAmount: BigNumber): MarketBuyOrders {
-        const marketBuyOrders: MarketBuyOrders = {
-            orders: [],
-            signatures: [],
-            makerAssetFillAmount,
-        };
-        _.forEach(signedOrders, (signedOrder, i) => {
-            const orderWithoutExchangeAddress = orderUtils.getOrderWithoutExchangeAddress(signedOrder);
-            if (i !== 0) {
-                orderWithoutExchangeAddress.makerAssetData = constants.NULL_BYTES;
-            }
-            marketBuyOrders.orders.push(orderWithoutExchangeAddress);
-            marketBuyOrders.signatures.push(signedOrder.signature);
-        });
-        return marketBuyOrders;
-    },
-    createBatchCancel(signedOrders: SignedOrder[]): BatchCancelOrders {
-        const batchCancel: BatchCancelOrders = {
-            orders: [],
-        };
-        _.forEach(signedOrders, signedOrder => {
-            const orderWithoutExchangeAddress = orderUtils.getOrderWithoutExchangeAddress(signedOrder);
-            batchCancel.orders.push(orderWithoutExchangeAddress);
-        });
-        return batchCancel;
-    },
-};
diff --git a/contracts/core/test/utils/forwarder_wrapper.ts b/contracts/core/test/utils/forwarder_wrapper.ts
index a0bfcfe1d..9c5560381 100644
--- a/contracts/core/test/utils/forwarder_wrapper.ts
+++ b/contracts/core/test/utils/forwarder_wrapper.ts
@@ -1,3 +1,4 @@
+import { constants, formatters, LogDecoder, MarketSellOrders } from '@0x/contracts-test-utils';
 import { SignedOrder } from '@0x/types';
 import { BigNumber } from '@0x/utils';
 import { Web3Wrapper } from '@0x/web3-wrapper';
@@ -5,11 +6,7 @@ import { Provider, TransactionReceiptWithDecodedLogs, TxDataPayable } from 'ethe
 import * as _ from 'lodash';
 
 import { ForwarderContract } from '../../generated-wrappers/forwarder';
-
-import { constants } from './constants';
-import { formatters } from './formatters';
-import { LogDecoder } from './log_decoder';
-import { MarketSellOrders } from './types';
+import { artifacts } from '../../src/artifacts';
 
 export class ForwarderWrapper {
     private readonly _web3Wrapper: Web3Wrapper;
@@ -61,7 +58,7 @@ export class ForwarderWrapper {
     constructor(contractInstance: ForwarderContract, provider: Provider) {
         this._forwarderContract = contractInstance;
         this._web3Wrapper = new Web3Wrapper(provider);
-        this._logDecoder = new LogDecoder(this._web3Wrapper);
+        this._logDecoder = new LogDecoder(this._web3Wrapper, artifacts);
     }
     public async marketSellOrdersWithEthAsync(
         orders: SignedOrder[],
diff --git a/contracts/core/test/utils/log_decoder.ts b/contracts/core/test/utils/log_decoder.ts
deleted file mode 100644
index 05b0a9204..000000000
--- a/contracts/core/test/utils/log_decoder.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { AbiDecoder, BigNumber } from '@0x/utils';
-import { Web3Wrapper } from '@0x/web3-wrapper';
-import {
-    AbiDefinition,
-    ContractArtifact,
-    DecodedLogArgs,
-    LogEntry,
-    LogWithDecodedArgs,
-    RawLog,
-    TransactionReceiptWithDecodedLogs,
-} from 'ethereum-types';
-import * as _ from 'lodash';
-
-import { artifacts } from '../../src/artifacts';
-
-import { constants } from './constants';
-
-export class LogDecoder {
-    private readonly _web3Wrapper: Web3Wrapper;
-    private readonly _abiDecoder: AbiDecoder;
-    public static wrapLogBigNumbers(log: any): any {
-        const argNames = _.keys(log.args);
-        for (const argName of argNames) {
-            const isWeb3BigNumber = _.startsWith(log.args[argName].constructor.toString(), 'function BigNumber(');
-            if (isWeb3BigNumber) {
-                log.args[argName] = new BigNumber(log.args[argName]);
-            }
-        }
-    }
-    constructor(web3Wrapper: Web3Wrapper) {
-        this._web3Wrapper = web3Wrapper;
-        const abiArrays: AbiDefinition[][] = [];
-        _.forEach(artifacts, (artifact: ContractArtifact) => {
-            const compilerOutput = artifact.compilerOutput;
-            abiArrays.push(compilerOutput.abi);
-        });
-        this._abiDecoder = new AbiDecoder(abiArrays);
-    }
-    public decodeLogOrThrow<ArgsType extends DecodedLogArgs>(log: LogEntry): LogWithDecodedArgs<ArgsType> | RawLog {
-        const logWithDecodedArgsOrLog = this._abiDecoder.tryToDecodeLogOrNoop(log);
-        // tslint:disable-next-line:no-unnecessary-type-assertion
-        if (_.isUndefined((logWithDecodedArgsOrLog as LogWithDecodedArgs<ArgsType>).args)) {
-            throw new Error(`Unable to decode log: ${JSON.stringify(log)}`);
-        }
-        LogDecoder.wrapLogBigNumbers(logWithDecodedArgsOrLog);
-        return logWithDecodedArgsOrLog;
-    }
-    public async getTxWithDecodedLogsAsync(txHash: string): Promise<TransactionReceiptWithDecodedLogs> {
-        const tx = await this._web3Wrapper.awaitTransactionSuccessAsync(txHash, constants.AWAIT_TRANSACTION_MINED_MS);
-        tx.logs = _.map(tx.logs, log => this.decodeLogOrThrow(log));
-        return tx;
-    }
-}
diff --git a/contracts/core/test/utils/match_order_tester.ts b/contracts/core/test/utils/match_order_tester.ts
index 6c2c84959..8f574704e 100644
--- a/contracts/core/test/utils/match_order_tester.ts
+++ b/contracts/core/test/utils/match_order_tester.ts
@@ -1,3 +1,12 @@
+import {
+    chaiSetup,
+    ERC20BalancesByOwner,
+    ERC721TokenIdsByOwner,
+    OrderInfo,
+    OrderStatus,
+    TransferAmountsByMatchOrders as TransferAmounts,
+    TransferAmountsLoggedByMatchOrders as LoggedTransferAmounts,
+} from '@0x/contracts-test-utils';
 import { assetDataUtils, orderHashUtils } from '@0x/order-utils';
 import { AssetProxyId, SignedOrder } from '@0x/types';
 import { BigNumber } from '@0x/utils';
@@ -6,18 +15,9 @@ import * as _ from 'lodash';
 
 import { TransactionReceiptWithDecodedLogs } from '../../../../node_modules/ethereum-types';
 
-import { chaiSetup } from './chai_setup';
 import { ERC20Wrapper } from './erc20_wrapper';
 import { ERC721Wrapper } from './erc721_wrapper';
 import { ExchangeWrapper } from './exchange_wrapper';
-import {
-    ERC20BalancesByOwner,
-    ERC721TokenIdsByOwner,
-    OrderInfo,
-    OrderStatus,
-    TransferAmountsByMatchOrders as TransferAmounts,
-    TransferAmountsLoggedByMatchOrders as LoggedTransferAmounts,
-} from './types';
 
 chaiSetup.configure();
 const expect = chai.expect;
@@ -270,18 +270,14 @@ export class MatchOrderTester {
         const leftExpectedStatus = expectedTransferAmounts.amountBoughtByLeftMaker.equals(maxAmountBoughtByLeftMaker)
             ? OrderStatus.FULLY_FILLED
             : OrderStatus.FILLABLE;
-        expect(leftOrderInfo.orderStatus as OrderStatus, 'Checking exchange status for left order').to.be.equal(
-            leftExpectedStatus,
-        );
+        expect(leftOrderInfo.orderStatus, 'Checking exchange status for left order').to.be.equal(leftExpectedStatus);
         // Assert right order status
         const maxAmountBoughtByRightMaker = signedOrderRight.takerAssetAmount.minus(initialRightOrderFilledAmount);
         const rightOrderInfo: OrderInfo = await this._exchangeWrapper.getOrderInfoAsync(signedOrderRight);
         const rightExpectedStatus = expectedTransferAmounts.amountBoughtByRightMaker.equals(maxAmountBoughtByRightMaker)
             ? OrderStatus.FULLY_FILLED
             : OrderStatus.FILLABLE;
-        expect(rightOrderInfo.orderStatus as OrderStatus, 'Checking exchange status for right order').to.be.equal(
-            rightExpectedStatus,
-        );
+        expect(rightOrderInfo.orderStatus, 'Checking exchange status for right order').to.be.equal(rightExpectedStatus);
     }
     /// @dev Asserts account balances after matching orders.
     /// @param signedOrderLeft First matched order.
diff --git a/contracts/core/test/utils/order_factory.ts b/contracts/core/test/utils/order_factory.ts
deleted file mode 100644
index 2449d1a8a..000000000
--- a/contracts/core/test/utils/order_factory.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { generatePseudoRandomSalt, orderHashUtils } from '@0x/order-utils';
-import { Order, SignatureType, SignedOrder } from '@0x/types';
-import { BigNumber } from '@0x/utils';
-
-import { getLatestBlockTimestampAsync } from './block_timestamp';
-import { constants } from './constants';
-import { signingUtils } from './signing_utils';
-
-export class OrderFactory {
-    private readonly _defaultOrderParams: Partial<Order>;
-    private readonly _privateKey: Buffer;
-    constructor(privateKey: Buffer, defaultOrderParams: Partial<Order>) {
-        this._defaultOrderParams = defaultOrderParams;
-        this._privateKey = privateKey;
-    }
-    public async newSignedOrderAsync(
-        customOrderParams: Partial<Order> = {},
-        signatureType: SignatureType = SignatureType.EthSign,
-    ): Promise<SignedOrder> {
-        const tenMinutesInSeconds = 10 * 60;
-        const currentBlockTimestamp = await getLatestBlockTimestampAsync();
-        const order = ({
-            senderAddress: constants.NULL_ADDRESS,
-            expirationTimeSeconds: new BigNumber(currentBlockTimestamp).add(tenMinutesInSeconds),
-            salt: generatePseudoRandomSalt(),
-            takerAddress: constants.NULL_ADDRESS,
-            ...this._defaultOrderParams,
-            ...customOrderParams,
-        } as any) as Order;
-        const orderHashBuff = orderHashUtils.getOrderHashBuffer(order);
-        const signature = signingUtils.signMessage(orderHashBuff, this._privateKey, signatureType);
-        const signedOrder = {
-            ...order,
-            signature: `0x${signature.toString('hex')}`,
-        };
-        return signedOrder;
-    }
-}
diff --git a/contracts/core/test/utils/order_factory_from_scenario.ts b/contracts/core/test/utils/order_factory_from_scenario.ts
index 60c8606c4..1cc962020 100644
--- a/contracts/core/test/utils/order_factory_from_scenario.ts
+++ b/contracts/core/test/utils/order_factory_from_scenario.ts
@@ -1,19 +1,18 @@
-import { assetDataUtils, generatePseudoRandomSalt } from '@0x/order-utils';
-import { Order } from '@0x/types';
-import { BigNumber, errorUtils } from '@0x/utils';
-
-import { DummyERC721TokenContract } from '../../generated-wrappers/dummy_erc721_token';
-
-import { constants } from './constants';
 import {
     AssetDataScenario,
+    constants,
     ERC721TokenIdsByOwner,
     ExpirationTimeSecondsScenario,
     FeeRecipientAddressScenario,
     OrderAssetAmountScenario,
     OrderScenario,
     TakerScenario,
-} from './types';
+} from '@0x/contracts-test-utils';
+import { assetDataUtils, generatePseudoRandomSalt } from '@0x/order-utils';
+import { Order } from '@0x/types';
+import { BigNumber, errorUtils } from '@0x/utils';
+
+import { DummyERC721TokenContract } from '../../generated-wrappers/dummy_erc721_token';
 
 const TEN_UNITS_EIGHTEEN_DECIMALS = new BigNumber(10_000_000_000_000_000_000);
 const FIVE_UNITS_EIGHTEEN_DECIMALS = new BigNumber(5_000_000_000_000_000_000);
diff --git a/contracts/core/test/utils/order_utils.ts b/contracts/core/test/utils/order_utils.ts
deleted file mode 100644
index 4f7a34011..000000000
--- a/contracts/core/test/utils/order_utils.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { OrderWithoutExchangeAddress, SignedOrder } from '@0x/types';
-import { BigNumber } from '@0x/utils';
-
-import { constants } from './constants';
-import { CancelOrder, MatchOrder } from './types';
-
-export const orderUtils = {
-    getPartialAmountFloor(numerator: BigNumber, denominator: BigNumber, target: BigNumber): BigNumber {
-        const partialAmount = numerator
-            .mul(target)
-            .div(denominator)
-            .floor();
-        return partialAmount;
-    },
-    createFill: (signedOrder: SignedOrder, takerAssetFillAmount?: BigNumber) => {
-        const fill = {
-            order: orderUtils.getOrderWithoutExchangeAddress(signedOrder),
-            takerAssetFillAmount: takerAssetFillAmount || signedOrder.takerAssetAmount,
-            signature: signedOrder.signature,
-        };
-        return fill;
-    },
-    createCancel(signedOrder: SignedOrder, takerAssetCancelAmount?: BigNumber): CancelOrder {
-        const cancel = {
-            order: orderUtils.getOrderWithoutExchangeAddress(signedOrder),
-            takerAssetCancelAmount: takerAssetCancelAmount || signedOrder.takerAssetAmount,
-        };
-        return cancel;
-    },
-    getOrderWithoutExchangeAddress(signedOrder: SignedOrder): OrderWithoutExchangeAddress {
-        const orderStruct = {
-            senderAddress: signedOrder.senderAddress,
-            makerAddress: signedOrder.makerAddress,
-            takerAddress: signedOrder.takerAddress,
-            feeRecipientAddress: signedOrder.feeRecipientAddress,
-            makerAssetAmount: signedOrder.makerAssetAmount,
-            takerAssetAmount: signedOrder.takerAssetAmount,
-            makerFee: signedOrder.makerFee,
-            takerFee: signedOrder.takerFee,
-            expirationTimeSeconds: signedOrder.expirationTimeSeconds,
-            salt: signedOrder.salt,
-            makerAssetData: signedOrder.makerAssetData,
-            takerAssetData: signedOrder.takerAssetData,
-        };
-        return orderStruct;
-    },
-    createMatchOrders(signedOrderLeft: SignedOrder, signedOrderRight: SignedOrder): MatchOrder {
-        const fill = {
-            left: orderUtils.getOrderWithoutExchangeAddress(signedOrderLeft),
-            right: orderUtils.getOrderWithoutExchangeAddress(signedOrderRight),
-            leftSignature: signedOrderLeft.signature,
-            rightSignature: signedOrderRight.signature,
-        };
-        fill.right.makerAssetData = constants.NULL_BYTES;
-        fill.right.takerAssetData = constants.NULL_BYTES;
-        return fill;
-    },
-};
diff --git a/contracts/core/test/utils/profiler.ts b/contracts/core/test/utils/profiler.ts
deleted file mode 100644
index 2c7c1d66c..000000000
--- a/contracts/core/test/utils/profiler.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { devConstants } from '@0x/dev-utils';
-import { ProfilerSubprovider, SolCompilerArtifactAdapter } from '@0x/sol-cov';
-import * as _ from 'lodash';
-
-let profilerSubprovider: ProfilerSubprovider;
-
-export const profiler = {
-    start(): void {
-        profiler.getProfilerSubproviderSingleton().start();
-    },
-    stop(): void {
-        profiler.getProfilerSubproviderSingleton().stop();
-    },
-    getProfilerSubproviderSingleton(): ProfilerSubprovider {
-        if (_.isUndefined(profilerSubprovider)) {
-            profilerSubprovider = profiler._getProfilerSubprovider();
-        }
-        return profilerSubprovider;
-    },
-    _getProfilerSubprovider(): ProfilerSubprovider {
-        const defaultFromAddress = devConstants.TESTRPC_FIRST_ADDRESS;
-        const solCompilerArtifactAdapter = new SolCompilerArtifactAdapter();
-        const isVerbose = true;
-        const subprovider = new ProfilerSubprovider(solCompilerArtifactAdapter, defaultFromAddress, isVerbose);
-        return subprovider;
-    },
-};
diff --git a/contracts/core/test/utils/revert_trace.ts b/contracts/core/test/utils/revert_trace.ts
deleted file mode 100644
index 3f74fd28b..000000000
--- a/contracts/core/test/utils/revert_trace.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { devConstants } from '@0x/dev-utils';
-import { RevertTraceSubprovider, SolCompilerArtifactAdapter } from '@0x/sol-cov';
-import * as _ from 'lodash';
-
-let revertTraceSubprovider: RevertTraceSubprovider;
-
-export const revertTrace = {
-    getRevertTraceSubproviderSingleton(): RevertTraceSubprovider {
-        if (_.isUndefined(revertTraceSubprovider)) {
-            revertTraceSubprovider = revertTrace._getRevertTraceSubprovider();
-        }
-        return revertTraceSubprovider;
-    },
-    _getRevertTraceSubprovider(): RevertTraceSubprovider {
-        const defaultFromAddress = devConstants.TESTRPC_FIRST_ADDRESS;
-        const solCompilerArtifactAdapter = new SolCompilerArtifactAdapter();
-        const isVerbose = true;
-        const subprovider = new RevertTraceSubprovider(solCompilerArtifactAdapter, defaultFromAddress, isVerbose);
-        return subprovider;
-    },
-};
diff --git a/contracts/core/test/utils/signing_utils.ts b/contracts/core/test/utils/signing_utils.ts
deleted file mode 100644
index 21f864bfa..000000000
--- a/contracts/core/test/utils/signing_utils.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { SignatureType } from '@0x/types';
-import * as ethUtil from 'ethereumjs-util';
-
-export const signingUtils = {
-    signMessage(message: Buffer, privateKey: Buffer, signatureType: SignatureType): Buffer {
-        if (signatureType === SignatureType.EthSign) {
-            const prefixedMessage = ethUtil.hashPersonalMessage(message);
-            const ecSignature = ethUtil.ecsign(prefixedMessage, privateKey);
-            const signature = Buffer.concat([
-                ethUtil.toBuffer(ecSignature.v),
-                ecSignature.r,
-                ecSignature.s,
-                ethUtil.toBuffer(signatureType),
-            ]);
-            return signature;
-        } else if (signatureType === SignatureType.EIP712) {
-            const ecSignature = ethUtil.ecsign(message, privateKey);
-            const signature = Buffer.concat([
-                ethUtil.toBuffer(ecSignature.v),
-                ecSignature.r,
-                ecSignature.s,
-                ethUtil.toBuffer(signatureType),
-            ]);
-            return signature;
-        } else {
-            throw new Error(`${signatureType} is not a valid signature type`);
-        }
-    },
-};
diff --git a/contracts/core/test/utils/test_with_reference.ts b/contracts/core/test/utils/test_with_reference.ts
deleted file mode 100644
index b80be4a6c..000000000
--- a/contracts/core/test/utils/test_with_reference.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-import * as chai from 'chai';
-import * as _ from 'lodash';
-
-import { chaiSetup } from './chai_setup';
-
-chaiSetup.configure();
-const expect = chai.expect;
-
-class Value<T> {
-    public value: T;
-    constructor(value: T) {
-        this.value = value;
-    }
-}
-
-// tslint:disable-next-line: max-classes-per-file
-class ErrorMessage {
-    public error: string;
-    constructor(message: string) {
-        this.error = message;
-    }
-}
-
-type PromiseResult<T> = Value<T> | ErrorMessage;
-
-// TODO(albrow): This seems like a generic utility function that could exist in
-// lodash. We should replace it by a library implementation, or move it to our
-// own.
-async function evaluatePromise<T>(promise: Promise<T>): Promise<PromiseResult<T>> {
-    try {
-        return new Value<T>(await promise);
-    } catch (e) {
-        return new ErrorMessage(e.message);
-    }
-}
-
-export async function testWithReferenceFuncAsync<P0, R>(
-    referenceFunc: (p0: P0) => Promise<R>,
-    testFunc: (p0: P0) => Promise<R>,
-    values: [P0],
-): Promise<void>;
-export async function testWithReferenceFuncAsync<P0, P1, R>(
-    referenceFunc: (p0: P0, p1: P1) => Promise<R>,
-    testFunc: (p0: P0, p1: P1) => Promise<R>,
-    values: [P0, P1],
-): Promise<void>;
-export async function testWithReferenceFuncAsync<P0, P1, P2, R>(
-    referenceFunc: (p0: P0, p1: P1, p2: P2) => Promise<R>,
-    testFunc: (p0: P0, p1: P1, p2: P2) => Promise<R>,
-    values: [P0, P1, P2],
-): Promise<void>;
-export async function testWithReferenceFuncAsync<P0, P1, P2, P3, R>(
-    referenceFunc: (p0: P0, p1: P1, p2: P2, p3: P3) => Promise<R>,
-    testFunc: (p0: P0, p1: P1, p2: P2, p3: P3) => Promise<R>,
-    values: [P0, P1, P2, P3],
-): Promise<void>;
-export async function testWithReferenceFuncAsync<P0, P1, P2, P3, P4, R>(
-    referenceFunc: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4) => Promise<R>,
-    testFunc: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4) => Promise<R>,
-    values: [P0, P1, P2, P3, P4],
-): Promise<void>;
-
-/**
- * Tests the behavior of a test function by comparing it to the expected
- * behavior (defined by a reference function).
- *
- * First the reference function will be called to obtain an "expected result",
- * or if the reference function throws/rejects, an "expected error". Next, the
- * test function will be called to obtain an "actual result", or if the test
- * function throws/rejects, an "actual error". The test passes if at least one
- * of the following conditions is met:
- *
- * 1) Neither the reference function or the test function throw and the
- * "expected result" equals the "actual result".
- *
- * 2) Both the reference function and the test function throw and the "actual
- * error" message *contains* the "expected error" message.
- *
- * @param referenceFuncAsync a reference function implemented in pure
- * JavaScript/TypeScript which accepts N arguments and returns the "expected
- * result" or throws/rejects with the "expected error".
- * @param testFuncAsync a test function which, e.g., makes a call or sends a
- * transaction to a contract. It accepts the same N arguments returns the
- * "actual result" or throws/rejects with the "actual error".
- * @param values an array of N values, where each value corresponds in-order to
- * an argument to both the test function and the reference function.
- * @return A Promise that resolves if the test passes and rejects if the test
- * fails, according to the rules described above.
- */
-export async function testWithReferenceFuncAsync(
-    referenceFuncAsync: (...args: any[]) => Promise<any>,
-    testFuncAsync: (...args: any[]) => Promise<any>,
-    values: any[],
-): Promise<void> {
-    // Measure correct behaviour
-    const expected = await evaluatePromise(referenceFuncAsync(...values));
-
-    // Measure actual behaviour
-    const actual = await evaluatePromise(testFuncAsync(...values));
-
-    // Compare behaviour
-    if (expected instanceof ErrorMessage) {
-        // If we expected an error, check if the actual error message contains the
-        // expected error message.
-        if (!(actual instanceof ErrorMessage)) {
-            throw new Error(
-                `Expected error containing ${expected.error} but got no error\n\tTest case: ${_getTestCaseString(
-                    referenceFuncAsync,
-                    values,
-                )}`,
-            );
-        }
-        expect(actual.error).to.contain(
-            expected.error,
-            `${actual.error}\n\tTest case: ${_getTestCaseString(referenceFuncAsync, values)}`,
-        );
-    } else {
-        // If we do not expect an error, compare actual and expected directly.
-        expect(actual).to.deep.equal(expected, `Test case ${_getTestCaseString(referenceFuncAsync, values)}`);
-    }
-}
-
-function _getTestCaseString(referenceFuncAsync: (...args: any[]) => Promise<any>, values: any[]): string {
-    const paramNames = _getParameterNames(referenceFuncAsync);
-    return JSON.stringify(_.zipObject(paramNames, values));
-}
-
-// Source: https://stackoverflow.com/questions/1007981/how-to-get-function-parameter-names-values-dynamically
-function _getParameterNames(func: (...args: any[]) => any): string[] {
-    return _.toString(func)
-        .replace(/[/][/].*$/gm, '') // strip single-line comments
-        .replace(/\s+/g, '') // strip white space
-        .replace(/[/][*][^/*]*[*][/]/g, '') // strip multi-line comments
-        .split('){', 1)[0]
-        .replace(/^[^(]*[(]/, '') // extract the parameters
-        .replace(/=[^,]+/g, '') // strip any ES6 defaults
-        .split(',')
-        .filter(Boolean); // split & filter [""]
-}
diff --git a/contracts/core/test/utils/transaction_factory.ts b/contracts/core/test/utils/transaction_factory.ts
deleted file mode 100644
index dbab3ade4..000000000
--- a/contracts/core/test/utils/transaction_factory.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { eip712Utils, generatePseudoRandomSalt } from '@0x/order-utils';
-import { SignatureType } from '@0x/types';
-import { signTypedDataUtils } from '@0x/utils';
-import * as ethUtil from 'ethereumjs-util';
-
-import { signingUtils } from './signing_utils';
-import { SignedTransaction } from './types';
-
-export class TransactionFactory {
-    private readonly _signerBuff: Buffer;
-    private readonly _exchangeAddress: string;
-    private readonly _privateKey: Buffer;
-    constructor(privateKey: Buffer, exchangeAddress: string) {
-        this._privateKey = privateKey;
-        this._exchangeAddress = exchangeAddress;
-        this._signerBuff = ethUtil.privateToAddress(this._privateKey);
-    }
-    public newSignedTransaction(data: string, signatureType: SignatureType = SignatureType.EthSign): SignedTransaction {
-        const salt = generatePseudoRandomSalt();
-        const signerAddress = `0x${this._signerBuff.toString('hex')}`;
-        const executeTransactionData = {
-            salt,
-            signerAddress,
-            data,
-        };
-
-        const typedData = eip712Utils.createZeroExTransactionTypedData(executeTransactionData, this._exchangeAddress);
-        const eip712MessageBuffer = signTypedDataUtils.generateTypedDataHash(typedData);
-        const signature = signingUtils.signMessage(eip712MessageBuffer, this._privateKey, signatureType);
-        const signedTx = {
-            exchangeAddress: this._exchangeAddress,
-            signature: `0x${signature.toString('hex')}`,
-            ...executeTransactionData,
-        };
-        return signedTx;
-    }
-}
diff --git a/contracts/core/test/utils/type_encoding_utils.ts b/contracts/core/test/utils/type_encoding_utils.ts
deleted file mode 100644
index bfd9c9ef5..000000000
--- a/contracts/core/test/utils/type_encoding_utils.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { BigNumber } from '@0x/utils';
-import BN = require('bn.js');
-import ethUtil = require('ethereumjs-util');
-
-import { constants } from './constants';
-
-export const typeEncodingUtils = {
-    encodeUint256(value: BigNumber): Buffer {
-        const base = 10;
-        const formattedValue = new BN(value.toString(base));
-        const encodedValue = ethUtil.toBuffer(formattedValue);
-        // tslint:disable-next-line:custom-no-magic-numbers
-        const paddedValue = ethUtil.setLengthLeft(encodedValue, constants.WORD_LENGTH);
-        return paddedValue;
-    },
-    decodeUint256(encodedValue: Buffer): BigNumber {
-        const formattedValue = ethUtil.bufferToHex(encodedValue);
-        const value = new BigNumber(formattedValue, constants.BASE_16);
-        return value;
-    },
-};
diff --git a/contracts/core/test/utils/types.ts b/contracts/core/test/utils/types.ts
deleted file mode 100644
index d738fcd4e..000000000
--- a/contracts/core/test/utils/types.ts
+++ /dev/null
@@ -1,242 +0,0 @@
-import { OrderWithoutExchangeAddress } from '@0x/types';
-import { BigNumber } from '@0x/utils';
-import { AbiDefinition } from 'ethereum-types';
-
-export interface ERC20BalancesByOwner {
-    [ownerAddress: string]: {
-        [tokenAddress: string]: BigNumber;
-    };
-}
-
-export interface ERC721TokenIdsByOwner {
-    [ownerAddress: string]: {
-        [tokenAddress: string]: BigNumber[];
-    };
-}
-
-export interface SubmissionContractEventArgs {
-    transactionId: BigNumber;
-}
-
-export interface BatchFillOrders {
-    orders: OrderWithoutExchangeAddress[];
-    signatures: string[];
-    takerAssetFillAmounts: BigNumber[];
-}
-
-export interface MarketSellOrders {
-    orders: OrderWithoutExchangeAddress[];
-    signatures: string[];
-    takerAssetFillAmount: BigNumber;
-}
-
-export interface MarketBuyOrders {
-    orders: OrderWithoutExchangeAddress[];
-    signatures: string[];
-    makerAssetFillAmount: BigNumber;
-}
-
-export interface BatchCancelOrders {
-    orders: OrderWithoutExchangeAddress[];
-}
-
-export interface CancelOrdersBefore {
-    salt: BigNumber;
-}
-
-export interface TransactionDataParams {
-    name: string;
-    abi: AbiDefinition[];
-    args: any[];
-}
-
-export interface MultiSigConfig {
-    owners: string[];
-    confirmationsRequired: number;
-    secondsRequired: number;
-}
-
-export interface MultiSigConfigByNetwork {
-    [networkName: string]: MultiSigConfig;
-}
-
-export interface Token {
-    address?: string;
-    name: string;
-    symbol: string;
-    decimals: number;
-    ipfsHash: string;
-    swarmHash: string;
-}
-
-export enum OrderStatus {
-    INVALID,
-    INVALID_MAKER_ASSET_AMOUNT,
-    INVALID_TAKER_ASSET_AMOUNT,
-    FILLABLE,
-    EXPIRED,
-    FULLY_FILLED,
-    CANCELLED,
-}
-
-export enum ContractName {
-    TokenRegistry = 'TokenRegistry',
-    MultiSigWalletWithTimeLock = 'MultiSigWalletWithTimeLock',
-    Exchange = 'Exchange',
-    ZRXToken = 'ZRXToken',
-    DummyERC20Token = 'DummyERC20Token',
-    EtherToken = 'WETH9',
-    DutchAuction = 'DutchAuction',
-    AssetProxyOwner = 'AssetProxyOwner',
-    AccountLevels = 'AccountLevels',
-    EtherDelta = 'EtherDelta',
-    Arbitrage = 'Arbitrage',
-    TestAssetDataDecoders = 'TestAssetDataDecoders',
-    TestAssetProxyDispatcher = 'TestAssetProxyDispatcher',
-    TestLibs = 'TestLibs',
-    TestSignatureValidator = 'TestSignatureValidator',
-    ERC20Proxy = 'ERC20Proxy',
-    ERC721Proxy = 'ERC721Proxy',
-    DummyERC721Receiver = 'DummyERC721Receiver',
-    DummyERC721Token = 'DummyERC721Token',
-    TestLibBytes = 'TestLibBytes',
-    TestWallet = 'TestWallet',
-    Authorizable = 'Authorizable',
-    Whitelist = 'Whitelist',
-    Forwarder = 'Forwarder',
-}
-
-export interface SignedTransaction {
-    exchangeAddress: string;
-    salt: BigNumber;
-    signerAddress: string;
-    data: string;
-    signature: string;
-}
-
-export interface TransferAmountsByMatchOrders {
-    // Left Maker
-    amountBoughtByLeftMaker: BigNumber;
-    amountSoldByLeftMaker: BigNumber;
-    feePaidByLeftMaker: BigNumber;
-    // Right Maker
-    amountBoughtByRightMaker: BigNumber;
-    amountSoldByRightMaker: BigNumber;
-    feePaidByRightMaker: BigNumber;
-    // Taker
-    amountReceivedByTaker: BigNumber;
-    feePaidByTakerLeft: BigNumber;
-    feePaidByTakerRight: BigNumber;
-}
-
-export interface TransferAmountsLoggedByMatchOrders {
-    makerAddress: string;
-    takerAddress: string;
-    makerAssetFilledAmount: string;
-    takerAssetFilledAmount: string;
-    makerFeePaid: string;
-    takerFeePaid: string;
-}
-
-export interface OrderInfo {
-    orderStatus: number;
-    orderHash: string;
-    orderTakerAssetFilledAmount: BigNumber;
-}
-
-export interface CancelOrder {
-    order: OrderWithoutExchangeAddress;
-    takerAssetCancelAmount: BigNumber;
-}
-
-export interface MatchOrder {
-    left: OrderWithoutExchangeAddress;
-    right: OrderWithoutExchangeAddress;
-    leftSignature: string;
-    rightSignature: string;
-}
-
-// Combinatorial testing types
-
-export enum FeeRecipientAddressScenario {
-    BurnAddress = 'BURN_ADDRESS',
-    EthUserAddress = 'ETH_USER_ADDRESS',
-}
-
-export enum OrderAssetAmountScenario {
-    Zero = 'ZERO',
-    Large = 'LARGE',
-    Small = 'SMALL',
-}
-
-export enum TakerScenario {
-    CorrectlySpecified = 'CORRECTLY_SPECIFIED',
-    IncorrectlySpecified = 'INCORRECTLY_SPECIFIED',
-    Unspecified = 'UNSPECIFIED',
-}
-
-export enum ExpirationTimeSecondsScenario {
-    InPast = 'IN_PAST',
-    InFuture = 'IN_FUTURE',
-}
-
-export enum AssetDataScenario {
-    ERC20ZeroDecimals = 'ERC20_ZERO_DECIMALS',
-    ZRXFeeToken = 'ZRX_FEE_TOKEN',
-    ERC20FiveDecimals = 'ERC20_FIVE_DECIMALS',
-    ERC20NonZRXEighteenDecimals = 'ERC20_NON_ZRX_EIGHTEEN_DECIMALS',
-    ERC721 = 'ERC721',
-}
-
-export enum TakerAssetFillAmountScenario {
-    Zero = 'ZERO',
-    GreaterThanRemainingFillableTakerAssetAmount = 'GREATER_THAN_REMAINING_FILLABLE_TAKER_ASSET_AMOUNT',
-    LessThanRemainingFillableTakerAssetAmount = 'LESS_THAN_REMAINING_FILLABLE_TAKER_ASSET_AMOUNT',
-    ExactlyRemainingFillableTakerAssetAmount = 'EXACTLY_REMAINING_FILLABLE_TAKER_ASSET_AMOUNT',
-}
-
-export interface OrderScenario {
-    takerScenario: TakerScenario;
-    feeRecipientScenario: FeeRecipientAddressScenario;
-    makerAssetAmountScenario: OrderAssetAmountScenario;
-    takerAssetAmountScenario: OrderAssetAmountScenario;
-    makerFeeScenario: OrderAssetAmountScenario;
-    takerFeeScenario: OrderAssetAmountScenario;
-    expirationTimeSecondsScenario: ExpirationTimeSecondsScenario;
-    makerAssetDataScenario: AssetDataScenario;
-    takerAssetDataScenario: AssetDataScenario;
-}
-
-export enum BalanceAmountScenario {
-    Exact = 'EXACT',
-    TooLow = 'TOO_LOW',
-    Higher = 'HIGHER',
-}
-
-export enum AllowanceAmountScenario {
-    Exact = 'EXACT',
-    TooLow = 'TOO_LOW',
-    Higher = 'HIGHER',
-    Unlimited = 'UNLIMITED',
-}
-
-export interface TraderStateScenario {
-    traderAssetBalance: BalanceAmountScenario;
-    traderAssetAllowance: AllowanceAmountScenario;
-    zrxFeeBalance: BalanceAmountScenario;
-    zrxFeeAllowance: AllowanceAmountScenario;
-}
-
-export interface FillScenario {
-    orderScenario: OrderScenario;
-    takerAssetFillAmountScenario: TakerAssetFillAmountScenario;
-    makerStateScenario: TraderStateScenario;
-    takerStateScenario: TraderStateScenario;
-}
-
-export interface FillResults {
-    makerAssetFilledAmount: BigNumber;
-    takerAssetFilledAmount: BigNumber;
-    makerFeePaid: BigNumber;
-    takerFeePaid: BigNumber;
-}
diff --git a/contracts/core/test/utils/web3_wrapper.ts b/contracts/core/test/utils/web3_wrapper.ts
deleted file mode 100644
index f7b1a732a..000000000
--- a/contracts/core/test/utils/web3_wrapper.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import { devConstants, env, EnvVars, web3Factory } from '@0x/dev-utils';
-import { prependSubprovider, Web3ProviderEngine } from '@0x/subproviders';
-import { logUtils } from '@0x/utils';
-import { Web3Wrapper } from '@0x/web3-wrapper';
-import * as _ from 'lodash';
-
-import { coverage } from './coverage';
-import { profiler } from './profiler';
-import { revertTrace } from './revert_trace';
-
-enum ProviderType {
-    Ganache = 'ganache',
-    Geth = 'geth',
-}
-
-let testProvider: ProviderType;
-switch (process.env.TEST_PROVIDER) {
-    case undefined:
-        testProvider = ProviderType.Ganache;
-        break;
-    case 'ganache':
-        testProvider = ProviderType.Ganache;
-        break;
-    case 'geth':
-        testProvider = ProviderType.Geth;
-        break;
-    default:
-        throw new Error(`Unknown TEST_PROVIDER: ${process.env.TEST_PROVIDER}`);
-}
-
-const ganacheTxDefaults = {
-    from: devConstants.TESTRPC_FIRST_ADDRESS,
-    gas: devConstants.GAS_LIMIT,
-};
-const gethTxDefaults = {
-    from: devConstants.TESTRPC_FIRST_ADDRESS,
-};
-export const txDefaults = testProvider === ProviderType.Ganache ? ganacheTxDefaults : gethTxDefaults;
-
-const gethConfigs = {
-    shouldUseInProcessGanache: false,
-    rpcUrl: 'http://localhost:8501',
-    shouldUseFakeGasEstimate: false,
-};
-const ganacheConfigs = {
-    shouldUseInProcessGanache: true,
-};
-const providerConfigs = testProvider === ProviderType.Ganache ? ganacheConfigs : gethConfigs;
-
-export const provider: Web3ProviderEngine = web3Factory.getRpcProvider(providerConfigs);
-const isCoverageEnabled = env.parseBoolean(EnvVars.SolidityCoverage);
-const isProfilerEnabled = env.parseBoolean(EnvVars.SolidityProfiler);
-const isRevertTraceEnabled = env.parseBoolean(EnvVars.SolidityRevertTrace);
-const enabledSubproviderCount = _.filter(
-    [isCoverageEnabled, isProfilerEnabled, isRevertTraceEnabled],
-    _.identity.bind(_),
-).length;
-if (enabledSubproviderCount > 1) {
-    throw new Error(`Only one of coverage, profiler, or revert trace subproviders can be enabled at a time`);
-}
-if (isCoverageEnabled) {
-    const coverageSubprovider = coverage.getCoverageSubproviderSingleton();
-    prependSubprovider(provider, coverageSubprovider);
-}
-if (isProfilerEnabled) {
-    if (testProvider === ProviderType.Ganache) {
-        logUtils.warn(
-            "Gas costs in Ganache traces are incorrect and we don't recommend using it for profiling. Please switch to Geth",
-        );
-        process.exit(1);
-    }
-    const profilerSubprovider = profiler.getProfilerSubproviderSingleton();
-    logUtils.log(
-        "By default profilerSubprovider is stopped so that you don't get noise from setup code. Don't forget to start it before the code you want to profile and stop it afterwards",
-    );
-    profilerSubprovider.stop();
-    prependSubprovider(provider, profilerSubprovider);
-}
-if (isRevertTraceEnabled) {
-    const revertTraceSubprovider = revertTrace.getRevertTraceSubproviderSingleton();
-    prependSubprovider(provider, revertTraceSubprovider);
-}
-
-export const web3Wrapper = new Web3Wrapper(provider);
diff --git a/contracts/core/test/utils_test/test_with_reference.ts b/contracts/core/test/utils_test/test_with_reference.ts
deleted file mode 100644
index 8d633cd1f..000000000
--- a/contracts/core/test/utils_test/test_with_reference.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import * as chai from 'chai';
-
-import { chaiSetup } from '../utils/chai_setup';
-import { testWithReferenceFuncAsync } from '../utils/test_with_reference';
-
-chaiSetup.configure();
-const expect = chai.expect;
-
-async function divAsync(x: number, y: number): Promise<number> {
-    if (y === 0) {
-        throw new Error('MathError: divide by zero');
-    }
-    return x / y;
-}
-
-// returns an async function that always returns the given value.
-function alwaysValueFunc(value: number): (x: number, y: number) => Promise<number> {
-    return async (x: number, y: number) => value;
-}
-
-// returns an async function which always throws/rejects with the given error
-// message.
-function alwaysFailFunc(errMessage: string): (x: number, y: number) => Promise<number> {
-    return async (x: number, y: number) => {
-        throw new Error(errMessage);
-    };
-}
-
-describe('testWithReferenceFuncAsync', () => {
-    it('passes when both succeed and actual === expected', async () => {
-        await testWithReferenceFuncAsync(alwaysValueFunc(0.5), divAsync, [1, 2]);
-    });
-
-    it('passes when both fail and actual error contains expected error', async () => {
-        await testWithReferenceFuncAsync(alwaysFailFunc('divide by zero'), divAsync, [1, 0]);
-    });
-
-    it('fails when both succeed and actual !== expected', async () => {
-        expect(testWithReferenceFuncAsync(alwaysValueFunc(3), divAsync, [1, 2])).to.be.rejectedWith(
-            'Test case {"x":1,"y":2}: expected { value: 0.5 } to deeply equal { value: 3 }',
-        );
-    });
-
-    it('fails when both fail and actual error does not contain expected error', async () => {
-        expect(
-            testWithReferenceFuncAsync(alwaysFailFunc('Unexpected math error'), divAsync, [1, 0]),
-        ).to.be.rejectedWith(
-            'MathError: divide by zero\n\tTest case: {"x":1,"y":0}: expected \'MathError: divide by zero\' to include \'Unexpected math error\'',
-        );
-    });
-
-    it('fails when referenceFunc succeeds and testFunc fails', async () => {
-        expect(testWithReferenceFuncAsync(alwaysValueFunc(0), divAsync, [1, 0])).to.be.rejectedWith(
-            'Test case {"x":1,"y":0}: expected { error: \'MathError: divide by zero\' } to deeply equal { value: 0 }',
-        );
-    });
-
-    it('fails when referenceFunc fails and testFunc succeeds', async () => {
-        expect(testWithReferenceFuncAsync(alwaysFailFunc('divide by zero'), divAsync, [1, 2])).to.be.rejectedWith(
-            'Expected error containing divide by zero but got no error\n\tTest case: {"x":1,"y":2}',
-        );
-    });
-});