8 files changed, 18 insertions, 12 deletions
diff --git a/packages/order-utils/test/abi_encoder/calldata.ts b/packages/utils/src/abi_encoder/calldata.ts
index 32278e5c5..32278e5c5 100644
--- a/packages/order-utils/test/abi_encoder/calldata.ts
+++ b/packages/utils/src/abi_encoder/calldata.ts
diff --git a/packages/order-utils/test/abi_encoder/data_type.ts b/packages/utils/src/abi_encoder/data_type.ts
index 4c4537a69..3b4028abd 100644
--- a/packages/order-utils/test/abi_encoder/data_type.ts
+++ b/packages/utils/src/abi_encoder/data_type.ts
@@ -1,7 +1,7 @@
 import { RawCalldata, Calldata, CalldataBlock, PayloadCalldataBlock, DependentCalldataBlock, MemberCalldataBlock } from "./calldata";
 import { MethodAbi, DataItem } from 'ethereum-types';
 import { DecodingRules, EncodingRules } from './calldata';
-import { BigNumber } from '@0x/utils';
+import { BigNumber } from '../configured_bignumber';
 import ethUtil = require('ethereumjs-util');
 var _ = require('lodash');
 
diff --git a/packages/order-utils/test/abi_encoder/evm_data_types.ts b/packages/utils/src/abi_encoder/evm_data_types.ts
index bb7c1d81d..2973596fe 100644
--- a/packages/order-utils/test/abi_encoder/evm_data_types.ts
+++ b/packages/utils/src/abi_encoder/evm_data_types.ts
@@ -8,7 +8,7 @@ import ethUtil = require('ethereumjs-util');
 
 import { Calldata, RawCalldata } from './calldata';
 
-import { BigNumber } from '@0x/utils';
+import { BigNumber } from '../configured_bignumber';
 
 var _ = require('lodash');
 
diff --git a/packages/order-utils/test/abi_encoder/index.ts b/packages/utils/src/abi_encoder/index.ts
index 991edb8c5..991edb8c5 100644
--- a/packages/order-utils/test/abi_encoder/index.ts
+++ b/packages/utils/src/abi_encoder/index.ts
diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
index 0723e5788..c44530bbc 100644
--- a/packages/utils/src/index.ts
+++ b/packages/utils/src/index.ts
@@ -10,3 +10,4 @@ export { NULL_BYTES } from './constants';
 export { errorUtils } from './error_utils';
 export { fetchAsync } from './fetch_async';
 export { signTypedDataUtils } from './sign_typed_data_utils';
+export * from './abi_encoder';
diff --git a/packages/order-utils/test/abi_encoder_test.ts b/packages/utils/test/abi_encoder_test.ts
index f1e562bc6..2a8fba450 100644
--- a/packages/order-utils/test/abi_encoder_test.ts
+++ b/packages/utils/test/abi_encoder_test.ts
@@ -1,21 +1,13 @@
 import * as chai from 'chai';
 import 'mocha';
-import ethUtil = require('ethereumjs-util');
-
-var _ = require('lodash');
 
 // import { assert } from '@0x/order-utils/src/assert';
 
 import { chaiSetup } from './utils/chai_setup';
-
-import { MethodAbi, DataItem } from 'ethereum-types';
-
-import { BigNumber } from '@0x/utils';
-import { assert } from '@0x/order-utils/src/assert';
+import { BigNumber } from '../src/';
 //import * as AbiEncoder from './abi_encoder';
 
-import * as AbiEncoder from './abi_encoder';
-
+import * as AbiEncoder from '../src/abi_encoder';
 import * as AbiSamples from './abi_samples';
 
 chaiSetup.configure();
diff --git a/packages/order-utils/test/abi_samples.ts b/packages/utils/test/abi_samples.ts
index 5e8268f1a..5e8268f1a 100644
--- a/packages/order-utils/test/abi_samples.ts
+++ b/packages/utils/test/abi_samples.ts
diff --git a/packages/utils/test/utils/chai_setup.ts b/packages/utils/test/utils/chai_setup.ts
new file mode 100644
index 000000000..1a8733093
--- /dev/null
+++ b/packages/utils/test/utils/chai_setup.ts
@@ -0,0 +1,13 @@
+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);
+    },
+};