3 files changed, 10 insertions, 3 deletions
diff --git a/packages/order-utils/test/abi/abi_encoder.ts b/packages/order-utils/test/abi/abi_encoder.ts
index 12755209a..ddcfb1fd1 100644
--- a/packages/order-utils/test/abi/abi_encoder.ts
+++ b/packages/order-utils/test/abi/abi_encoder.ts
@@ -1 +1,4 @@
-export * from './calldata_block';
-\ No newline at end of file
+export * from './config';
+export * from './calldata';
+export * from './data_type';
+export * from './evm_data_types';
+\ No newline at end of file
diff --git a/packages/order-utils/test/abi/evm_data_types.ts b/packages/order-utils/test/abi/evm_data_types.ts
index bdbaf5b3c..15fe4c9e3 100644
--- a/packages/order-utils/test/abi/evm_data_types.ts
+++ b/packages/order-utils/test/abi/evm_data_types.ts
@@ -400,9 +400,10 @@ export class Method extends MemberDataType {
         return selector;
     }
 
-    public encode(value: any[] | object, calldata = new Calldata()) {
+    public encode(value: any[] | object, calldata = new Calldata()): string {
         calldata.setSelector(this.methodSelector);
         super.encode(value, calldata);
+        return calldata.toHexString();
     }
 
     public getSignature(): string {
diff --git a/packages/order-utils/test/abi_encoder_test.ts b/packages/order-utils/test/abi_encoder_test.ts
index c8a0642ea..f46a1812c 100644
--- a/packages/order-utils/test/abi_encoder_test.ts
+++ b/packages/order-utils/test/abi_encoder_test.ts
@@ -12,7 +12,10 @@ import { MethodAbi, DataItem } from 'ethereum-types';
 
 import { BigNumber } from '@0x/utils';
 import { assert } from '@0x/order-utils/src/assert';
-import * as AbiEncoder from './abi_encoder';
+//import * as AbiEncoder from './abi_encoder';
+
+import * as AbiEncoder from './abi/abi_encoder';
+
 import * as AbiSamples from './abi_samples';
 
 chaiSetup.configure();