Add config file specifically in prettier command and fix files

36 files changed, 3334 insertions, 3334 deletions

diff --git a/packages/contracts/globals.d.ts b/packages/contracts/globals.d.ts
index 1f451cf5b..2e5827324 100644
--- a/packages/contracts/globals.d.ts
+++ b/packages/contracts/globals.d.ts
@@ -6,31 +6,31 @@ declare module 'dirty-chai';
 // disallow `namespace`, we disable tslint for the following.
 /* tslint:disable */
 declare namespace Chai {
-	interface Assertion {
-		bignumber: Assertion;
-	}
+    interface Assertion {
+        bignumber: Assertion;
+    }
 }
 /* tslint:enable */
 
 declare module '*.json' {
-	const json: any;
-	/* tslint:disable */
-	export default json;
-	/* tslint:enable */
+    const json: any;
+    /* tslint:disable */
+    export default json;
+    /* tslint:enable */
 }
 
 declare module 'solc' {
-	export function compile(sources: any, optimizerEnabled: number, findImports: (importPath: string) => any): any;
-	export function setupMethods(solcBin: any): any;
+    export function compile(sources: any, optimizerEnabled: number, findImports: (importPath: string) => any): any;
+    export function setupMethods(solcBin: any): any;
 }
 
 declare module 'web3-eth-abi' {
-	export function encodeParameters(typesArray: string[], parameters: any[]): string;
+    export function encodeParameters(typesArray: string[], parameters: any[]): string;
 }
 
 declare module 'ethereumjs-abi' {
-	const soliditySHA3: (argTypes: string[], args: any[]) => Buffer;
-	const methodID: (name: string, types: string[]) => Buffer;
+    const soliditySHA3: (argTypes: string[], args: any[]) => Buffer;
+    const methodID: (name: string, types: string[]) => Buffer;
 }
 
 // Truffle injects the following into the global scope
diff --git a/packages/contracts/globalsAugment.d.ts b/packages/contracts/globalsAugment.d.ts
index c81a74844..9b16ce2ad 100644
--- a/packages/contracts/globalsAugment.d.ts
+++ b/packages/contracts/globalsAugment.d.ts
@@ -3,17 +3,17 @@ import { BigNumber } from '@0xproject/utils';
 // HACK: This module overrides the Chai namespace so that we can use BigNumber types inside.
 // Source: https://github.com/Microsoft/TypeScript/issues/7352#issuecomment-191547232
 declare global {
-	// HACK: In order to merge the bignumber declaration added by chai-bignumber to the chai Assertion
-	// interface we must use `namespace` as the Chai definitelyTyped definition does. Since we otherwise
-	// disallow `namespace`, we disable tslint for the following.
-	/* tslint:disable */
-	namespace Chai {
-		interface NumberComparer {
-			(value: number | BigNumber, message?: string): Assertion;
-		}
-		interface NumericComparison {
-			greaterThan: NumberComparer;
-		}
-	}
-	/* tslint:enable */
+    // HACK: In order to merge the bignumber declaration added by chai-bignumber to the chai Assertion
+    // interface we must use `namespace` as the Chai definitelyTyped definition does. Since we otherwise
+    // disallow `namespace`, we disable tslint for the following.
+    /* tslint:disable */
+    namespace Chai {
+        interface NumberComparer {
+            (value: number | BigNumber, message?: string): Assertion;
+        }
+        interface NumericComparison {
+            greaterThan: NumberComparer;
+        }
+    }
+    /* tslint:enable */
 }
diff --git a/packages/contracts/migrations/1_initial_migration.ts b/packages/contracts/migrations/1_initial_migration.ts
index 73999dac5..8661ee218 100644
--- a/packages/contracts/migrations/1_initial_migration.ts
+++ b/packages/contracts/migrations/1_initial_migration.ts
@@ -2,5 +2,5 @@ import { Artifacts } from '../util/artifacts';
 const { Migrations } = new Artifacts(artifacts);
 
 module.exports = (deployer: any) => {
-	deployer.deploy(Migrations);
+    deployer.deploy(Migrations);
 };
diff --git a/packages/contracts/migrations/2_deploy_independent_contracts.ts b/packages/contracts/migrations/2_deploy_independent_contracts.ts
index 07e2f600f..ac1752347 100644
--- a/packages/contracts/migrations/2_deploy_independent_contracts.ts
+++ b/packages/contracts/migrations/2_deploy_independent_contracts.ts
@@ -4,38 +4,38 @@ const { MultiSigWalletWithTimeLock, TokenTransferProxy, EtherToken, TokenRegistr
 
 let multiSigConfigByNetwork: MultiSigConfigByNetwork;
 try {
-	/* tslint:disable */
-	const multiSigConfig = require('./config/multisig');
-	multiSigConfigByNetwork = multiSigConfig.multiSig;
-	/* tslint:enable */
+    /* tslint:disable */
+    const multiSigConfig = require('./config/multisig');
+    multiSigConfigByNetwork = multiSigConfig.multiSig;
+    /* tslint:enable */
 } catch (e) {
-	multiSigConfigByNetwork = {};
+    multiSigConfigByNetwork = {};
 }
 
 module.exports = (deployer: any, network: string, accounts: string[]) => {
-	const defaultConfig = {
-		owners: [accounts[0], accounts[1]],
-		confirmationsRequired: 2,
-		secondsRequired: 0,
-	};
-	const config = multiSigConfigByNetwork[network] || defaultConfig;
-	if (network !== 'live') {
-		deployer
-			.deploy(MultiSigWalletWithTimeLock, config.owners, config.confirmationsRequired, config.secondsRequired)
-			.then(() => {
-				return deployer.deploy(TokenTransferProxy);
-			})
-			.then(() => {
-				return deployer.deploy(TokenRegistry);
-			})
-			.then(() => {
-				return deployer.deploy(EtherToken);
-			});
-	} else {
-		deployer.deploy([
-			[MultiSigWalletWithTimeLock, config.owners, config.confirmationsRequired, config.secondsRequired],
-			TokenTransferProxy,
-			TokenRegistry,
-		]);
-	}
+    const defaultConfig = {
+        owners: [accounts[0], accounts[1]],
+        confirmationsRequired: 2,
+        secondsRequired: 0,
+    };
+    const config = multiSigConfigByNetwork[network] || defaultConfig;
+    if (network !== 'live') {
+        deployer
+            .deploy(MultiSigWalletWithTimeLock, config.owners, config.confirmationsRequired, config.secondsRequired)
+            .then(() => {
+                return deployer.deploy(TokenTransferProxy);
+            })
+            .then(() => {
+                return deployer.deploy(TokenRegistry);
+            })
+            .then(() => {
+                return deployer.deploy(EtherToken);
+            });
+    } else {
+        deployer.deploy([
+            [MultiSigWalletWithTimeLock, config.owners, config.confirmationsRequired, config.secondsRequired],
+            TokenTransferProxy,
+            TokenRegistry,
+        ]);
+    }
 };
diff --git a/packages/contracts/migrations/3_register_tokens.ts b/packages/contracts/migrations/3_register_tokens.ts
index b36cea296..d5cf63f94 100644
--- a/packages/contracts/migrations/3_register_tokens.ts
+++ b/packages/contracts/migrations/3_register_tokens.ts
@@ -9,87 +9,87 @@ import { tokenInfo } from './config/token_info';
 const { DummyToken, EtherToken, ZRXToken, TokenRegistry } = new Artifacts(artifacts);
 
 module.exports = (deployer: any, network: string) => {
-	const tokens = network === 'live' ? tokenInfo.live : tokenInfo.development;
-	deployer
-		.then(() => {
-			return TokenRegistry.deployed();
-		})
-		.then((tokenRegistry: ContractInstance) => {
-			if (network !== 'live') {
-				const totalSupply = Math.pow(10, 18) * 1000000000;
-				return Bluebird.each(
-					tokens.map((token: Token) => DummyToken.new(token.name, token.symbol, token.decimals, totalSupply)),
-					_.noop,
-				).then((dummyTokens: ContractInstance[]) => {
-					const weth = {
-						address: EtherToken.address,
-						name: 'Ether Token',
-						symbol: 'WETH',
-						url: '',
-						decimals: 18,
-						ipfsHash: constants.NULL_BYTES,
-						swarmHash: constants.NULL_BYTES,
-					};
-					return Bluebird.each(
-						dummyTokens
-							.map((tokenContract: ContractInstance, i: number) => {
-								const token = tokens[i];
-								return tokenRegistry.addToken(
-									tokenContract.address,
-									token.name,
-									token.symbol,
-									token.decimals,
-									token.ipfsHash,
-									token.swarmHash,
-								);
-							})
-							.concat(
-								tokenRegistry.addToken(
-									weth.address,
-									weth.name,
-									weth.symbol,
-									weth.decimals,
-									weth.ipfsHash,
-									weth.swarmHash,
-								),
-							),
-						_.noop,
-					);
-				});
-			} else {
-				const zrx = {
-					address: ZRXToken.address,
-					name: '0x Protocol Token',
-					symbol: 'ZRX',
-					url: 'https://www.0xproject.com/',
-					decimals: 18,
-					ipfsHash: constants.NULL_BYTES,
-					swarmHash: constants.NULL_BYTES,
-				};
-				return Bluebird.each(
-					tokens
-						.map((token: Token) => {
-							return tokenRegistry.addToken(
-								token.address,
-								token.name,
-								token.symbol,
-								token.decimals,
-								token.ipfsHash,
-								token.swarmHash,
-							);
-						})
-						.concat(
-							tokenRegistry.addToken(
-								zrx.address,
-								zrx.name,
-								zrx.symbol,
-								zrx.decimals,
-								zrx.ipfsHash,
-								zrx.swarmHash,
-							),
-						),
-					_.noop,
-				);
-			}
-		});
+    const tokens = network === 'live' ? tokenInfo.live : tokenInfo.development;
+    deployer
+        .then(() => {
+            return TokenRegistry.deployed();
+        })
+        .then((tokenRegistry: ContractInstance) => {
+            if (network !== 'live') {
+                const totalSupply = Math.pow(10, 18) * 1000000000;
+                return Bluebird.each(
+                    tokens.map((token: Token) => DummyToken.new(token.name, token.symbol, token.decimals, totalSupply)),
+                    _.noop,
+                ).then((dummyTokens: ContractInstance[]) => {
+                    const weth = {
+                        address: EtherToken.address,
+                        name: 'Ether Token',
+                        symbol: 'WETH',
+                        url: '',
+                        decimals: 18,
+                        ipfsHash: constants.NULL_BYTES,
+                        swarmHash: constants.NULL_BYTES,
+                    };
+                    return Bluebird.each(
+                        dummyTokens
+                            .map((tokenContract: ContractInstance, i: number) => {
+                                const token = tokens[i];
+                                return tokenRegistry.addToken(
+                                    tokenContract.address,
+                                    token.name,
+                                    token.symbol,
+                                    token.decimals,
+                                    token.ipfsHash,
+                                    token.swarmHash,
+                                );
+                            })
+                            .concat(
+                                tokenRegistry.addToken(
+                                    weth.address,
+                                    weth.name,
+                                    weth.symbol,
+                                    weth.decimals,
+                                    weth.ipfsHash,
+                                    weth.swarmHash,
+                                ),
+                            ),
+                        _.noop,
+                    );
+                });
+            } else {
+                const zrx = {
+                    address: ZRXToken.address,
+                    name: '0x Protocol Token',
+                    symbol: 'ZRX',
+                    url: 'https://www.0xproject.com/',
+                    decimals: 18,
+                    ipfsHash: constants.NULL_BYTES,
+                    swarmHash: constants.NULL_BYTES,
+                };
+                return Bluebird.each(
+                    tokens
+                        .map((token: Token) => {
+                            return tokenRegistry.addToken(
+                                token.address,
+                                token.name,
+                                token.symbol,
+                                token.decimals,
+                                token.ipfsHash,
+                                token.swarmHash,
+                            );
+                        })
+                        .concat(
+                            tokenRegistry.addToken(
+                                zrx.address,
+                                zrx.name,
+                                zrx.symbol,
+                                zrx.decimals,
+                                zrx.ipfsHash,
+                                zrx.swarmHash,
+                            ),
+                        ),
+                    _.noop,
+                );
+            }
+        });
 };
diff --git a/packages/contracts/migrations/4_configure_proxy.ts b/packages/contracts/migrations/4_configure_proxy.ts
index ce34ddd32..ff3b844d6 100644
--- a/packages/contracts/migrations/4_configure_proxy.ts
+++ b/packages/contracts/migrations/4_configure_proxy.ts
@@ -4,19 +4,19 @@ const { TokenTransferProxy, Exchange, TokenRegistry } = new Artifacts(artifacts)
 
 let tokenTransferProxy: ContractInstance;
 module.exports = (deployer: any) => {
-	deployer
-		.then(async () => {
-			return Promise.all([TokenTransferProxy.deployed(), TokenRegistry.deployed()]);
-		})
-		.then((instances: ContractInstance[]) => {
-			let tokenRegistry: ContractInstance;
-			[tokenTransferProxy, tokenRegistry] = instances;
-			return tokenRegistry.getTokenAddressBySymbol('ZRX');
-		})
-		.then((ptAddress: string) => {
-			return deployer.deploy(Exchange, ptAddress, tokenTransferProxy.address);
-		})
-		.then(() => {
-			return tokenTransferProxy.addAuthorizedAddress(Exchange.address);
-		});
+    deployer
+        .then(async () => {
+            return Promise.all([TokenTransferProxy.deployed(), TokenRegistry.deployed()]);
+        })
+        .then((instances: ContractInstance[]) => {
+            let tokenRegistry: ContractInstance;
+            [tokenTransferProxy, tokenRegistry] = instances;
+            return tokenRegistry.getTokenAddressBySymbol('ZRX');
+        })
+        .then((ptAddress: string) => {
+            return deployer.deploy(Exchange, ptAddress, tokenTransferProxy.address);
+        })
+        .then(() => {
+            return tokenTransferProxy.addAuthorizedAddress(Exchange.address);
+        });
 };
diff --git a/packages/contracts/migrations/5_transfer_ownership.ts b/packages/contracts/migrations/5_transfer_ownership.ts
index 08b068e18..a27801de3 100644
--- a/packages/contracts/migrations/5_transfer_ownership.ts
+++ b/packages/contracts/migrations/5_transfer_ownership.ts
@@ -4,17 +4,17 @@ const { TokenTransferProxy, MultiSigWalletWithTimeLock, TokenRegistry } = new Ar
 
 let tokenRegistry: ContractInstance;
 module.exports = (deployer: any, network: string) => {
-	if (network !== 'development') {
-		deployer.then(async () => {
-			return Promise.all([TokenTransferProxy.deployed(), TokenRegistry.deployed()])
-				.then((instances: ContractInstance[]) => {
-					let tokenTransferProxy: ContractInstance;
-					[tokenTransferProxy, tokenRegistry] = instances;
-					return tokenTransferProxy.transferOwnership(MultiSigWalletWithTimeLock.address);
-				})
-				.then(() => {
-					return tokenRegistry.transferOwnership(MultiSigWalletWithTimeLock.address);
-				});
-		});
-	}
+    if (network !== 'development') {
+        deployer.then(async () => {
+            return Promise.all([TokenTransferProxy.deployed(), TokenRegistry.deployed()])
+                .then((instances: ContractInstance[]) => {
+                    let tokenTransferProxy: ContractInstance;
+                    [tokenTransferProxy, tokenRegistry] = instances;
+                    return tokenTransferProxy.transferOwnership(MultiSigWalletWithTimeLock.address);
+                })
+                .then(() => {
+                    return tokenRegistry.transferOwnership(MultiSigWalletWithTimeLock.address);
+                });
+        });
+    }
 };
diff --git a/packages/contracts/migrations/config/multisig_sample.ts b/packages/contracts/migrations/config/multisig_sample.ts
index 6ff5efc1c..97cdc2eae 100644
--- a/packages/contracts/migrations/config/multisig_sample.ts
+++ b/packages/contracts/migrations/config/multisig_sample.ts
@@ -2,9 +2,9 @@ import { MultiSigConfigByNetwork } from '../../util/types';
 
 // Make a copy of this file named `multisig.js` and input custom params as needed
 export const multiSig: MultiSigConfigByNetwork = {
-	kovan: {
-		owners: [],
-		confirmationsRequired: 0,
-		secondsRequired: 0,
-	},
+    kovan: {
+        owners: [],
+        confirmationsRequired: 0,
+        secondsRequired: 0,
+    },
 };
diff --git a/packages/contracts/migrations/config/token_info.ts b/packages/contracts/migrations/config/token_info.ts
index 9e211c489..6ae67175e 100644
--- a/packages/contracts/migrations/config/token_info.ts
+++ b/packages/contracts/migrations/config/token_info.ts
@@ -2,98 +2,98 @@ import { constants } from '../../util/constants';
 import { TokenInfoByNetwork } from '../../util/types';
 
 export const tokenInfo: TokenInfoByNetwork = {
-	development: [
-		{
-			name: '0x Protocol Token',
-			symbol: 'ZRX',
-			decimals: 18,
-			ipfsHash: constants.NULL_BYTES,
-			swarmHash: constants.NULL_BYTES,
-		},
-		{
-			name: 'Augur Reputation Token',
-			symbol: 'REP',
-			decimals: 18,
-			ipfsHash: constants.NULL_BYTES,
-			swarmHash: constants.NULL_BYTES,
-		},
-		{
-			name: 'Digix DAO Token',
-			symbol: 'DGD',
-			decimals: 18,
-			ipfsHash: constants.NULL_BYTES,
-			swarmHash: constants.NULL_BYTES,
-		},
-		{
-			name: 'Golem Network Token',
-			symbol: 'GNT',
-			decimals: 18,
-			ipfsHash: constants.NULL_BYTES,
-			swarmHash: constants.NULL_BYTES,
-		},
-		{
-			name: 'MakerDAO',
-			symbol: 'MKR',
-			decimals: 18,
-			ipfsHash: constants.NULL_BYTES,
-			swarmHash: constants.NULL_BYTES,
-		},
-		{
-			name: 'Melon Token',
-			symbol: 'MLN',
-			decimals: 18,
-			ipfsHash: constants.NULL_BYTES,
-			swarmHash: constants.NULL_BYTES,
-		},
-	],
-	live: [
-		{
-			address: '0xecf8f87f810ecf450940c9f60066b4a7a501d6a7',
-			name: 'ETH Wrapper Token',
-			symbol: 'WETH',
-			decimals: 18,
-			ipfsHash: constants.NULL_BYTES,
-			swarmHash: constants.NULL_BYTES,
-		},
-		{
-			address: '0x48c80f1f4d53d5951e5d5438b54cba84f29f32a5',
-			name: 'Augur Reputation Token',
-			symbol: 'REP',
-			decimals: 18,
-			ipfsHash: constants.NULL_BYTES,
-			swarmHash: constants.NULL_BYTES,
-		},
-		{
-			address: '0xe0b7927c4af23765cb51314a0e0521a9645f0e2a',
-			name: 'Digix DAO Token',
-			symbol: 'DGD',
-			decimals: 18,
-			ipfsHash: constants.NULL_BYTES,
-			swarmHash: constants.NULL_BYTES,
-		},
-		{
-			address: '0xa74476443119a942de498590fe1f2454d7d4ac0d',
-			name: 'Golem Network Token',
-			symbol: 'GNT',
-			decimals: 18,
-			ipfsHash: constants.NULL_BYTES,
-			swarmHash: constants.NULL_BYTES,
-		},
-		{
-			address: '0xc66ea802717bfb9833400264dd12c2bceaa34a6d',
-			name: 'MakerDAO',
-			symbol: 'MKR',
-			decimals: 18,
-			ipfsHash: constants.NULL_BYTES,
-			swarmHash: constants.NULL_BYTES,
-		},
-		{
-			address: '0xbeb9ef514a379b997e0798fdcc901ee474b6d9a1',
-			name: 'Melon Token',
-			symbol: 'MLN',
-			decimals: 18,
-			ipfsHash: constants.NULL_BYTES,
-			swarmHash: constants.NULL_BYTES,
-		},
-	],
+    development: [
+        {
+            name: '0x Protocol Token',
+            symbol: 'ZRX',
+            decimals: 18,
+            ipfsHash: constants.NULL_BYTES,
+            swarmHash: constants.NULL_BYTES,
+        },
+        {
+            name: 'Augur Reputation Token',
+            symbol: 'REP',
+            decimals: 18,
+            ipfsHash: constants.NULL_BYTES,
+            swarmHash: constants.NULL_BYTES,
+        },
+        {
+            name: 'Digix DAO Token',
+            symbol: 'DGD',
+            decimals: 18,
+            ipfsHash: constants.NULL_BYTES,
+            swarmHash: constants.NULL_BYTES,
+        },
+        {
+            name: 'Golem Network Token',
+            symbol: 'GNT',
+            decimals: 18,
+            ipfsHash: constants.NULL_BYTES,
+            swarmHash: constants.NULL_BYTES,
+        },
+        {
+            name: 'MakerDAO',
+            symbol: 'MKR',
+            decimals: 18,
+            ipfsHash: constants.NULL_BYTES,
+            swarmHash: constants.NULL_BYTES,
+        },
+        {
+            name: 'Melon Token',
+            symbol: 'MLN',
+            decimals: 18,
+            ipfsHash: constants.NULL_BYTES,
+            swarmHash: constants.NULL_BYTES,
+        },
+    ],
+    live: [
+        {
+            address: '0xecf8f87f810ecf450940c9f60066b4a7a501d6a7',
+            name: 'ETH Wrapper Token',
+            symbol: 'WETH',
+            decimals: 18,
+            ipfsHash: constants.NULL_BYTES,
+            swarmHash: constants.NULL_BYTES,
+        },
+        {
+            address: '0x48c80f1f4d53d5951e5d5438b54cba84f29f32a5',
+            name: 'Augur Reputation Token',
+            symbol: 'REP',
+            decimals: 18,
+            ipfsHash: constants.NULL_BYTES,
+            swarmHash: constants.NULL_BYTES,
+        },
+        {
+            address: '0xe0b7927c4af23765cb51314a0e0521a9645f0e2a',
+            name: 'Digix DAO Token',
+            symbol: 'DGD',
+            decimals: 18,
+            ipfsHash: constants.NULL_BYTES,
+            swarmHash: constants.NULL_BYTES,
+        },
+        {
+            address: '0xa74476443119a942de498590fe1f2454d7d4ac0d',
+            name: 'Golem Network Token',
+            symbol: 'GNT',
+            decimals: 18,
+            ipfsHash: constants.NULL_BYTES,
+            swarmHash: constants.NULL_BYTES,
+        },
+        {
+            address: '0xc66ea802717bfb9833400264dd12c2bceaa34a6d',
+            name: 'MakerDAO',
+            symbol: 'MKR',
+            decimals: 18,
+            ipfsHash: constants.NULL_BYTES,
+            swarmHash: constants.NULL_BYTES,
+        },
+        {
+            address: '0xbeb9ef514a379b997e0798fdcc901ee474b6d9a1',
+            name: 'Melon Token',
+            symbol: 'MLN',
+            decimals: 18,
+            ipfsHash: constants.NULL_BYTES,
+            swarmHash: constants.NULL_BYTES,
+        },
+    ],
 };
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index b361c6622..468607c16 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -1,74 +1,74 @@
 {
-	"private": true,
-	"name": "contracts",
-	"version": "2.1.6",
-	"description": "Smart contract components of 0x protocol",
-	"main": "index.js",
-	"directories": {
-		"test": "test"
-	},
-	"scripts": {
-		"build":
-			"rm -rf ./lib; copyfiles ./build/**/* ./deploy/solc/solc_bin/* ./deploy/test/fixtures/contracts/**/* ./deploy/test/fixtures/contracts/* ./lib; tsc;",
-		"test": "npm run build; truffle test",
-		"compile:comment":
-			"Yarn workspaces do not link binaries correctly so we need to reference them directly https://github.com/yarnpkg/yarn/issues/3846",
-		"compile": "node ../deployer/lib/src/cli.js compile",
-		"clean": "rm -rf ./lib",
-		"migrate": "node ../deployer/lib/src/cli.js migrate",
-		"lint": "tslint --project . 'migrations/**/*.ts' 'test/**/*.ts' 'util/**/*.ts' 'deploy/**/*.ts'",
-		"test:circleci": "yarn test"
-	},
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/0xProject/0x.js.git"
-	},
-	"author": "Amir Bandeali",
-	"license": "Apache-2.0",
-	"bugs": {
-		"url": "https://github.com/0xProject/0x.js/issues"
-	},
-	"homepage": "https://github.com/0xProject/0x.js/packages/contracts/README.md",
-	"devDependencies": {
-		"@0xproject/dev-utils": "^0.0.7",
-		"@0xproject/tslint-config": "^0.4.4",
-		"@0xproject/types": "^0.1.6",
-		"@types/bluebird": "^3.5.3",
-		"@types/lodash": "^4.14.86",
-		"@types/node": "^8.0.53",
-		"@types/request-promise-native": "^1.0.2",
-		"@types/yargs": "^10.0.0",
-		"chai": "^4.0.1",
-		"chai-as-promised": "^7.1.0",
-		"chai-as-promised-typescript-typings": "^0.0.6",
-		"chai-bignumber": "^2.0.1",
-		"chai-typescript-typings": "^0.0.2",
-		"copyfiles": "^1.2.0",
-		"dirty-chai": "^2.0.1",
-		"mocha": "^4.0.1",
-		"solc": "^0.4.18",
-		"truffle": "^4.0.1",
-		"tslint": "5.8.0",
-		"types-bn": "^0.0.1",
-		"types-ethereumjs-util": "0xProject/types-ethereumjs-util",
-		"typescript": "~2.6.1",
-		"web3-typescript-typings": "^0.9.6",
-		"yargs": "^10.0.3"
-	},
-	"dependencies": {
-		"0x.js": "^0.30.2",
-		"@0xproject/deployer": "^0.0.3",
-		"@0xproject/json-schemas": "^0.7.5",
-		"@0xproject/utils": "^0.2.2",
-		"@0xproject/web3-wrapper": "^0.1.7",
-		"bluebird": "^3.5.0",
-		"bn.js": "^4.11.8",
-		"ethereumjs-abi": "^0.6.4",
-		"ethereumjs-util": "^5.1.1",
-		"isomorphic-fetch": "^2.2.1",
-		"lodash": "^4.17.4",
-		"request": "^2.81.0",
-		"web3": "^0.20.0",
-		"web3-eth-abi": "^1.0.0-beta.24"
-	}
+    "private": true,
+    "name": "contracts",
+    "version": "2.1.6",
+    "description": "Smart contract components of 0x protocol",
+    "main": "index.js",
+    "directories": {
+        "test": "test"
+    },
+    "scripts": {
+        "build":
+            "rm -rf ./lib; copyfiles ./build/**/* ./deploy/solc/solc_bin/* ./deploy/test/fixtures/contracts/**/* ./deploy/test/fixtures/contracts/* ./lib; tsc;",
+        "test": "npm run build; truffle test",
+        "compile:comment":
+            "Yarn workspaces do not link binaries correctly so we need to reference them directly https://github.com/yarnpkg/yarn/issues/3846",
+        "compile": "node ../deployer/lib/src/cli.js compile",
+        "clean": "rm -rf ./lib",
+        "migrate": "node ../deployer/lib/src/cli.js migrate",
+        "lint": "tslint --project . 'migrations/**/*.ts' 'test/**/*.ts' 'util/**/*.ts' 'deploy/**/*.ts'",
+        "test:circleci": "yarn test"
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/0xProject/0x.js.git"
+    },
+    "author": "Amir Bandeali",
+    "license": "Apache-2.0",
+    "bugs": {
+        "url": "https://github.com/0xProject/0x.js/issues"
+    },
+    "homepage": "https://github.com/0xProject/0x.js/packages/contracts/README.md",
+    "devDependencies": {
+        "@0xproject/dev-utils": "^0.0.7",
+        "@0xproject/tslint-config": "^0.4.4",
+        "@0xproject/types": "^0.1.6",
+        "@types/bluebird": "^3.5.3",
+        "@types/lodash": "^4.14.86",
+        "@types/node": "^8.0.53",
+        "@types/request-promise-native": "^1.0.2",
+        "@types/yargs": "^10.0.0",
+        "chai": "^4.0.1",
+        "chai-as-promised": "^7.1.0",
+        "chai-as-promised-typescript-typings": "^0.0.6",
+        "chai-bignumber": "^2.0.1",
+        "chai-typescript-typings": "^0.0.2",
+        "copyfiles": "^1.2.0",
+        "dirty-chai": "^2.0.1",
+        "mocha": "^4.0.1",
+        "solc": "^0.4.18",
+        "truffle": "^4.0.1",
+        "tslint": "5.8.0",
+        "types-bn": "^0.0.1",
+        "types-ethereumjs-util": "0xProject/types-ethereumjs-util",
+        "typescript": "~2.6.1",
+        "web3-typescript-typings": "^0.9.6",
+        "yargs": "^10.0.3"
+    },
+    "dependencies": {
+        "0x.js": "^0.30.2",
+        "@0xproject/deployer": "^0.0.3",
+        "@0xproject/json-schemas": "^0.7.5",
+        "@0xproject/utils": "^0.2.2",
+        "@0xproject/web3-wrapper": "^0.1.7",
+        "bluebird": "^3.5.0",
+        "bn.js": "^4.11.8",
+        "ethereumjs-abi": "^0.6.4",
+        "ethereumjs-util": "^5.1.1",
+        "isomorphic-fetch": "^2.2.1",
+        "lodash": "^4.17.4",
+        "request": "^2.81.0",
+        "web3": "^0.20.0",
+        "web3-eth-abi": "^1.0.0-beta.24"
+    }
 }
diff --git a/packages/contracts/test/ts/ether_token.ts b/packages/contracts/test/ts/ether_token.ts
index c770b4001..f807cdaa3 100644
--- a/packages/contracts/test/ts/ether_token.ts
+++ b/packages/contracts/test/ts/ether_token.ts
@@ -18,107 +18,107 @@ const expect = chai.expect;
 const web3: Web3 = (global as any).web3;
 
 contract('EtherToken', (accounts: string[]) => {
-	const account = accounts[0];
-	const gasPrice = ZeroEx.toBaseUnitAmount(new BigNumber(20), 9);
-	let zeroEx: ZeroEx;
-	let etherTokenAddress: string;
-
-	before(async () => {
-		etherTokenAddress = EtherToken.address;
-		zeroEx = new ZeroEx(web3.currentProvider, {
-			gasPrice,
-			networkId: constants.TESTRPC_NETWORK_ID,
-		});
-	});
-
-	const sendTransactionAsync = promisify<string>(web3.eth.sendTransaction);
-	const getEthBalanceAsync = async (owner: string) => {
-		const balanceStr = await promisify<string>(web3.eth.getBalance)(owner);
-		const balance = new BigNumber(balanceStr);
-		return balance;
-	};
-
-	describe('deposit', () => {
-		it('should throw if caller attempts to deposit more Ether than caller balance', async () => {
-			const initEthBalance = await getEthBalanceAsync(account);
-			const ethToDeposit = initEthBalance.plus(1);
-
-			return expect(zeroEx.etherToken.depositAsync(etherTokenAddress, ethToDeposit, account)).to.be.rejectedWith(
-				ZeroExError.InsufficientEthBalanceForDeposit,
-			);
-		});
-
-		it('should convert deposited Ether to wrapped Ether tokens', async () => {
-			const initEthBalance = await getEthBalanceAsync(account);
-			const initEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
-
-			const ethToDeposit = new BigNumber(web3.toWei(1, 'ether'));
-
-			const txHash = await zeroEx.etherToken.depositAsync(etherTokenAddress, ethToDeposit, account);
-			const receipt = await zeroEx.awaitTransactionMinedAsync(txHash);
-
-			const ethSpentOnGas = gasPrice.times(receipt.gasUsed);
-			const finalEthBalance = await getEthBalanceAsync(account);
-			const finalEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
-
-			expect(finalEthBalance).to.be.bignumber.equal(initEthBalance.minus(ethToDeposit.plus(ethSpentOnGas)));
-			expect(finalEthTokenBalance).to.be.bignumber.equal(initEthTokenBalance.plus(ethToDeposit));
-		});
-	});
-
-	describe('withdraw', () => {
-		it('should throw if caller attempts to withdraw greater than caller balance', async () => {
-			const initEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
-			const ethTokensToWithdraw = initEthTokenBalance.plus(1);
-
-			return expect(
-				zeroEx.etherToken.withdrawAsync(etherTokenAddress, ethTokensToWithdraw, account),
-			).to.be.rejectedWith(ZeroExError.InsufficientWEthBalanceForWithdrawal);
-		});
-
-		it('should convert ether tokens to ether with sufficient balance', async () => {
-			const initEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
-			const initEthBalance = await getEthBalanceAsync(account);
-			const ethTokensToWithdraw = initEthTokenBalance;
-			expect(ethTokensToWithdraw).to.not.be.bignumber.equal(0);
-			const txHash = await zeroEx.etherToken.withdrawAsync(etherTokenAddress, ethTokensToWithdraw, account, {
-				gasLimit: constants.MAX_ETHERTOKEN_WITHDRAW_GAS,
-			});
-			const receipt = await zeroEx.awaitTransactionMinedAsync(txHash);
-
-			const ethSpentOnGas = gasPrice.times(receipt.gasUsed);
-			const finalEthBalance = await getEthBalanceAsync(account);
-			const finalEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
-
-			expect(finalEthBalance).to.be.bignumber.equal(
-				initEthBalance.plus(ethTokensToWithdraw.minus(ethSpentOnGas)),
-			);
-			expect(finalEthTokenBalance).to.be.bignumber.equal(initEthTokenBalance.minus(ethTokensToWithdraw));
-		});
-	});
-
-	describe('fallback', () => {
-		it('should convert sent ether to ether tokens', async () => {
-			const initEthBalance = await getEthBalanceAsync(account);
-			const initEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
-
-			const ethToDeposit = ZeroEx.toBaseUnitAmount(new BigNumber(1), 18);
-
-			const txHash = await sendTransactionAsync({
-				from: account,
-				to: etherTokenAddress,
-				value: ethToDeposit,
-				gasPrice,
-			});
-
-			const receipt = await zeroEx.awaitTransactionMinedAsync(txHash);
-
-			const ethSpentOnGas = gasPrice.times(receipt.gasUsed);
-			const finalEthBalance = await getEthBalanceAsync(account);
-			const finalEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
-
-			expect(finalEthBalance).to.be.bignumber.equal(initEthBalance.minus(ethToDeposit.plus(ethSpentOnGas)));
-			expect(finalEthTokenBalance).to.be.bignumber.equal(initEthTokenBalance.plus(ethToDeposit));
-		});
-	});
+    const account = accounts[0];
+    const gasPrice = ZeroEx.toBaseUnitAmount(new BigNumber(20), 9);
+    let zeroEx: ZeroEx;
+    let etherTokenAddress: string;
+
+    before(async () => {
+        etherTokenAddress = EtherToken.address;
+        zeroEx = new ZeroEx(web3.currentProvider, {
+            gasPrice,
+            networkId: constants.TESTRPC_NETWORK_ID,
+        });
+    });
+
+    const sendTransactionAsync = promisify<string>(web3.eth.sendTransaction);
+    const getEthBalanceAsync = async (owner: string) => {
+        const balanceStr = await promisify<string>(web3.eth.getBalance)(owner);
+        const balance = new BigNumber(balanceStr);
+        return balance;
+    };
+
+    describe('deposit', () => {
+        it('should throw if caller attempts to deposit more Ether than caller balance', async () => {
+            const initEthBalance = await getEthBalanceAsync(account);
+            const ethToDeposit = initEthBalance.plus(1);
+
+            return expect(zeroEx.etherToken.depositAsync(etherTokenAddress, ethToDeposit, account)).to.be.rejectedWith(
+                ZeroExError.InsufficientEthBalanceForDeposit,
+            );
+        });
+
+        it('should convert deposited Ether to wrapped Ether tokens', async () => {
+            const initEthBalance = await getEthBalanceAsync(account);
+            const initEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
+
+            const ethToDeposit = new BigNumber(web3.toWei(1, 'ether'));
+
+            const txHash = await zeroEx.etherToken.depositAsync(etherTokenAddress, ethToDeposit, account);
+            const receipt = await zeroEx.awaitTransactionMinedAsync(txHash);
+
+            const ethSpentOnGas = gasPrice.times(receipt.gasUsed);
+            const finalEthBalance = await getEthBalanceAsync(account);
+            const finalEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
+
+            expect(finalEthBalance).to.be.bignumber.equal(initEthBalance.minus(ethToDeposit.plus(ethSpentOnGas)));
+            expect(finalEthTokenBalance).to.be.bignumber.equal(initEthTokenBalance.plus(ethToDeposit));
+        });
+    });
+
+    describe('withdraw', () => {
+        it('should throw if caller attempts to withdraw greater than caller balance', async () => {
+            const initEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
+            const ethTokensToWithdraw = initEthTokenBalance.plus(1);
+
+            return expect(
+                zeroEx.etherToken.withdrawAsync(etherTokenAddress, ethTokensToWithdraw, account),
+            ).to.be.rejectedWith(ZeroExError.InsufficientWEthBalanceForWithdrawal);
+        });
+
+        it('should convert ether tokens to ether with sufficient balance', async () => {
+            const initEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
+            const initEthBalance = await getEthBalanceAsync(account);
+            const ethTokensToWithdraw = initEthTokenBalance;
+            expect(ethTokensToWithdraw).to.not.be.bignumber.equal(0);
+            const txHash = await zeroEx.etherToken.withdrawAsync(etherTokenAddress, ethTokensToWithdraw, account, {
+                gasLimit: constants.MAX_ETHERTOKEN_WITHDRAW_GAS,
+            });
+            const receipt = await zeroEx.awaitTransactionMinedAsync(txHash);
+
+            const ethSpentOnGas = gasPrice.times(receipt.gasUsed);
+            const finalEthBalance = await getEthBalanceAsync(account);
+            const finalEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
+
+            expect(finalEthBalance).to.be.bignumber.equal(
+                initEthBalance.plus(ethTokensToWithdraw.minus(ethSpentOnGas)),
+            );
+            expect(finalEthTokenBalance).to.be.bignumber.equal(initEthTokenBalance.minus(ethTokensToWithdraw));
+        });
+    });
+
+    describe('fallback', () => {
+        it('should convert sent ether to ether tokens', async () => {
+            const initEthBalance = await getEthBalanceAsync(account);
+            const initEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
+
+            const ethToDeposit = ZeroEx.toBaseUnitAmount(new BigNumber(1), 18);
+
+            const txHash = await sendTransactionAsync({
+                from: account,
+                to: etherTokenAddress,
+                value: ethToDeposit,
+                gasPrice,
+            });
+
+            const receipt = await zeroEx.awaitTransactionMinedAsync(txHash);
+
+            const ethSpentOnGas = gasPrice.times(receipt.gasUsed);
+            const finalEthBalance = await getEthBalanceAsync(account);
+            const finalEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
+
+            expect(finalEthBalance).to.be.bignumber.equal(initEthBalance.minus(ethToDeposit.plus(ethSpentOnGas)));
+            expect(finalEthTokenBalance).to.be.bignumber.equal(initEthTokenBalance.plus(ethToDeposit));
+        });
+    });
 });
diff --git a/packages/contracts/test/ts/exchange/core.ts b/packages/contracts/test/ts/exchange/core.ts
index 36078aaa9..770ef0c43 100644
--- a/packages/contracts/test/ts/exchange/core.ts
+++ b/packages/contracts/test/ts/exchange/core.ts
@@ -23,830 +23,830 @@ const { Exchange, TokenTransferProxy, DummyToken, TokenRegistry, MaliciousToken
 const web3: Web3 = (global as any).web3;
 
 contract('Exchange', (accounts: string[]) => {
-	const maker = accounts[0];
-	const tokenOwner = accounts[0];
-	const taker = accounts[1] || accounts[accounts.length - 1];
-	const feeRecipient = accounts[2] || accounts[accounts.length - 1];
-
-	const INITIAL_BALANCE = ZeroEx.toBaseUnitAmount(new BigNumber(10000), 18);
-	const INITIAL_ALLOWANCE = ZeroEx.toBaseUnitAmount(new BigNumber(10000), 18);
-
-	let rep: ContractInstance;
-	let dgd: ContractInstance;
-	let zrx: ContractInstance;
-	let exchange: ContractInstance;
-	let tokenRegistry: ContractInstance;
-
-	let order: Order;
-	let balances: BalancesByOwner;
-	let exWrapper: ExchangeWrapper;
-	let dmyBalances: Balances;
-	let orderFactory: OrderFactory;
-
-	let zeroEx: ZeroEx;
-
-	before(async () => {
-		[tokenRegistry, exchange] = await Promise.all([TokenRegistry.deployed(), Exchange.deployed()]);
-		exWrapper = new ExchangeWrapper(exchange);
-		zeroEx = new ZeroEx(web3.currentProvider, {
-			exchangeContractAddress: exchange.address,
-			networkId: constants.TESTRPC_NETWORK_ID,
-		});
-
-		const [repAddress, dgdAddress, zrxAddress] = await Promise.all([
-			tokenRegistry.getTokenAddressBySymbol('REP'),
-			tokenRegistry.getTokenAddressBySymbol('DGD'),
-			tokenRegistry.getTokenAddressBySymbol('ZRX'),
-		]);
-
-		const defaultOrderParams = {
-			exchangeContractAddress: Exchange.address,
-			maker,
-			feeRecipient,
-			makerToken: repAddress,
-			takerToken: dgdAddress,
-			makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
-			takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
-			makerFee: ZeroEx.toBaseUnitAmount(new BigNumber(1), 18),
-			takerFee: ZeroEx.toBaseUnitAmount(new BigNumber(1), 18),
-		};
-		orderFactory = new OrderFactory(defaultOrderParams);
-
-		[rep, dgd, zrx] = await Promise.all([
-			DummyToken.at(repAddress),
-			DummyToken.at(dgdAddress),
-			DummyToken.at(zrxAddress),
-		]);
-		dmyBalances = new Balances([rep, dgd, zrx], [maker, taker, feeRecipient]);
-		await Promise.all([
-			rep.approve(TokenTransferProxy.address, INITIAL_ALLOWANCE, {
-				from: maker,
-			}),
-			rep.approve(TokenTransferProxy.address, INITIAL_ALLOWANCE, {
-				from: taker,
-			}),
-			rep.setBalance(maker, INITIAL_BALANCE, { from: tokenOwner }),
-			rep.setBalance(taker, INITIAL_BALANCE, { from: tokenOwner }),
-			dgd.approve(TokenTransferProxy.address, INITIAL_ALLOWANCE, {
-				from: maker,
-			}),
-			dgd.approve(TokenTransferProxy.address, INITIAL_ALLOWANCE, {
-				from: taker,
-			}),
-			dgd.setBalance(maker, INITIAL_BALANCE, { from: tokenOwner }),
-			dgd.setBalance(taker, INITIAL_BALANCE, { from: tokenOwner }),
-			zrx.approve(TokenTransferProxy.address, INITIAL_ALLOWANCE, {
-				from: maker,
-			}),
-			zrx.approve(TokenTransferProxy.address, INITIAL_ALLOWANCE, {
-				from: taker,
-			}),
-			zrx.setBalance(maker, INITIAL_BALANCE, { from: tokenOwner }),
-			zrx.setBalance(taker, INITIAL_BALANCE, { from: tokenOwner }),
-		]);
-	});
-
-	describe('internal functions', () => {
-		it('should include transferViaTokenTransferProxy', () => {
-			expect(exchange.transferViaTokenTransferProxy).to.be.undefined();
-		});
-
-		it('should include isTransferable', () => {
-			expect(exchange.isTransferable).to.be.undefined();
-		});
-
-		it('should include getBalance', () => {
-			expect(exchange.getBalance).to.be.undefined();
-		});
-
-		it('should include getAllowance', () => {
-			expect(exchange.getAllowance).to.be.undefined();
-		});
-	});
-
-	describe('fillOrder', () => {
-		beforeEach(async () => {
-			balances = await dmyBalances.getAsync();
-			order = await orderFactory.newSignedOrderAsync();
-		});
-
-		it('should create an unfillable order', async () => {
-			order = await orderFactory.newSignedOrderAsync({
-				makerTokenAmount: new BigNumber(1001),
-				takerTokenAmount: new BigNumber(3),
-			});
-
-			const filledTakerTokenAmountBefore = await zeroEx.exchange.getFilledTakerAmountAsync(
-				order.params.orderHashHex,
-			);
-			expect(filledTakerTokenAmountBefore).to.be.bignumber.equal(0);
-
-			const fillTakerTokenAmount1 = new BigNumber(2);
-			await exWrapper.fillOrderAsync(order, taker, {
-				fillTakerTokenAmount: fillTakerTokenAmount1,
-			});
-
-			const filledTakerTokenAmountAfter1 = await zeroEx.exchange.getFilledTakerAmountAsync(
-				order.params.orderHashHex,
-			);
-			expect(filledTakerTokenAmountAfter1).to.be.bignumber.equal(fillTakerTokenAmount1);
-
-			const fillTakerTokenAmount2 = new BigNumber(1);
-			await exWrapper.fillOrderAsync(order, taker, {
-				fillTakerTokenAmount: fillTakerTokenAmount2,
-			});
-
-			const filledTakerTokenAmountAfter2 = await zeroEx.exchange.getFilledTakerAmountAsync(
-				order.params.orderHashHex,
-			);
-			expect(filledTakerTokenAmountAfter2).to.be.bignumber.equal(filledTakerTokenAmountAfter1);
-		});
-
-		it('should transfer the correct amounts when makerTokenAmount === takerTokenAmount', async () => {
-			order = await orderFactory.newSignedOrderAsync({
-				makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
-				takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
-			});
-
-			const filledTakerTokenAmountBefore = await zeroEx.exchange.getFilledTakerAmountAsync(
-				order.params.orderHashHex,
-			);
-			expect(filledTakerTokenAmountBefore).to.be.bignumber.equal(0);
-
-			const fillTakerTokenAmount = order.params.takerTokenAmount.div(2);
-			await exWrapper.fillOrderAsync(order, taker, { fillTakerTokenAmount });
-
-			const filledTakerTokenAmountAfter = await zeroEx.exchange.getFilledTakerAmountAsync(
-				order.params.orderHashHex,
-			);
-			expect(filledTakerTokenAmountAfter).to.be.bignumber.equal(fillTakerTokenAmount);
-
-			const newBalances = await dmyBalances.getAsync();
-
-			const fillMakerTokenAmount = fillTakerTokenAmount
-				.times(order.params.makerTokenAmount)
-				.dividedToIntegerBy(order.params.takerTokenAmount);
-			const paidMakerFee = order.params.makerFee
-				.times(fillMakerTokenAmount)
-				.dividedToIntegerBy(order.params.makerTokenAmount);
-			const paidTakerFee = order.params.takerFee
-				.times(fillMakerTokenAmount)
-				.dividedToIntegerBy(order.params.makerTokenAmount);
-			expect(newBalances[maker][order.params.makerToken]).to.be.bignumber.equal(
-				balances[maker][order.params.makerToken].minus(fillMakerTokenAmount),
-			);
-			expect(newBalances[maker][order.params.takerToken]).to.be.bignumber.equal(
-				balances[maker][order.params.takerToken].add(fillTakerTokenAmount),
-			);
-			expect(newBalances[maker][zrx.address]).to.be.bignumber.equal(
-				balances[maker][zrx.address].minus(paidMakerFee),
-			);
-			expect(newBalances[taker][order.params.takerToken]).to.be.bignumber.equal(
-				balances[taker][order.params.takerToken].minus(fillTakerTokenAmount),
-			);
-			expect(newBalances[taker][order.params.makerToken]).to.be.bignumber.equal(
-				balances[taker][order.params.makerToken].add(fillMakerTokenAmount),
-			);
-			expect(newBalances[taker][zrx.address]).to.be.bignumber.equal(
-				balances[taker][zrx.address].minus(paidTakerFee),
-			);
-			expect(newBalances[feeRecipient][zrx.address]).to.be.bignumber.equal(
-				balances[feeRecipient][zrx.address].add(paidMakerFee.add(paidTakerFee)),
-			);
-		});
-
-		it('should transfer the correct amounts when makerTokenAmount > takerTokenAmount', async () => {
-			order = await orderFactory.newSignedOrderAsync({
-				makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
-				takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
-			});
-
-			const filledTakerTokenAmountBefore = await zeroEx.exchange.getFilledTakerAmountAsync(
-				order.params.orderHashHex,
-			);
-			expect(filledTakerTokenAmountBefore).to.be.bignumber.equal(0);
-
-			const fillTakerTokenAmount = order.params.takerTokenAmount.div(2);
-			await exWrapper.fillOrderAsync(order, taker, { fillTakerTokenAmount });
-
-			const filledTakerTokenAmountAfter = await zeroEx.exchange.getFilledTakerAmountAsync(
-				order.params.orderHashHex,
-			);
-			expect(filledTakerTokenAmountAfter).to.be.bignumber.equal(fillTakerTokenAmount);
-
-			const newBalances = await dmyBalances.getAsync();
-
-			const fillMakerTokenAmount = fillTakerTokenAmount
-				.times(order.params.makerTokenAmount)
-				.dividedToIntegerBy(order.params.takerTokenAmount);
-			const paidMakerFee = order.params.makerFee
-				.times(fillMakerTokenAmount)
-				.dividedToIntegerBy(order.params.makerTokenAmount);
-			const paidTakerFee = order.params.takerFee
-				.times(fillMakerTokenAmount)
-				.dividedToIntegerBy(order.params.makerTokenAmount);
-			expect(newBalances[maker][order.params.makerToken]).to.be.bignumber.equal(
-				balances[maker][order.params.makerToken].minus(fillMakerTokenAmount),
-			);
-			expect(newBalances[maker][order.params.takerToken]).to.be.bignumber.equal(
-				balances[maker][order.params.takerToken].add(fillTakerTokenAmount),
-			);
-			expect(newBalances[maker][zrx.address]).to.be.bignumber.equal(
-				balances[maker][zrx.address].minus(paidMakerFee),
-			);
-			expect(newBalances[taker][order.params.takerToken]).to.be.bignumber.equal(
-				balances[taker][order.params.takerToken].minus(fillTakerTokenAmount),
-			);
-			expect(newBalances[taker][order.params.makerToken]).to.be.bignumber.equal(
-				balances[taker][order.params.makerToken].add(fillMakerTokenAmount),
-			);
-			expect(newBalances[taker][zrx.address]).to.be.bignumber.equal(
-				balances[taker][zrx.address].minus(paidTakerFee),
-			);
-			expect(newBalances[feeRecipient][zrx.address]).to.be.bignumber.equal(
-				balances[feeRecipient][zrx.address].add(paidMakerFee.add(paidTakerFee)),
-			);
-		});
-
-		it('should transfer the correct amounts when makerTokenAmount < takerTokenAmount', async () => {
-			order = await orderFactory.newSignedOrderAsync({
-				makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
-				takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
-			});
-
-			const filledTakerTokenAmountBefore = await zeroEx.exchange.getFilledTakerAmountAsync(
-				order.params.orderHashHex,
-			);
-			expect(filledTakerTokenAmountBefore).to.be.bignumber.equal(0);
-
-			const fillTakerTokenAmount = order.params.takerTokenAmount.div(2);
-			await exWrapper.fillOrderAsync(order, taker, { fillTakerTokenAmount });
-
-			const filledTakerTokenAmountAfter = await zeroEx.exchange.getFilledTakerAmountAsync(
-				order.params.orderHashHex,
-			);
-			expect(filledTakerTokenAmountAfter).to.be.bignumber.equal(fillTakerTokenAmount);
-
-			const newBalances = await dmyBalances.getAsync();
-
-			const fillMakerTokenAmount = fillTakerTokenAmount
-				.times(order.params.makerTokenAmount)
-				.dividedToIntegerBy(order.params.takerTokenAmount);
-			const paidMakerFee = order.params.makerFee
-				.times(fillMakerTokenAmount)
-				.dividedToIntegerBy(order.params.makerTokenAmount);
-			const paidTakerFee = order.params.takerFee
-				.times(fillMakerTokenAmount)
-				.dividedToIntegerBy(order.params.makerTokenAmount);
-			expect(newBalances[maker][order.params.makerToken]).to.be.bignumber.equal(
-				balances[maker][order.params.makerToken].minus(fillMakerTokenAmount),
-			);
-			expect(newBalances[maker][order.params.takerToken]).to.be.bignumber.equal(
-				balances[maker][order.params.takerToken].add(fillTakerTokenAmount),
-			);
-			expect(newBalances[maker][zrx.address]).to.be.bignumber.equal(
-				balances[maker][zrx.address].minus(paidMakerFee),
-			);
-			expect(newBalances[taker][order.params.takerToken]).to.be.bignumber.equal(
-				balances[taker][order.params.takerToken].minus(fillTakerTokenAmount),
-			);
-			expect(newBalances[taker][order.params.makerToken]).to.be.bignumber.equal(
-				balances[taker][order.params.makerToken].add(fillMakerTokenAmount),
-			);
-			expect(newBalances[taker][zrx.address]).to.be.bignumber.equal(
-				balances[taker][zrx.address].minus(paidTakerFee),
-			);
-			expect(newBalances[feeRecipient][zrx.address]).to.be.bignumber.equal(
-				balances[feeRecipient][zrx.address].add(paidMakerFee.add(paidTakerFee)),
-			);
-		});
-
-		it('should transfer the correct amounts when taker is specified and order is claimed by taker', async () => {
-			order = await orderFactory.newSignedOrderAsync({
-				taker,
-				makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
-				takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
-			});
-
-			const filledTakerTokenAmountBefore = await zeroEx.exchange.getFilledTakerAmountAsync(
-				order.params.orderHashHex,
-			);
-			expect(filledTakerTokenAmountBefore).to.be.bignumber.equal(0);
-
-			const fillTakerTokenAmount = order.params.takerTokenAmount.div(2);
-			await exWrapper.fillOrderAsync(order, taker, { fillTakerTokenAmount });
-
-			const filledTakerTokenAmountAfter = await zeroEx.exchange.getFilledTakerAmountAsync(
-				order.params.orderHashHex,
-			);
-			const expectedFillAmountTAfter = fillTakerTokenAmount.add(filledTakerTokenAmountBefore);
-			expect(filledTakerTokenAmountAfter).to.be.bignumber.equal(expectedFillAmountTAfter);
-
-			const newBalances = await dmyBalances.getAsync();
-
-			const fillMakerTokenAmount = fillTakerTokenAmount
-				.times(order.params.makerTokenAmount)
-				.dividedToIntegerBy(order.params.takerTokenAmount);
-			const paidMakerFee = order.params.makerFee
-				.times(fillMakerTokenAmount)
-				.dividedToIntegerBy(order.params.makerTokenAmount);
-			const paidTakerFee = order.params.takerFee
-				.times(fillMakerTokenAmount)
-				.dividedToIntegerBy(order.params.makerTokenAmount);
-			expect(newBalances[maker][order.params.makerToken]).to.be.bignumber.equal(
-				balances[maker][order.params.makerToken].minus(fillMakerTokenAmount),
-			);
-			expect(newBalances[maker][order.params.takerToken]).to.be.bignumber.equal(
-				balances[maker][order.params.takerToken].add(fillTakerTokenAmount),
-			);
-			expect(newBalances[maker][zrx.address]).to.be.bignumber.equal(
-				balances[maker][zrx.address].minus(paidMakerFee),
-			);
-			expect(newBalances[taker][order.params.takerToken]).to.be.bignumber.equal(
-				balances[taker][order.params.takerToken].minus(fillTakerTokenAmount),
-			);
-			expect(newBalances[taker][order.params.makerToken]).to.be.bignumber.equal(
-				balances[taker][order.params.makerToken].add(fillMakerTokenAmount),
-			);
-			expect(newBalances[taker][zrx.address]).to.be.bignumber.equal(
-				balances[taker][zrx.address].minus(paidTakerFee),
-			);
-			expect(newBalances[feeRecipient][zrx.address]).to.be.bignumber.equal(
-				balances[feeRecipient][zrx.address].add(paidMakerFee.add(paidTakerFee)),
-			);
-		});
-
-		it('should fill remaining value if fillTakerTokenAmount > remaining takerTokenAmount', async () => {
-			const fillTakerTokenAmount = order.params.takerTokenAmount.div(2);
-			await exWrapper.fillOrderAsync(order, taker, { fillTakerTokenAmount });
-
-			const res = await exWrapper.fillOrderAsync(order, taker, {
-				fillTakerTokenAmount: order.params.takerTokenAmount,
-			});
-
-			expect(res.logs[0].args.filledTakerTokenAmount).to.be.bignumber.equal(
-				order.params.takerTokenAmount.minus(fillTakerTokenAmount),
-			);
-			const newBalances = await dmyBalances.getAsync();
-
-			expect(newBalances[maker][order.params.makerToken]).to.be.bignumber.equal(
-				balances[maker][order.params.makerToken].minus(order.params.makerTokenAmount),
-			);
-			expect(newBalances[maker][order.params.takerToken]).to.be.bignumber.equal(
-				balances[maker][order.params.takerToken].add(order.params.takerTokenAmount),
-			);
-			expect(newBalances[maker][zrx.address]).to.be.bignumber.equal(
-				balances[maker][zrx.address].minus(order.params.makerFee),
-			);
-			expect(newBalances[taker][order.params.takerToken]).to.be.bignumber.equal(
-				balances[taker][order.params.takerToken].minus(order.params.takerTokenAmount),
-			);
-			expect(newBalances[taker][order.params.makerToken]).to.be.bignumber.equal(
-				balances[taker][order.params.makerToken].add(order.params.makerTokenAmount),
-			);
-			expect(newBalances[taker][zrx.address]).to.be.bignumber.equal(
-				balances[taker][zrx.address].minus(order.params.takerFee),
-			);
-			expect(newBalances[feeRecipient][zrx.address]).to.be.bignumber.equal(
-				balances[feeRecipient][zrx.address].add(order.params.makerFee.add(order.params.takerFee)),
-			);
-		});
-
-		it('should log 1 event with the correct arguments when order has a feeRecipient', async () => {
-			const divisor = 2;
-			const res = await exWrapper.fillOrderAsync(order, taker, {
-				fillTakerTokenAmount: order.params.takerTokenAmount.div(divisor),
-			});
-			expect(res.logs).to.have.length(1);
-
-			const logArgs = res.logs[0].args;
-			const expectedFilledMakerTokenAmount = order.params.makerTokenAmount.div(divisor);
-			const expectedFilledTakerTokenAmount = order.params.takerTokenAmount.div(divisor);
-			const expectedFeeMPaid = order.params.makerFee.div(divisor);
-			const expectedFeeTPaid = order.params.takerFee.div(divisor);
-			const tokensHashBuff = crypto.solSHA3([order.params.makerToken, order.params.takerToken]);
-			const expectedTokens = ethUtil.bufferToHex(tokensHashBuff);
-
-			expect(order.params.maker).to.be.equal(logArgs.maker);
-			expect(taker).to.be.equal(logArgs.taker);
-			expect(order.params.feeRecipient).to.be.equal(logArgs.feeRecipient);
-			expect(order.params.makerToken).to.be.equal(logArgs.makerToken);
-			expect(order.params.takerToken).to.be.equal(logArgs.takerToken);
-			expect(expectedFilledMakerTokenAmount).to.be.bignumber.equal(logArgs.filledMakerTokenAmount);
-			expect(expectedFilledTakerTokenAmount).to.be.bignumber.equal(logArgs.filledTakerTokenAmount);
-			expect(expectedFeeMPaid).to.be.bignumber.equal(logArgs.paidMakerFee);
-			expect(expectedFeeTPaid).to.be.bignumber.equal(logArgs.paidTakerFee);
-			expect(expectedTokens).to.be.equal(logArgs.tokens);
-			expect(order.params.orderHashHex).to.be.equal(logArgs.orderHash);
-		});
-
-		it('should log 1 event with the correct arguments when order has no feeRecipient', async () => {
-			order = await orderFactory.newSignedOrderAsync({
-				feeRecipient: ZeroEx.NULL_ADDRESS,
-			});
-			const divisor = 2;
-			const res = await exWrapper.fillOrderAsync(order, taker, {
-				fillTakerTokenAmount: order.params.takerTokenAmount.div(divisor),
-			});
-			expect(res.logs).to.have.length(1);
-
-			const logArgs = res.logs[0].args;
-			const expectedFilledMakerTokenAmount = order.params.makerTokenAmount.div(divisor);
-			const expectedFilledTakerTokenAmount = order.params.takerTokenAmount.div(divisor);
-			const expectedFeeMPaid = new BigNumber(0);
-			const expectedFeeTPaid = new BigNumber(0);
-			const tokensHashBuff = crypto.solSHA3([order.params.makerToken, order.params.takerToken]);
-			const expectedTokens = ethUtil.bufferToHex(tokensHashBuff);
-
-			expect(order.params.maker).to.be.equal(logArgs.maker);
-			expect(taker).to.be.equal(logArgs.taker);
-			expect(order.params.feeRecipient).to.be.equal(logArgs.feeRecipient);
-			expect(order.params.makerToken).to.be.equal(logArgs.makerToken);
-			expect(order.params.takerToken).to.be.equal(logArgs.takerToken);
-			expect(expectedFilledMakerTokenAmount).to.be.bignumber.equal(logArgs.filledMakerTokenAmount);
-			expect(expectedFilledTakerTokenAmount).to.be.bignumber.equal(logArgs.filledTakerTokenAmount);
-			expect(expectedFeeMPaid).to.be.bignumber.equal(logArgs.paidMakerFee);
-			expect(expectedFeeTPaid).to.be.bignumber.equal(logArgs.paidTakerFee);
-			expect(expectedTokens).to.be.equal(logArgs.tokens);
-			expect(order.params.orderHashHex).to.be.equal(logArgs.orderHash);
-		});
-
-		it('should throw when taker is specified and order is claimed by other', async () => {
-			order = await orderFactory.newSignedOrderAsync({
-				taker: feeRecipient,
-				makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
-				takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
-			});
-
-			return expect(exWrapper.fillOrderAsync(order, taker)).to.be.rejectedWith(constants.REVERT);
-		});
-
-		it('should throw if signature is invalid', async () => {
-			order = await orderFactory.newSignedOrderAsync({
-				makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(10), 18),
-			});
-
-			order.params.r = ethUtil.bufferToHex(ethUtil.sha3('invalidR'));
-			order.params.s = ethUtil.bufferToHex(ethUtil.sha3('invalidS'));
-			return expect(exWrapper.fillOrderAsync(order, taker)).to.be.rejectedWith(constants.REVERT);
-		});
-
-		it('should throw if makerTokenAmount is 0', async () => {
-			order = await orderFactory.newSignedOrderAsync({
-				makerTokenAmount: new BigNumber(0),
-			});
-
-			return expect(exWrapper.fillOrderAsync(order, taker)).to.be.rejectedWith(constants.REVERT);
-		});
-
-		it('should throw if takerTokenAmount is 0', async () => {
-			order = await orderFactory.newSignedOrderAsync({
-				takerTokenAmount: new BigNumber(0),
-			});
-
-			return expect(exWrapper.fillOrderAsync(order, taker)).to.be.rejectedWith(constants.REVERT);
-		});
-
-		it('should throw if fillTakerTokenAmount is 0', async () => {
-			order = await orderFactory.newSignedOrderAsync();
-
-			return expect(
-				exWrapper.fillOrderAsync(order, taker, {
-					fillTakerTokenAmount: new BigNumber(0),
-				}),
-			).to.be.rejectedWith(constants.REVERT);
-		});
-
-		it('should not change balances if maker balances are too low to fill order and \
+    const maker = accounts[0];
+    const tokenOwner = accounts[0];
+    const taker = accounts[1] || accounts[accounts.length - 1];
+    const feeRecipient = accounts[2] || accounts[accounts.length - 1];
+
+    const INITIAL_BALANCE = ZeroEx.toBaseUnitAmount(new BigNumber(10000), 18);
+    const INITIAL_ALLOWANCE = ZeroEx.toBaseUnitAmount(new BigNumber(10000), 18);
+
+    let rep: ContractInstance;
+    let dgd: ContractInstance;
+    let zrx: ContractInstance;
+    let exchange: ContractInstance;
+    let tokenRegistry: ContractInstance;
+
+    let order: Order;
+    let balances: BalancesByOwner;
+    let exWrapper: ExchangeWrapper;
+    let dmyBalances: Balances;
+    let orderFactory: OrderFactory;
+
+    let zeroEx: ZeroEx;
+
+    before(async () => {
+        [tokenRegistry, exchange] = await Promise.all([TokenRegistry.deployed(), Exchange.deployed()]);
+        exWrapper = new ExchangeWrapper(exchange);
+        zeroEx = new ZeroEx(web3.currentProvider, {
+            exchangeContractAddress: exchange.address,
+            networkId: constants.TESTRPC_NETWORK_ID,
+        });
+
+        const [repAddress, dgdAddress, zrxAddress] = await Promise.all([
+            tokenRegistry.getTokenAddressBySymbol('REP'),
+            tokenRegistry.getTokenAddressBySymbol('DGD'),
+            tokenRegistry.getTokenAddressBySymbol('ZRX'),
+        ]);
+
+        const defaultOrderParams = {
+            exchangeContractAddress: Exchange.address,
+            maker,
+            feeRecipient,
+            makerToken: repAddress,
+            takerToken: dgdAddress,
+            makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
+            takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
+            makerFee: ZeroEx.toBaseUnitAmount(new BigNumber(1), 18),
+            takerFee: ZeroEx.toBaseUnitAmount(new BigNumber(1), 18),
+        };
+        orderFactory = new OrderFactory(defaultOrderParams);
+
+        [rep, dgd, zrx] = await Promise.all([
+            DummyToken.at(repAddress),
+            DummyToken.at(dgdAddress),
+            DummyToken.at(zrxAddress),
+        ]);
+        dmyBalances = new Balances([rep, dgd, zrx], [maker, taker, feeRecipient]);
+        await Promise.all([
+            rep.approve(TokenTransferProxy.address, INITIAL_ALLOWANCE, {
+                from: maker,
+            }),
+            rep.approve(TokenTransferProxy.address, INITIAL_ALLOWANCE, {
+                from: taker,
+            }),
+            rep.setBalance(maker, INITIAL_BALANCE, { from: tokenOwner }),
+            rep.setBalance(taker, INITIAL_BALANCE, { from: tokenOwner }),
+            dgd.approve(TokenTransferProxy.address, INITIAL_ALLOWANCE, {
+                from: maker,
+            }),
+            dgd.approve(TokenTransferProxy.address, INITIAL_ALLOWANCE, {
+                from: taker,
+            }),
+            dgd.setBalance(maker, INITIAL_BALANCE, { from: tokenOwner }),
+            dgd.setBalance(taker, INITIAL_BALANCE, { from: tokenOwner }),
+            zrx.approve(TokenTransferProxy.address, INITIAL_ALLOWANCE, {
+                from: maker,
+            }),
+            zrx.approve(TokenTransferProxy.address, INITIAL_ALLOWANCE, {
+                from: taker,
+            }),
+            zrx.setBalance(maker, INITIAL_BALANCE, { from: tokenOwner }),
+            zrx.setBalance(taker, INITIAL_BALANCE, { from: tokenOwner }),
+        ]);
+    });
+
+    describe('internal functions', () => {
+        it('should include transferViaTokenTransferProxy', () => {
+            expect(exchange.transferViaTokenTransferProxy).to.be.undefined();
+        });
+
+        it('should include isTransferable', () => {
+            expect(exchange.isTransferable).to.be.undefined();
+        });
+
+        it('should include getBalance', () => {
+            expect(exchange.getBalance).to.be.undefined();
+        });
+
+        it('should include getAllowance', () => {
+            expect(exchange.getAllowance).to.be.undefined();
+        });
+    });
+
+    describe('fillOrder', () => {
+        beforeEach(async () => {
+            balances = await dmyBalances.getAsync();
+            order = await orderFactory.newSignedOrderAsync();
+        });
+
+        it('should create an unfillable order', async () => {
+            order = await orderFactory.newSignedOrderAsync({
+                makerTokenAmount: new BigNumber(1001),
+                takerTokenAmount: new BigNumber(3),
+            });
+
+            const filledTakerTokenAmountBefore = await zeroEx.exchange.getFilledTakerAmountAsync(
+                order.params.orderHashHex,
+            );
+            expect(filledTakerTokenAmountBefore).to.be.bignumber.equal(0);
+
+            const fillTakerTokenAmount1 = new BigNumber(2);
+            await exWrapper.fillOrderAsync(order, taker, {
+                fillTakerTokenAmount: fillTakerTokenAmount1,
+            });
+
+            const filledTakerTokenAmountAfter1 = await zeroEx.exchange.getFilledTakerAmountAsync(
+                order.params.orderHashHex,
+            );
+            expect(filledTakerTokenAmountAfter1).to.be.bignumber.equal(fillTakerTokenAmount1);
+
+            const fillTakerTokenAmount2 = new BigNumber(1);
+            await exWrapper.fillOrderAsync(order, taker, {
+                fillTakerTokenAmount: fillTakerTokenAmount2,
+            });
+
+            const filledTakerTokenAmountAfter2 = await zeroEx.exchange.getFilledTakerAmountAsync(
+                order.params.orderHashHex,
+            );
+            expect(filledTakerTokenAmountAfter2).to.be.bignumber.equal(filledTakerTokenAmountAfter1);
+        });
+
+        it('should transfer the correct amounts when makerTokenAmount === takerTokenAmount', async () => {
+            order = await orderFactory.newSignedOrderAsync({
+                makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
+                takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
+            });
+
+            const filledTakerTokenAmountBefore = await zeroEx.exchange.getFilledTakerAmountAsync(
+                order.params.orderHashHex,
+            );
+            expect(filledTakerTokenAmountBefore).to.be.bignumber.equal(0);
+
+            const fillTakerTokenAmount = order.params.takerTokenAmount.div(2);
+            await exWrapper.fillOrderAsync(order, taker, { fillTakerTokenAmount });
+
+            const filledTakerTokenAmountAfter = await zeroEx.exchange.getFilledTakerAmountAsync(
+                order.params.orderHashHex,
+            );
+            expect(filledTakerTokenAmountAfter).to.be.bignumber.equal(fillTakerTokenAmount);
+
+            const newBalances = await dmyBalances.getAsync();
+
+            const fillMakerTokenAmount = fillTakerTokenAmount
+                .times(order.params.makerTokenAmount)
+                .dividedToIntegerBy(order.params.takerTokenAmount);
+            const paidMakerFee = order.params.makerFee
+                .times(fillMakerTokenAmount)
+                .dividedToIntegerBy(order.params.makerTokenAmount);
+            const paidTakerFee = order.params.takerFee
+                .times(fillMakerTokenAmount)
+                .dividedToIntegerBy(order.params.makerTokenAmount);
+            expect(newBalances[maker][order.params.makerToken]).to.be.bignumber.equal(
+                balances[maker][order.params.makerToken].minus(fillMakerTokenAmount),
+            );
+            expect(newBalances[maker][order.params.takerToken]).to.be.bignumber.equal(
+                balances[maker][order.params.takerToken].add(fillTakerTokenAmount),
+            );
+            expect(newBalances[maker][zrx.address]).to.be.bignumber.equal(
+                balances[maker][zrx.address].minus(paidMakerFee),
+            );
+            expect(newBalances[taker][order.params.takerToken]).to.be.bignumber.equal(
+                balances[taker][order.params.takerToken].minus(fillTakerTokenAmount),
+            );
+            expect(newBalances[taker][order.params.makerToken]).to.be.bignumber.equal(
+                balances[taker][order.params.makerToken].add(fillMakerTokenAmount),
+            );
+            expect(newBalances[taker][zrx.address]).to.be.bignumber.equal(
+                balances[taker][zrx.address].minus(paidTakerFee),
+            );
+            expect(newBalances[feeRecipient][zrx.address]).to.be.bignumber.equal(
+                balances[feeRecipient][zrx.address].add(paidMakerFee.add(paidTakerFee)),
+            );
+        });
+
+        it('should transfer the correct amounts when makerTokenAmount > takerTokenAmount', async () => {
+            order = await orderFactory.newSignedOrderAsync({
+                makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
+                takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
+            });
+
+            const filledTakerTokenAmountBefore = await zeroEx.exchange.getFilledTakerAmountAsync(
+                order.params.orderHashHex,
+            );
+            expect(filledTakerTokenAmountBefore).to.be.bignumber.equal(0);
+
+            const fillTakerTokenAmount = order.params.takerTokenAmount.div(2);
+            await exWrapper.fillOrderAsync(order, taker, { fillTakerTokenAmount });
+
+            const filledTakerTokenAmountAfter = await zeroEx.exchange.getFilledTakerAmountAsync(
+                order.params.orderHashHex,
+            );
+            expect(filledTakerTokenAmountAfter).to.be.bignumber.equal(fillTakerTokenAmount);
+
+            const newBalances = await dmyBalances.getAsync();
+
+            const fillMakerTokenAmount = fillTakerTokenAmount
+                .times(order.params.makerTokenAmount)
+                .dividedToIntegerBy(order.params.takerTokenAmount);
+            const paidMakerFee = order.params.makerFee
+                .times(fillMakerTokenAmount)
+                .dividedToIntegerBy(order.params.makerTokenAmount);
+            const paidTakerFee = order.params.takerFee
+                .times(fillMakerTokenAmount)
+                .dividedToIntegerBy(order.params.makerTokenAmount);
+            expect(newBalances[maker][order.params.makerToken]).to.be.bignumber.equal(
+                balances[maker][order.params.makerToken].minus(fillMakerTokenAmount),
+            );
+            expect(newBalances[maker][order.params.takerToken]).to.be.bignumber.equal(
+                balances[maker][order.params.takerToken].add(fillTakerTokenAmount),
+            );
+            expect(newBalances[maker][zrx.address]).to.be.bignumber.equal(
+                balances[maker][zrx.address].minus(paidMakerFee),
+            );
+            expect(newBalances[taker][order.params.takerToken]).to.be.bignumber.equal(
+                balances[taker][order.params.takerToken].minus(fillTakerTokenAmount),
+            );
+            expect(newBalances[taker][order.params.makerToken]).to.be.bignumber.equal(
+                balances[taker][order.params.makerToken].add(fillMakerTokenAmount),
+            );
+            expect(newBalances[taker][zrx.address]).to.be.bignumber.equal(
+                balances[taker][zrx.address].minus(paidTakerFee),
+            );
+            expect(newBalances[feeRecipient][zrx.address]).to.be.bignumber.equal(
+                balances[feeRecipient][zrx.address].add(paidMakerFee.add(paidTakerFee)),
+            );
+        });
+
+        it('should transfer the correct amounts when makerTokenAmount < takerTokenAmount', async () => {
+            order = await orderFactory.newSignedOrderAsync({
+                makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
+                takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
+            });
+
+            const filledTakerTokenAmountBefore = await zeroEx.exchange.getFilledTakerAmountAsync(
+                order.params.orderHashHex,
+            );
+            expect(filledTakerTokenAmountBefore).to.be.bignumber.equal(0);
+
+            const fillTakerTokenAmount = order.params.takerTokenAmount.div(2);
+            await exWrapper.fillOrderAsync(order, taker, { fillTakerTokenAmount });
+
+            const filledTakerTokenAmountAfter = await zeroEx.exchange.getFilledTakerAmountAsync(
+                order.params.orderHashHex,
+            );
+            expect(filledTakerTokenAmountAfter).to.be.bignumber.equal(fillTakerTokenAmount);
+
+            const newBalances = await dmyBalances.getAsync();
+
+            const fillMakerTokenAmount = fillTakerTokenAmount
+                .times(order.params.makerTokenAmount)
+                .dividedToIntegerBy(order.params.takerTokenAmount);
+            const paidMakerFee = order.params.makerFee
+                .times(fillMakerTokenAmount)
+                .dividedToIntegerBy(order.params.makerTokenAmount);
+            const paidTakerFee = order.params.takerFee
+                .times(fillMakerTokenAmount)
+                .dividedToIntegerBy(order.params.makerTokenAmount);
+            expect(newBalances[maker][order.params.makerToken]).to.be.bignumber.equal(
+                balances[maker][order.params.makerToken].minus(fillMakerTokenAmount),
+            );
+            expect(newBalances[maker][order.params.takerToken]).to.be.bignumber.equal(
+                balances[maker][order.params.takerToken].add(fillTakerTokenAmount),
+            );
+            expect(newBalances[maker][zrx.address]).to.be.bignumber.equal(
+                balances[maker][zrx.address].minus(paidMakerFee),
+            );
+            expect(newBalances[taker][order.params.takerToken]).to.be.bignumber.equal(
+                balances[taker][order.params.takerToken].minus(fillTakerTokenAmount),
+            );
+            expect(newBalances[taker][order.params.makerToken]).to.be.bignumber.equal(
+                balances[taker][order.params.makerToken].add(fillMakerTokenAmount),
+            );
+            expect(newBalances[taker][zrx.address]).to.be.bignumber.equal(
+                balances[taker][zrx.address].minus(paidTakerFee),
+            );
+            expect(newBalances[feeRecipient][zrx.address]).to.be.bignumber.equal(
+                balances[feeRecipient][zrx.address].add(paidMakerFee.add(paidTakerFee)),
+            );
+        });
+
+        it('should transfer the correct amounts when taker is specified and order is claimed by taker', async () => {
+            order = await orderFactory.newSignedOrderAsync({
+                taker,
+                makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
+                takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
+            });
+
+            const filledTakerTokenAmountBefore = await zeroEx.exchange.getFilledTakerAmountAsync(
+                order.params.orderHashHex,
+            );
+            expect(filledTakerTokenAmountBefore).to.be.bignumber.equal(0);
+
+            const fillTakerTokenAmount = order.params.takerTokenAmount.div(2);
+            await exWrapper.fillOrderAsync(order, taker, { fillTakerTokenAmount });
+
+            const filledTakerTokenAmountAfter = await zeroEx.exchange.getFilledTakerAmountAsync(
+                order.params.orderHashHex,
+            );
+            const expectedFillAmountTAfter = fillTakerTokenAmount.add(filledTakerTokenAmountBefore);
+            expect(filledTakerTokenAmountAfter).to.be.bignumber.equal(expectedFillAmountTAfter);
+
+            const newBalances = await dmyBalances.getAsync();
+
+            const fillMakerTokenAmount = fillTakerTokenAmount
+                .times(order.params.makerTokenAmount)
+                .dividedToIntegerBy(order.params.takerTokenAmount);
+            const paidMakerFee = order.params.makerFee
+                .times(fillMakerTokenAmount)
+                .dividedToIntegerBy(order.params.makerTokenAmount);
+            const paidTakerFee = order.params.takerFee
+                .times(fillMakerTokenAmount)
+                .dividedToIntegerBy(order.params.makerTokenAmount);
+            expect(newBalances[maker][order.params.makerToken]).to.be.bignumber.equal(
+                balances[maker][order.params.makerToken].minus(fillMakerTokenAmount),
+            );
+            expect(newBalances[maker][order.params.takerToken]).to.be.bignumber.equal(
+                balances[maker][order.params.takerToken].add(fillTakerTokenAmount),
+            );
+            expect(newBalances[maker][zrx.address]).to.be.bignumber.equal(
+                balances[maker][zrx.address].minus(paidMakerFee),
+            );
+            expect(newBalances[taker][order.params.takerToken]).to.be.bignumber.equal(
+                balances[taker][order.params.takerToken].minus(fillTakerTokenAmount),
+            );
+            expect(newBalances[taker][order.params.makerToken]).to.be.bignumber.equal(
+                balances[taker][order.params.makerToken].add(fillMakerTokenAmount),
+            );
+            expect(newBalances[taker][zrx.address]).to.be.bignumber.equal(
+                balances[taker][zrx.address].minus(paidTakerFee),
+            );
+            expect(newBalances[feeRecipient][zrx.address]).to.be.bignumber.equal(
+                balances[feeRecipient][zrx.address].add(paidMakerFee.add(paidTakerFee)),
+            );
+        });
+
+        it('should fill remaining value if fillTakerTokenAmount > remaining takerTokenAmount', async () => {
+            const fillTakerTokenAmount = order.params.takerTokenAmount.div(2);
+            await exWrapper.fillOrderAsync(order, taker, { fillTakerTokenAmount });
+
+            const res = await exWrapper.fillOrderAsync(order, taker, {
+                fillTakerTokenAmount: order.params.takerTokenAmount,
+            });
+
+            expect(res.logs[0].args.filledTakerTokenAmount).to.be.bignumber.equal(
+                order.params.takerTokenAmount.minus(fillTakerTokenAmount),
+            );
+            const newBalances = await dmyBalances.getAsync();
+
+            expect(newBalances[maker][order.params.makerToken]).to.be.bignumber.equal(
+                balances[maker][order.params.makerToken].minus(order.params.makerTokenAmount),
+            );
+            expect(newBalances[maker][order.params.takerToken]).to.be.bignumber.equal(
+                balances[maker][order.params.takerToken].add(order.params.takerTokenAmount),
+            );
+            expect(newBalances[maker][zrx.address]).to.be.bignumber.equal(
+                balances[maker][zrx.address].minus(order.params.makerFee),
+            );
+            expect(newBalances[taker][order.params.takerToken]).to.be.bignumber.equal(
+                balances[taker][order.params.takerToken].minus(order.params.takerTokenAmount),
+            );
+            expect(newBalances[taker][order.params.makerToken]).to.be.bignumber.equal(
+                balances[taker][order.params.makerToken].add(order.params.makerTokenAmount),
+            );
+            expect(newBalances[taker][zrx.address]).to.be.bignumber.equal(
+                balances[taker][zrx.address].minus(order.params.takerFee),
+            );
+            expect(newBalances[feeRecipient][zrx.address]).to.be.bignumber.equal(
+                balances[feeRecipient][zrx.address].add(order.params.makerFee.add(order.params.takerFee)),
+            );
+        });
+
+        it('should log 1 event with the correct arguments when order has a feeRecipient', async () => {
+            const divisor = 2;
+            const res = await exWrapper.fillOrderAsync(order, taker, {
+                fillTakerTokenAmount: order.params.takerTokenAmount.div(divisor),
+            });
+            expect(res.logs).to.have.length(1);
+
+            const logArgs = res.logs[0].args;
+            const expectedFilledMakerTokenAmount = order.params.makerTokenAmount.div(divisor);
+            const expectedFilledTakerTokenAmount = order.params.takerTokenAmount.div(divisor);
+            const expectedFeeMPaid = order.params.makerFee.div(divisor);
+            const expectedFeeTPaid = order.params.takerFee.div(divisor);
+            const tokensHashBuff = crypto.solSHA3([order.params.makerToken, order.params.takerToken]);
+            const expectedTokens = ethUtil.bufferToHex(tokensHashBuff);
+
+            expect(order.params.maker).to.be.equal(logArgs.maker);
+            expect(taker).to.be.equal(logArgs.taker);
+            expect(order.params.feeRecipient).to.be.equal(logArgs.feeRecipient);
+            expect(order.params.makerToken).to.be.equal(logArgs.makerToken);
+            expect(order.params.takerToken).to.be.equal(logArgs.takerToken);
+            expect(expectedFilledMakerTokenAmount).to.be.bignumber.equal(logArgs.filledMakerTokenAmount);
+            expect(expectedFilledTakerTokenAmount).to.be.bignumber.equal(logArgs.filledTakerTokenAmount);
+            expect(expectedFeeMPaid).to.be.bignumber.equal(logArgs.paidMakerFee);
+            expect(expectedFeeTPaid).to.be.bignumber.equal(logArgs.paidTakerFee);
+            expect(expectedTokens).to.be.equal(logArgs.tokens);
+            expect(order.params.orderHashHex).to.be.equal(logArgs.orderHash);
+        });
+
+        it('should log 1 event with the correct arguments when order has no feeRecipient', async () => {
+            order = await orderFactory.newSignedOrderAsync({
+                feeRecipient: ZeroEx.NULL_ADDRESS,
+            });
+            const divisor = 2;
+            const res = await exWrapper.fillOrderAsync(order, taker, {
+                fillTakerTokenAmount: order.params.takerTokenAmount.div(divisor),
+            });
+            expect(res.logs).to.have.length(1);
+
+            const logArgs = res.logs[0].args;
+            const expectedFilledMakerTokenAmount = order.params.makerTokenAmount.div(divisor);
+            const expectedFilledTakerTokenAmount = order.params.takerTokenAmount.div(divisor);
+            const expectedFeeMPaid = new BigNumber(0);
+            const expectedFeeTPaid = new BigNumber(0);
+            const tokensHashBuff = crypto.solSHA3([order.params.makerToken, order.params.takerToken]);
+            const expectedTokens = ethUtil.bufferToHex(tokensHashBuff);
+
+            expect(order.params.maker).to.be.equal(logArgs.maker);
+            expect(taker).to.be.equal(logArgs.taker);
+            expect(order.params.feeRecipient).to.be.equal(logArgs.feeRecipient);
+            expect(order.params.makerToken).to.be.equal(logArgs.makerToken);
+            expect(order.params.takerToken).to.be.equal(logArgs.takerToken);
+            expect(expectedFilledMakerTokenAmount).to.be.bignumber.equal(logArgs.filledMakerTokenAmount);
+            expect(expectedFilledTakerTokenAmount).to.be.bignumber.equal(logArgs.filledTakerTokenAmount);
+            expect(expectedFeeMPaid).to.be.bignumber.equal(logArgs.paidMakerFee);
+            expect(expectedFeeTPaid).to.be.bignumber.equal(logArgs.paidTakerFee);
+            expect(expectedTokens).to.be.equal(logArgs.tokens);
+            expect(order.params.orderHashHex).to.be.equal(logArgs.orderHash);
+        });
+
+        it('should throw when taker is specified and order is claimed by other', async () => {
+            order = await orderFactory.newSignedOrderAsync({
+                taker: feeRecipient,
+                makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
+                takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
+            });
+
+            return expect(exWrapper.fillOrderAsync(order, taker)).to.be.rejectedWith(constants.REVERT);
+        });
+
+        it('should throw if signature is invalid', async () => {
+            order = await orderFactory.newSignedOrderAsync({
+                makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(10), 18),
+            });
+
+            order.params.r = ethUtil.bufferToHex(ethUtil.sha3('invalidR'));
+            order.params.s = ethUtil.bufferToHex(ethUtil.sha3('invalidS'));
+            return expect(exWrapper.fillOrderAsync(order, taker)).to.be.rejectedWith(constants.REVERT);
+        });
+
+        it('should throw if makerTokenAmount is 0', async () => {
+            order = await orderFactory.newSignedOrderAsync({
+                makerTokenAmount: new BigNumber(0),
+            });
+
+            return expect(exWrapper.fillOrderAsync(order, taker)).to.be.rejectedWith(constants.REVERT);
+        });
+
+        it('should throw if takerTokenAmount is 0', async () => {
+            order = await orderFactory.newSignedOrderAsync({
+                takerTokenAmount: new BigNumber(0),
+            });
+
+            return expect(exWrapper.fillOrderAsync(order, taker)).to.be.rejectedWith(constants.REVERT);
+        });
+
+        it('should throw if fillTakerTokenAmount is 0', async () => {
+            order = await orderFactory.newSignedOrderAsync();
+
+            return expect(
+                exWrapper.fillOrderAsync(order, taker, {
+                    fillTakerTokenAmount: new BigNumber(0),
+                }),
+            ).to.be.rejectedWith(constants.REVERT);
+        });
+
+        it('should not change balances if maker balances are too low to fill order and \
                 shouldThrowOnInsufficientBalanceOrAllowance = false', async () => {
-			order = await orderFactory.newSignedOrderAsync({
-				makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100000), 18),
-			});
+            order = await orderFactory.newSignedOrderAsync({
+                makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100000), 18),
+            });
 
-			await exWrapper.fillOrderAsync(order, taker);
-			const newBalances = await dmyBalances.getAsync();
-			expect(newBalances).to.be.deep.equal(balances);
-		});
+            await exWrapper.fillOrderAsync(order, taker);
+            const newBalances = await dmyBalances.getAsync();
+            expect(newBalances).to.be.deep.equal(balances);
+        });
 
-		it('should throw if maker balances are too low to fill order and \
+        it('should throw if maker balances are too low to fill order and \
                 shouldThrowOnInsufficientBalanceOrAllowance = true', async () => {
-			order = await orderFactory.newSignedOrderAsync({
-				makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100000), 18),
-			});
-
-			return expect(
-				exWrapper.fillOrderAsync(order, taker, {
-					shouldThrowOnInsufficientBalanceOrAllowance: true,
-				}),
-			).to.be.rejectedWith(constants.REVERT);
-		});
-
-		it('should not change balances if taker balances are too low to fill order and \
+            order = await orderFactory.newSignedOrderAsync({
+                makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100000), 18),
+            });
+
+            return expect(
+                exWrapper.fillOrderAsync(order, taker, {
+                    shouldThrowOnInsufficientBalanceOrAllowance: true,
+                }),
+            ).to.be.rejectedWith(constants.REVERT);
+        });
+
+        it('should not change balances if taker balances are too low to fill order and \
                 shouldThrowOnInsufficientBalanceOrAllowance = false', async () => {
-			order = await orderFactory.newSignedOrderAsync({
-				takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100000), 18),
-			});
+            order = await orderFactory.newSignedOrderAsync({
+                takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100000), 18),
+            });
 
-			await exWrapper.fillOrderAsync(order, taker);
-			const newBalances = await dmyBalances.getAsync();
-			expect(newBalances).to.be.deep.equal(balances);
-		});
+            await exWrapper.fillOrderAsync(order, taker);
+            const newBalances = await dmyBalances.getAsync();
+            expect(newBalances).to.be.deep.equal(balances);
+        });
 
-		it('should throw if taker balances are too low to fill order and \
+        it('should throw if taker balances are too low to fill order and \
                 shouldThrowOnInsufficientBalanceOrAllowance = true', async () => {
-			order = await orderFactory.newSignedOrderAsync({
-				takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100000), 18),
-			});
-
-			return expect(
-				exWrapper.fillOrderAsync(order, taker, {
-					shouldThrowOnInsufficientBalanceOrAllowance: true,
-				}),
-			).to.be.rejectedWith(constants.REVERT);
-		});
-
-		it('should not change balances if maker allowances are too low to fill order and \
+            order = await orderFactory.newSignedOrderAsync({
+                takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100000), 18),
+            });
+
+            return expect(
+                exWrapper.fillOrderAsync(order, taker, {
+                    shouldThrowOnInsufficientBalanceOrAllowance: true,
+                }),
+            ).to.be.rejectedWith(constants.REVERT);
+        });
+
+        it('should not change balances if maker allowances are too low to fill order and \
                 shouldThrowOnInsufficientBalanceOrAllowance = false', async () => {
-			await rep.approve(TokenTransferProxy.address, 0, { from: maker });
-			await exWrapper.fillOrderAsync(order, taker);
-			await rep.approve(TokenTransferProxy.address, INITIAL_ALLOWANCE, {
-				from: maker,
-			});
+            await rep.approve(TokenTransferProxy.address, 0, { from: maker });
+            await exWrapper.fillOrderAsync(order, taker);
+            await rep.approve(TokenTransferProxy.address, INITIAL_ALLOWANCE, {
+                from: maker,
+            });
 
-			const newBalances = await dmyBalances.getAsync();
-			expect(newBalances).to.be.deep.equal(balances);
-		});
+            const newBalances = await dmyBalances.getAsync();
+            expect(newBalances).to.be.deep.equal(balances);
+        });
 
-		it('should throw if maker allowances are too low to fill order and \
+        it('should throw if maker allowances are too low to fill order and \
                 shouldThrowOnInsufficientBalanceOrAllowance = true', async () => {
-			await rep.approve(TokenTransferProxy.address, 0, { from: maker });
-			expect(
-				exWrapper.fillOrderAsync(order, taker, {
-					shouldThrowOnInsufficientBalanceOrAllowance: true,
-				}),
-			).to.be.rejectedWith(constants.REVERT);
-			await rep.approve(TokenTransferProxy.address, INITIAL_ALLOWANCE, {
-				from: maker,
-			});
-		});
-
-		it('should not change balances if taker allowances are too low to fill order and \
+            await rep.approve(TokenTransferProxy.address, 0, { from: maker });
+            expect(
+                exWrapper.fillOrderAsync(order, taker, {
+                    shouldThrowOnInsufficientBalanceOrAllowance: true,
+                }),
+            ).to.be.rejectedWith(constants.REVERT);
+            await rep.approve(TokenTransferProxy.address, INITIAL_ALLOWANCE, {
+                from: maker,
+            });
+        });
+
+        it('should not change balances if taker allowances are too low to fill order and \
                 shouldThrowOnInsufficientBalanceOrAllowance = false', async () => {
-			await dgd.approve(TokenTransferProxy.address, 0, { from: taker });
-			await exWrapper.fillOrderAsync(order, taker);
-			await dgd.approve(TokenTransferProxy.address, INITIAL_ALLOWANCE, {
-				from: taker,
-			});
+            await dgd.approve(TokenTransferProxy.address, 0, { from: taker });
+            await exWrapper.fillOrderAsync(order, taker);
+            await dgd.approve(TokenTransferProxy.address, INITIAL_ALLOWANCE, {
+                from: taker,
+            });
 
-			const newBalances = await dmyBalances.getAsync();
-			expect(newBalances).to.be.deep.equal(balances);
-		});
+            const newBalances = await dmyBalances.getAsync();
+            expect(newBalances).to.be.deep.equal(balances);
+        });
 
-		it('should throw if taker allowances are too low to fill order and \
+        it('should throw if taker allowances are too low to fill order and \
                 shouldThrowOnInsufficientBalanceOrAllowance = true', async () => {
-			await dgd.approve(TokenTransferProxy.address, 0, { from: taker });
-			expect(
-				exWrapper.fillOrderAsync(order, taker, {
-					shouldThrowOnInsufficientBalanceOrAllowance: true,
-				}),
-			).to.be.rejectedWith(constants.REVERT);
-			await dgd.approve(TokenTransferProxy.address, INITIAL_ALLOWANCE, {
-				from: taker,
-			});
-		});
-
-		it('should not change balances if makerToken is ZRX, makerTokenAmount + makerFee > maker balance, \
+            await dgd.approve(TokenTransferProxy.address, 0, { from: taker });
+            expect(
+                exWrapper.fillOrderAsync(order, taker, {
+                    shouldThrowOnInsufficientBalanceOrAllowance: true,
+                }),
+            ).to.be.rejectedWith(constants.REVERT);
+            await dgd.approve(TokenTransferProxy.address, INITIAL_ALLOWANCE, {
+                from: taker,
+            });
+        });
+
+        it('should not change balances if makerToken is ZRX, makerTokenAmount + makerFee > maker balance, \
                 and shouldThrowOnInsufficientBalanceOrAllowance = false', async () => {
-			const makerZRXBalance = new BigNumber(balances[maker][zrx.address]);
-			order = await orderFactory.newSignedOrderAsync({
-				makerToken: zrx.address,
-				makerTokenAmount: makerZRXBalance,
-				makerFee: new BigNumber(1),
-			});
-			await exWrapper.fillOrderAsync(order, taker);
-			const newBalances = await dmyBalances.getAsync();
-			expect(newBalances).to.be.deep.equal(balances);
-		});
-
-		it('should not change balances if makerToken is ZRX, makerTokenAmount + makerFee > maker allowance, \
+            const makerZRXBalance = new BigNumber(balances[maker][zrx.address]);
+            order = await orderFactory.newSignedOrderAsync({
+                makerToken: zrx.address,
+                makerTokenAmount: makerZRXBalance,
+                makerFee: new BigNumber(1),
+            });
+            await exWrapper.fillOrderAsync(order, taker);
+            const newBalances = await dmyBalances.getAsync();
+            expect(newBalances).to.be.deep.equal(balances);
+        });
+
+        it('should not change balances if makerToken is ZRX, makerTokenAmount + makerFee > maker allowance, \
                 and shouldThrowOnInsufficientBalanceOrAllowance = false', async () => {
-			const makerZRXAllowance = await zrx.allowance(maker, TokenTransferProxy.address);
-			order = await orderFactory.newSignedOrderAsync({
-				makerToken: zrx.address,
-				makerTokenAmount: new BigNumber(makerZRXAllowance),
-				makerFee: new BigNumber(1),
-			});
-			await exWrapper.fillOrderAsync(order, taker);
-			const newBalances = await dmyBalances.getAsync();
-			expect(newBalances).to.be.deep.equal(balances);
-		});
-
-		it('should not change balances if takerToken is ZRX, takerTokenAmount + takerFee > taker balance, \
+            const makerZRXAllowance = await zrx.allowance(maker, TokenTransferProxy.address);
+            order = await orderFactory.newSignedOrderAsync({
+                makerToken: zrx.address,
+                makerTokenAmount: new BigNumber(makerZRXAllowance),
+                makerFee: new BigNumber(1),
+            });
+            await exWrapper.fillOrderAsync(order, taker);
+            const newBalances = await dmyBalances.getAsync();
+            expect(newBalances).to.be.deep.equal(balances);
+        });
+
+        it('should not change balances if takerToken is ZRX, takerTokenAmount + takerFee > taker balance, \
                 and shouldThrowOnInsufficientBalanceOrAllowance = false', async () => {
-			const takerZRXBalance = new BigNumber(balances[taker][zrx.address]);
-			order = await orderFactory.newSignedOrderAsync({
-				takerToken: zrx.address,
-				takerTokenAmount: takerZRXBalance,
-				takerFee: new BigNumber(1),
-			});
-			await exWrapper.fillOrderAsync(order, taker);
-			const newBalances = await dmyBalances.getAsync();
-			expect(newBalances).to.be.deep.equal(balances);
-		});
-
-		it('should not change balances if takerToken is ZRX, takerTokenAmount + takerFee > taker allowance, \
+            const takerZRXBalance = new BigNumber(balances[taker][zrx.address]);
+            order = await orderFactory.newSignedOrderAsync({
+                takerToken: zrx.address,
+                takerTokenAmount: takerZRXBalance,
+                takerFee: new BigNumber(1),
+            });
+            await exWrapper.fillOrderAsync(order, taker);
+            const newBalances = await dmyBalances.getAsync();
+            expect(newBalances).to.be.deep.equal(balances);
+        });
+
+        it('should not change balances if takerToken is ZRX, takerTokenAmount + takerFee > taker allowance, \
                 and shouldThrowOnInsufficientBalanceOrAllowance = false', async () => {
-			const takerZRXAllowance = await zrx.allowance(taker, TokenTransferProxy.address);
-			order = await orderFactory.newSignedOrderAsync({
-				takerToken: zrx.address,
-				takerTokenAmount: new BigNumber(takerZRXAllowance),
-				takerFee: new BigNumber(1),
-			});
-			await exWrapper.fillOrderAsync(order, taker);
-			const newBalances = await dmyBalances.getAsync();
-			expect(newBalances).to.be.deep.equal(balances);
-		});
-
-		it('should throw if getBalance or getAllowance attempts to change state and \
+            const takerZRXAllowance = await zrx.allowance(taker, TokenTransferProxy.address);
+            order = await orderFactory.newSignedOrderAsync({
+                takerToken: zrx.address,
+                takerTokenAmount: new BigNumber(takerZRXAllowance),
+                takerFee: new BigNumber(1),
+            });
+            await exWrapper.fillOrderAsync(order, taker);
+            const newBalances = await dmyBalances.getAsync();
+            expect(newBalances).to.be.deep.equal(balances);
+        });
+
+        it('should throw if getBalance or getAllowance attempts to change state and \
                 shouldThrowOnInsufficientBalanceOrAllowance = false', async () => {
-			const maliciousToken = await MaliciousToken.new();
-			await maliciousToken.approve(TokenTransferProxy.address, INITIAL_ALLOWANCE, { from: taker });
-
-			order = await orderFactory.newSignedOrderAsync({
-				takerToken: maliciousToken.address,
-			});
-
-			return expect(
-				exWrapper.fillOrderAsync(order, taker, {
-					shouldThrowOnInsufficientBalanceOrAllowance: false,
-				}),
-			).to.be.rejectedWith(constants.REVERT);
-		});
-
-		it('should not change balances if an order is expired', async () => {
-			order = await orderFactory.newSignedOrderAsync({
-				expirationTimestampInSec: new BigNumber(Math.floor((Date.now() - 10000) / 1000)),
-			});
-			await exWrapper.fillOrderAsync(order, taker);
-
-			const newBalances = await dmyBalances.getAsync();
-			expect(newBalances).to.be.deep.equal(balances);
-		});
-
-		it('should log an error event if an order is expired', async () => {
-			order = await orderFactory.newSignedOrderAsync({
-				expirationTimestampInSec: new BigNumber(Math.floor((Date.now() - 10000) / 1000)),
-			});
-
-			const res = await exWrapper.fillOrderAsync(order, taker);
-			expect(res.logs).to.have.length(1);
-			const errCode = res.logs[0].args.errorId.toNumber();
-			expect(errCode).to.be.equal(ExchangeContractErrs.ERROR_ORDER_EXPIRED);
-		});
-
-		it('should log an error event if no value is filled', async () => {
-			await exWrapper.fillOrderAsync(order, taker);
-
-			const res = await exWrapper.fillOrderAsync(order, taker);
-			expect(res.logs).to.have.length(1);
-			const errCode = res.logs[0].args.errorId.toNumber();
-			expect(errCode).to.be.equal(ExchangeContractErrs.ERROR_ORDER_FULLY_FILLED_OR_CANCELLED);
-		});
-	});
-
-	describe('cancelOrder', () => {
-		beforeEach(async () => {
-			balances = await dmyBalances.getAsync();
-			order = await orderFactory.newSignedOrderAsync();
-		});
-
-		it('should throw if not sent by maker', async () => {
-			return expect(exWrapper.cancelOrderAsync(order, taker)).to.be.rejectedWith(constants.REVERT);
-		});
-
-		it('should throw if makerTokenAmount is 0', async () => {
-			order = await orderFactory.newSignedOrderAsync({
-				makerTokenAmount: new BigNumber(0),
-			});
-
-			return expect(exWrapper.cancelOrderAsync(order, maker)).to.be.rejectedWith(constants.REVERT);
-		});
-
-		it('should throw if takerTokenAmount is 0', async () => {
-			order = await orderFactory.newSignedOrderAsync({
-				takerTokenAmount: new BigNumber(0),
-			});
-
-			return expect(exWrapper.cancelOrderAsync(order, maker)).to.be.rejectedWith(constants.REVERT);
-		});
-
-		it('should throw if cancelTakerTokenAmount is 0', async () => {
-			order = await orderFactory.newSignedOrderAsync();
-
-			return expect(
-				exWrapper.cancelOrderAsync(order, maker, {
-					cancelTakerTokenAmount: new BigNumber(0),
-				}),
-			).to.be.rejectedWith(constants.REVERT);
-		});
-
-		it('should be able to cancel a full order', async () => {
-			await exWrapper.cancelOrderAsync(order, maker);
-			await exWrapper.fillOrderAsync(order, taker, {
-				fillTakerTokenAmount: order.params.takerTokenAmount.div(2),
-			});
-
-			const newBalances = await dmyBalances.getAsync();
-			expect(newBalances).to.be.deep.equal(balances);
-		});
-
-		it('should be able to cancel part of an order', async () => {
-			const cancelTakerTokenAmount = order.params.takerTokenAmount.div(2);
-			await exWrapper.cancelOrderAsync(order, maker, {
-				cancelTakerTokenAmount,
-			});
-
-			const res = await exWrapper.fillOrderAsync(order, taker, {
-				fillTakerTokenAmount: order.params.takerTokenAmount,
-			});
-			expect(res.logs[0].args.filledTakerTokenAmount).to.be.bignumber.equal(
-				order.params.takerTokenAmount.minus(cancelTakerTokenAmount),
-			);
-
-			const newBalances = await dmyBalances.getAsync();
-			const cancelMakerTokenAmount = cancelTakerTokenAmount
-				.times(order.params.makerTokenAmount)
-				.dividedToIntegerBy(order.params.takerTokenAmount);
-			const paidMakerFee = order.params.makerFee
-				.times(cancelMakerTokenAmount)
-				.dividedToIntegerBy(order.params.makerTokenAmount);
-			const paidTakerFee = order.params.takerFee
-				.times(cancelMakerTokenAmount)
-				.dividedToIntegerBy(order.params.makerTokenAmount);
-			expect(newBalances[maker][order.params.makerToken]).to.be.bignumber.equal(
-				balances[maker][order.params.makerToken].minus(cancelMakerTokenAmount),
-			);
-			expect(newBalances[maker][order.params.takerToken]).to.be.bignumber.equal(
-				balances[maker][order.params.takerToken].add(cancelTakerTokenAmount),
-			);
-			expect(newBalances[maker][zrx.address]).to.be.bignumber.equal(
-				balances[maker][zrx.address].minus(paidMakerFee),
-			);
-			expect(newBalances[taker][order.params.takerToken]).to.be.bignumber.equal(
-				balances[taker][order.params.takerToken].minus(cancelTakerTokenAmount),
-			);
-			expect(newBalances[taker][order.params.makerToken]).to.be.bignumber.equal(
-				balances[taker][order.params.makerToken].add(cancelMakerTokenAmount),
-			);
-			expect(newBalances[taker][zrx.address]).to.be.bignumber.equal(
-				balances[taker][zrx.address].minus(paidTakerFee),
-			);
-			expect(newBalances[feeRecipient][zrx.address]).to.be.bignumber.equal(
-				balances[feeRecipient][zrx.address].add(paidMakerFee.add(paidTakerFee)),
-			);
-		});
-
-		it('should log 1 event with correct arguments', async () => {
-			const divisor = 2;
-			const res = await exWrapper.cancelOrderAsync(order, maker, {
-				cancelTakerTokenAmount: order.params.takerTokenAmount.div(divisor),
-			});
-			expect(res.logs).to.have.length(1);
-
-			const logArgs = res.logs[0].args;
-			const expectedCancelledMakerTokenAmount = order.params.makerTokenAmount.div(divisor);
-			const expectedCancelledTakerTokenAmount = order.params.takerTokenAmount.div(divisor);
-			const tokensHashBuff = crypto.solSHA3([order.params.makerToken, order.params.takerToken]);
-			const expectedTokens = ethUtil.bufferToHex(tokensHashBuff);
-
-			expect(order.params.maker).to.be.equal(logArgs.maker);
-			expect(order.params.feeRecipient).to.be.equal(logArgs.feeRecipient);
-			expect(order.params.makerToken).to.be.equal(logArgs.makerToken);
-			expect(order.params.takerToken).to.be.equal(logArgs.takerToken);
-			expect(expectedCancelledMakerTokenAmount).to.be.bignumber.equal(logArgs.cancelledMakerTokenAmount);
-			expect(expectedCancelledTakerTokenAmount).to.be.bignumber.equal(logArgs.cancelledTakerTokenAmount);
-			expect(expectedTokens).to.be.equal(logArgs.tokens);
-			expect(order.params.orderHashHex).to.be.equal(logArgs.orderHash);
-		});
-
-		it('should not log events if no value is cancelled', async () => {
-			await exWrapper.cancelOrderAsync(order, maker);
-
-			const res = await exWrapper.cancelOrderAsync(order, maker);
-			expect(res.logs).to.have.length(1);
-			const errCode = res.logs[0].args.errorId.toNumber();
-			expect(errCode).to.be.equal(ExchangeContractErrs.ERROR_ORDER_FULLY_FILLED_OR_CANCELLED);
-		});
-
-		it('should not log events if order is expired', async () => {
-			order = await orderFactory.newSignedOrderAsync({
-				expirationTimestampInSec: new BigNumber(Math.floor((Date.now() - 10000) / 1000)),
-			});
-
-			const res = await exWrapper.cancelOrderAsync(order, maker);
-			expect(res.logs).to.have.length(1);
-			const errCode = res.logs[0].args.errorId.toNumber();
-			expect(errCode).to.be.equal(ExchangeContractErrs.ERROR_ORDER_EXPIRED);
-		});
-	});
+            const maliciousToken = await MaliciousToken.new();
+            await maliciousToken.approve(TokenTransferProxy.address, INITIAL_ALLOWANCE, { from: taker });
+
+            order = await orderFactory.newSignedOrderAsync({
+                takerToken: maliciousToken.address,
+            });
+
+            return expect(
+                exWrapper.fillOrderAsync(order, taker, {
+                    shouldThrowOnInsufficientBalanceOrAllowance: false,
+                }),
+            ).to.be.rejectedWith(constants.REVERT);
+        });
+
+        it('should not change balances if an order is expired', async () => {
+            order = await orderFactory.newSignedOrderAsync({
+                expirationTimestampInSec: new BigNumber(Math.floor((Date.now() - 10000) / 1000)),
+            });
+            await exWrapper.fillOrderAsync(order, taker);
+
+            const newBalances = await dmyBalances.getAsync();
+            expect(newBalances).to.be.deep.equal(balances);
+        });
+
+        it('should log an error event if an order is expired', async () => {
+            order = await orderFactory.newSignedOrderAsync({
+                expirationTimestampInSec: new BigNumber(Math.floor((Date.now() - 10000) / 1000)),
+            });
+
+            const res = await exWrapper.fillOrderAsync(order, taker);
+            expect(res.logs).to.have.length(1);
+            const errCode = res.logs[0].args.errorId.toNumber();
+            expect(errCode).to.be.equal(ExchangeContractErrs.ERROR_ORDER_EXPIRED);
+        });
+
+        it('should log an error event if no value is filled', async () => {
+            await exWrapper.fillOrderAsync(order, taker);
+
+            const res = await exWrapper.fillOrderAsync(order, taker);
+            expect(res.logs).to.have.length(1);
+            const errCode = res.logs[0].args.errorId.toNumber();
+            expect(errCode).to.be.equal(ExchangeContractErrs.ERROR_ORDER_FULLY_FILLED_OR_CANCELLED);
+        });
+    });
+
+    describe('cancelOrder', () => {
+        beforeEach(async () => {
+            balances = await dmyBalances.getAsync();
+            order = await orderFactory.newSignedOrderAsync();
+        });
+
+        it('should throw if not sent by maker', async () => {
+            return expect(exWrapper.cancelOrderAsync(order, taker)).to.be.rejectedWith(constants.REVERT);
+        });
+
+        it('should throw if makerTokenAmount is 0', async () => {
+            order = await orderFactory.newSignedOrderAsync({
+                makerTokenAmount: new BigNumber(0),
+            });
+
+            return expect(exWrapper.cancelOrderAsync(order, maker)).to.be.rejectedWith(constants.REVERT);
+        });
+
+        it('should throw if takerTokenAmount is 0', async () => {
+            order = await orderFactory.newSignedOrderAsync({
+                takerTokenAmount: new BigNumber(0),
+            });
+
+            return expect(exWrapper.cancelOrderAsync(order, maker)).to.be.rejectedWith(constants.REVERT);
+        });
+
+        it('should throw if cancelTakerTokenAmount is 0', async () => {
+            order = await orderFactory.newSignedOrderAsync();
+
+            return expect(
+                exWrapper.cancelOrderAsync(order, maker, {
+                    cancelTakerTokenAmount: new BigNumber(0),
+                }),
+            ).to.be.rejectedWith(constants.REVERT);
+        });
+
+        it('should be able to cancel a full order', async () => {
+            await exWrapper.cancelOrderAsync(order, maker);
+            await exWrapper.fillOrderAsync(order, taker, {
+                fillTakerTokenAmount: order.params.takerTokenAmount.div(2),
+            });
+
+            const newBalances = await dmyBalances.getAsync();
+            expect(newBalances).to.be.deep.equal(balances);
+        });
+
+        it('should be able to cancel part of an order', async () => {
+            const cancelTakerTokenAmount = order.params.takerTokenAmount.div(2);
+            await exWrapper.cancelOrderAsync(order, maker, {
+                cancelTakerTokenAmount,
+            });
+
+            const res = await exWrapper.fillOrderAsync(order, taker, {
+                fillTakerTokenAmount: order.params.takerTokenAmount,
+            });
+            expect(res.logs[0].args.filledTakerTokenAmount).to.be.bignumber.equal(
+                order.params.takerTokenAmount.minus(cancelTakerTokenAmount),
+            );
+
+            const newBalances = await dmyBalances.getAsync();
+            const cancelMakerTokenAmount = cancelTakerTokenAmount
+                .times(order.params.makerTokenAmount)
+                .dividedToIntegerBy(order.params.takerTokenAmount);
+            const paidMakerFee = order.params.makerFee
+                .times(cancelMakerTokenAmount)
+                .dividedToIntegerBy(order.params.makerTokenAmount);
+            const paidTakerFee = order.params.takerFee
+                .times(cancelMakerTokenAmount)
+                .dividedToIntegerBy(order.params.makerTokenAmount);
+            expect(newBalances[maker][order.params.makerToken]).to.be.bignumber.equal(
+                balances[maker][order.params.makerToken].minus(cancelMakerTokenAmount),
+            );
+            expect(newBalances[maker][order.params.takerToken]).to.be.bignumber.equal(
+                balances[maker][order.params.takerToken].add(cancelTakerTokenAmount),
+            );
+            expect(newBalances[maker][zrx.address]).to.be.bignumber.equal(
+                balances[maker][zrx.address].minus(paidMakerFee),
+            );
+            expect(newBalances[taker][order.params.takerToken]).to.be.bignumber.equal(
+                balances[taker][order.params.takerToken].minus(cancelTakerTokenAmount),
+            );
+            expect(newBalances[taker][order.params.makerToken]).to.be.bignumber.equal(
+                balances[taker][order.params.makerToken].add(cancelMakerTokenAmount),
+            );
+            expect(newBalances[taker][zrx.address]).to.be.bignumber.equal(
+                balances[taker][zrx.address].minus(paidTakerFee),
+            );
+            expect(newBalances[feeRecipient][zrx.address]).to.be.bignumber.equal(
+                balances[feeRecipient][zrx.address].add(paidMakerFee.add(paidTakerFee)),
+            );
+        });
+
+        it('should log 1 event with correct arguments', async () => {
+            const divisor = 2;
+            const res = await exWrapper.cancelOrderAsync(order, maker, {
+                cancelTakerTokenAmount: order.params.takerTokenAmount.div(divisor),
+            });
+            expect(res.logs).to.have.length(1);
+
+            const logArgs = res.logs[0].args;
+            const expectedCancelledMakerTokenAmount = order.params.makerTokenAmount.div(divisor);
+            const expectedCancelledTakerTokenAmount = order.params.takerTokenAmount.div(divisor);
+            const tokensHashBuff = crypto.solSHA3([order.params.makerToken, order.params.takerToken]);
+            const expectedTokens = ethUtil.bufferToHex(tokensHashBuff);
+
+            expect(order.params.maker).to.be.equal(logArgs.maker);
+            expect(order.params.feeRecipient).to.be.equal(logArgs.feeRecipient);
+            expect(order.params.makerToken).to.be.equal(logArgs.makerToken);
+            expect(order.params.takerToken).to.be.equal(logArgs.takerToken);
+            expect(expectedCancelledMakerTokenAmount).to.be.bignumber.equal(logArgs.cancelledMakerTokenAmount);
+            expect(expectedCancelledTakerTokenAmount).to.be.bignumber.equal(logArgs.cancelledTakerTokenAmount);
+            expect(expectedTokens).to.be.equal(logArgs.tokens);
+            expect(order.params.orderHashHex).to.be.equal(logArgs.orderHash);
+        });
+
+        it('should not log events if no value is cancelled', async () => {
+            await exWrapper.cancelOrderAsync(order, maker);
+
+            const res = await exWrapper.cancelOrderAsync(order, maker);
+            expect(res.logs).to.have.length(1);
+            const errCode = res.logs[0].args.errorId.toNumber();
+            expect(errCode).to.be.equal(ExchangeContractErrs.ERROR_ORDER_FULLY_FILLED_OR_CANCELLED);
+        });
+
+        it('should not log events if order is expired', async () => {
+            order = await orderFactory.newSignedOrderAsync({
+                expirationTimestampInSec: new BigNumber(Math.floor((Date.now() - 10000) / 1000)),
+            });
+
+            const res = await exWrapper.cancelOrderAsync(order, maker);
+            expect(res.logs).to.have.length(1);
+            const errCode = res.logs[0].args.errorId.toNumber();
+            expect(errCode).to.be.equal(ExchangeContractErrs.ERROR_ORDER_EXPIRED);
+        });
+    });
 }); // tslint:disable-line:max-file-line-count
diff --git a/packages/contracts/test/ts/exchange/helpers.ts b/packages/contracts/test/ts/exchange/helpers.ts
index 993b4c7d5..95f68e419 100644
--- a/packages/contracts/test/ts/exchange/helpers.ts
+++ b/packages/contracts/test/ts/exchange/helpers.ts
@@ -15,153 +15,153 @@ const expect = chai.expect;
 const { Exchange, TokenRegistry } = new Artifacts(artifacts);
 
 contract('Exchange', (accounts: string[]) => {
-	const maker = accounts[0];
-	const feeRecipient = accounts[1] || accounts[accounts.length - 1];
-
-	let order: Order;
-	let exchangeWrapper: ExchangeWrapper;
-	let orderFactory: OrderFactory;
-
-	before(async () => {
-		const [tokenRegistry, exchange] = await Promise.all([TokenRegistry.deployed(), Exchange.deployed()]);
-		exchangeWrapper = new ExchangeWrapper(exchange);
-		const [repAddress, dgdAddress] = await Promise.all([
-			tokenRegistry.getTokenAddressBySymbol('REP'),
-			tokenRegistry.getTokenAddressBySymbol('DGD'),
-		]);
-		const defaultOrderParams = {
-			exchangeContractAddress: Exchange.address,
-			maker,
-			feeRecipient,
-			makerToken: repAddress,
-			takerToken: dgdAddress,
-			makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
-			takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
-			makerFee: ZeroEx.toBaseUnitAmount(new BigNumber(1), 18),
-			takerFee: ZeroEx.toBaseUnitAmount(new BigNumber(1), 18),
-		};
-		orderFactory = new OrderFactory(defaultOrderParams);
-	});
-
-	beforeEach(async () => {
-		order = await orderFactory.newSignedOrderAsync();
-	});
-
-	describe('getOrderHash', () => {
-		it('should output the correct orderHash', async () => {
-			const orderHashHex = await exchangeWrapper.getOrderHashAsync(order);
-			expect(order.params.orderHashHex).to.be.equal(orderHashHex);
-		});
-	});
-
-	describe('isValidSignature', () => {
-		beforeEach(async () => {
-			order = await orderFactory.newSignedOrderAsync();
-		});
-
-		it('should return true with a valid signature', async () => {
-			const success = await exchangeWrapper.isValidSignatureAsync(order);
-			const isValidSignature = order.isValidSignature();
-			expect(isValidSignature).to.be.true();
-			expect(success).to.be.true();
-		});
-
-		it('should return false with an invalid signature', async () => {
-			order.params.r = ethUtil.bufferToHex(ethUtil.sha3('invalidR'));
-			order.params.s = ethUtil.bufferToHex(ethUtil.sha3('invalidS'));
-			const success = await exchangeWrapper.isValidSignatureAsync(order);
-			expect(order.isValidSignature()).to.be.false();
-			expect(success).to.be.false();
-		});
-	});
-
-	describe('isRoundingError', () => {
-		it('should return false 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 exchangeWrapper.isRoundingErrorAsync(numerator, denominator, target);
-			expect(isRoundingError).to.be.false();
-		});
-
-		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 exchangeWrapper.isRoundingErrorAsync(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 exchangeWrapper.isRoundingErrorAsync(numerator, denominator, target);
-			expect(isRoundingError).to.be.true();
-		});
-
-		it('should return true if there is a rounding error > 0.1%', async () => {
-			const numerator = new BigNumber(3);
-			const denominator = new BigNumber(7);
-			const target = new BigNumber(10);
-			// rounding error = ((3*10/7) - floor(3*10/7)) / (3*10/7) = 6.67%
-			const isRoundingError = await exchangeWrapper.isRoundingErrorAsync(numerator, denominator, target);
-			expect(isRoundingError).to.be.true();
-		});
-
-		it('should return false when there is no rounding error', async () => {
-			const numerator = new BigNumber(1);
-			const denominator = new BigNumber(2);
-			const target = new BigNumber(10);
-
-			const isRoundingError = await exchangeWrapper.isRoundingErrorAsync(numerator, denominator, target);
-			expect(isRoundingError).to.be.false();
-		});
-
-		it('should return false when there is rounding error <= 0.1%', async () => {
-			// randomly generated numbers
-			const numerator = new BigNumber(76564);
-			const denominator = new BigNumber(676373677);
-			const target = new BigNumber(105762562);
-			// rounding error = ((76564*105762562/676373677) - floor(76564*105762562/676373677)) /
-			// (76564*105762562/676373677) = 0.0007%
-			const isRoundingError = await exchangeWrapper.isRoundingErrorAsync(numerator, denominator, target);
-			expect(isRoundingError).to.be.false();
-		});
-	});
-
-	describe('getPartialAmount', () => {
-		it('should return the numerator/denominator*target', async () => {
-			const numerator = new BigNumber(1);
-			const denominator = new BigNumber(2);
-			const target = new BigNumber(10);
-
-			const partialAmount = await exchangeWrapper.getPartialAmountAsync(numerator, denominator, target);
-			const expectedPartialAmount = 5;
-			expect(partialAmount).to.be.bignumber.equal(expectedPartialAmount);
-		});
-
-		it('should round down', async () => {
-			const numerator = new BigNumber(2);
-			const denominator = new BigNumber(3);
-			const target = new BigNumber(10);
-
-			const partialAmount = await exchangeWrapper.getPartialAmountAsync(numerator, denominator, target);
-			const expectedPartialAmount = 6;
-			expect(partialAmount).to.be.bignumber.equal(expectedPartialAmount);
-		});
-
-		it('should round .5 down', async () => {
-			const numerator = new BigNumber(1);
-			const denominator = new BigNumber(20);
-			const target = new BigNumber(10);
-
-			const partialAmount = await exchangeWrapper.getPartialAmountAsync(numerator, denominator, target);
-			const expectedPartialAmount = 0;
-			expect(partialAmount).to.be.bignumber.equal(expectedPartialAmount);
-		});
-	});
+    const maker = accounts[0];
+    const feeRecipient = accounts[1] || accounts[accounts.length - 1];
+
+    let order: Order;
+    let exchangeWrapper: ExchangeWrapper;
+    let orderFactory: OrderFactory;
+
+    before(async () => {
+        const [tokenRegistry, exchange] = await Promise.all([TokenRegistry.deployed(), Exchange.deployed()]);
+        exchangeWrapper = new ExchangeWrapper(exchange);
+        const [repAddress, dgdAddress] = await Promise.all([
+            tokenRegistry.getTokenAddressBySymbol('REP'),
+            tokenRegistry.getTokenAddressBySymbol('DGD'),
+        ]);
+        const defaultOrderParams = {
+            exchangeContractAddress: Exchange.address,
+            maker,
+            feeRecipient,
+            makerToken: repAddress,
+            takerToken: dgdAddress,
+            makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
+            takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
+            makerFee: ZeroEx.toBaseUnitAmount(new BigNumber(1), 18),
+            takerFee: ZeroEx.toBaseUnitAmount(new BigNumber(1), 18),
+        };
+        orderFactory = new OrderFactory(defaultOrderParams);
+    });
+
+    beforeEach(async () => {
+        order = await orderFactory.newSignedOrderAsync();
+    });
+
+    describe('getOrderHash', () => {
+        it('should output the correct orderHash', async () => {
+            const orderHashHex = await exchangeWrapper.getOrderHashAsync(order);
+            expect(order.params.orderHashHex).to.be.equal(orderHashHex);
+        });
+    });
+
+    describe('isValidSignature', () => {
+        beforeEach(async () => {
+            order = await orderFactory.newSignedOrderAsync();
+        });
+
+        it('should return true with a valid signature', async () => {
+            const success = await exchangeWrapper.isValidSignatureAsync(order);
+            const isValidSignature = order.isValidSignature();
+            expect(isValidSignature).to.be.true();
+            expect(success).to.be.true();
+        });
+
+        it('should return false with an invalid signature', async () => {
+            order.params.r = ethUtil.bufferToHex(ethUtil.sha3('invalidR'));
+            order.params.s = ethUtil.bufferToHex(ethUtil.sha3('invalidS'));
+            const success = await exchangeWrapper.isValidSignatureAsync(order);
+            expect(order.isValidSignature()).to.be.false();
+            expect(success).to.be.false();
+        });
+    });
+
+    describe('isRoundingError', () => {
+        it('should return false 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 exchangeWrapper.isRoundingErrorAsync(numerator, denominator, target);
+            expect(isRoundingError).to.be.false();
+        });
+
+        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 exchangeWrapper.isRoundingErrorAsync(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 exchangeWrapper.isRoundingErrorAsync(numerator, denominator, target);
+            expect(isRoundingError).to.be.true();
+        });
+
+        it('should return true if there is a rounding error > 0.1%', async () => {
+            const numerator = new BigNumber(3);
+            const denominator = new BigNumber(7);
+            const target = new BigNumber(10);
+            // rounding error = ((3*10/7) - floor(3*10/7)) / (3*10/7) = 6.67%
+            const isRoundingError = await exchangeWrapper.isRoundingErrorAsync(numerator, denominator, target);
+            expect(isRoundingError).to.be.true();
+        });
+
+        it('should return false when there is no rounding error', async () => {
+            const numerator = new BigNumber(1);
+            const denominator = new BigNumber(2);
+            const target = new BigNumber(10);
+
+            const isRoundingError = await exchangeWrapper.isRoundingErrorAsync(numerator, denominator, target);
+            expect(isRoundingError).to.be.false();
+        });
+
+        it('should return false when there is rounding error <= 0.1%', async () => {
+            // randomly generated numbers
+            const numerator = new BigNumber(76564);
+            const denominator = new BigNumber(676373677);
+            const target = new BigNumber(105762562);
+            // rounding error = ((76564*105762562/676373677) - floor(76564*105762562/676373677)) /
+            // (76564*105762562/676373677) = 0.0007%
+            const isRoundingError = await exchangeWrapper.isRoundingErrorAsync(numerator, denominator, target);
+            expect(isRoundingError).to.be.false();
+        });
+    });
+
+    describe('getPartialAmount', () => {
+        it('should return the numerator/denominator*target', async () => {
+            const numerator = new BigNumber(1);
+            const denominator = new BigNumber(2);
+            const target = new BigNumber(10);
+
+            const partialAmount = await exchangeWrapper.getPartialAmountAsync(numerator, denominator, target);
+            const expectedPartialAmount = 5;
+            expect(partialAmount).to.be.bignumber.equal(expectedPartialAmount);
+        });
+
+        it('should round down', async () => {
+            const numerator = new BigNumber(2);
+            const denominator = new BigNumber(3);
+            const target = new BigNumber(10);
+
+            const partialAmount = await exchangeWrapper.getPartialAmountAsync(numerator, denominator, target);
+            const expectedPartialAmount = 6;
+            expect(partialAmount).to.be.bignumber.equal(expectedPartialAmount);
+        });
+
+        it('should round .5 down', async () => {
+            const numerator = new BigNumber(1);
+            const denominator = new BigNumber(20);
+            const target = new BigNumber(10);
+
+            const partialAmount = await exchangeWrapper.getPartialAmountAsync(numerator, denominator, target);
+            const expectedPartialAmount = 0;
+            expect(partialAmount).to.be.bignumber.equal(expectedPartialAmount);
+        });
+    });
 });
diff --git a/packages/contracts/test/ts/exchange/wrapper.ts b/packages/contracts/test/ts/exchange/wrapper.ts
index e0243fc1b..e69e08bcf 100644
--- a/packages/contracts/test/ts/exchange/wrapper.ts
+++ b/packages/contracts/test/ts/exchange/wrapper.ts
@@ -17,332 +17,332 @@ const expect = chai.expect;
 const { Exchange, TokenTransferProxy, DummyToken, TokenRegistry } = new Artifacts(artifacts);
 
 contract('Exchange', (accounts: string[]) => {
-	const maker = accounts[0];
-	const tokenOwner = accounts[0];
-	const taker = accounts[1] || accounts[accounts.length - 1];
-	const feeRecipient = accounts[2] || accounts[accounts.length - 1];
-
-	const INIT_BAL = ZeroEx.toBaseUnitAmount(new BigNumber(10000), 18);
-	const INIT_ALLOW = ZeroEx.toBaseUnitAmount(new BigNumber(10000), 18);
-
-	let rep: ContractInstance;
-	let dgd: ContractInstance;
-	let zrx: ContractInstance;
-	let exchange: ContractInstance;
-	let tokenRegistry: ContractInstance;
-
-	let balances: BalancesByOwner;
-
-	let exWrapper: ExchangeWrapper;
-	let dmyBalances: Balances;
-	let orderFactory: OrderFactory;
-
-	before(async () => {
-		[tokenRegistry, exchange] = await Promise.all([TokenRegistry.deployed(), Exchange.deployed()]);
-		exWrapper = new ExchangeWrapper(exchange);
-		const [repAddress, dgdAddress, zrxAddress] = await Promise.all([
-			tokenRegistry.getTokenAddressBySymbol('REP'),
-			tokenRegistry.getTokenAddressBySymbol('DGD'),
-			tokenRegistry.getTokenAddressBySymbol('ZRX'),
-		]);
-
-		const defaultOrderParams = {
-			exchangeContractAddress: Exchange.address,
-			maker,
-			feeRecipient,
-			makerToken: repAddress,
-			takerToken: dgdAddress,
-			makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
-			takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
-			makerFee: ZeroEx.toBaseUnitAmount(new BigNumber(1), 18),
-			takerFee: ZeroEx.toBaseUnitAmount(new BigNumber(1), 18),
-		};
-		orderFactory = new OrderFactory(defaultOrderParams);
-
-		[rep, dgd, zrx] = await Promise.all([
-			DummyToken.at(repAddress),
-			DummyToken.at(dgdAddress),
-			DummyToken.at(zrxAddress),
-		]);
-		dmyBalances = new Balances([rep, dgd, zrx], [maker, taker, feeRecipient]);
-		await Promise.all([
-			rep.approve(TokenTransferProxy.address, INIT_ALLOW, { from: maker }),
-			rep.approve(TokenTransferProxy.address, INIT_ALLOW, { from: taker }),
-			rep.setBalance(maker, INIT_BAL, { from: tokenOwner }),
-			rep.setBalance(taker, INIT_BAL, { from: tokenOwner }),
-			dgd.approve(TokenTransferProxy.address, INIT_ALLOW, { from: maker }),
-			dgd.approve(TokenTransferProxy.address, INIT_ALLOW, { from: taker }),
-			dgd.setBalance(maker, INIT_BAL, { from: tokenOwner }),
-			dgd.setBalance(taker, INIT_BAL, { from: tokenOwner }),
-			zrx.approve(TokenTransferProxy.address, INIT_ALLOW, { from: maker }),
-			zrx.approve(TokenTransferProxy.address, INIT_ALLOW, { from: taker }),
-			zrx.setBalance(maker, INIT_BAL, { from: tokenOwner }),
-			zrx.setBalance(taker, INIT_BAL, { from: tokenOwner }),
-		]);
-	});
-
-	describe('fillOrKillOrder', () => {
-		beforeEach(async () => {
-			balances = await dmyBalances.getAsync();
-		});
-
-		it('should transfer the correct amounts', async () => {
-			const order = await orderFactory.newSignedOrderAsync({
-				makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
-				takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
-			});
-			const fillTakerTokenAmount = order.params.takerTokenAmount.div(2);
-			await exWrapper.fillOrKillOrderAsync(order, taker, {
-				fillTakerTokenAmount,
-			});
-
-			const newBalances = await dmyBalances.getAsync();
-
-			const fillMakerTokenAmount = fillTakerTokenAmount
-				.times(order.params.makerTokenAmount)
-				.dividedToIntegerBy(order.params.takerTokenAmount);
-			const makerFee = order.params.makerFee
-				.times(fillMakerTokenAmount)
-				.dividedToIntegerBy(order.params.makerTokenAmount);
-			const takerFee = order.params.takerFee
-				.times(fillMakerTokenAmount)
-				.dividedToIntegerBy(order.params.makerTokenAmount);
-			expect(newBalances[maker][order.params.makerToken]).to.be.bignumber.equal(
-				balances[maker][order.params.makerToken].minus(fillMakerTokenAmount),
-			);
-			expect(newBalances[maker][order.params.takerToken]).to.be.bignumber.equal(
-				balances[maker][order.params.takerToken].add(fillTakerTokenAmount),
-			);
-			expect(newBalances[maker][zrx.address]).to.be.bignumber.equal(balances[maker][zrx.address].minus(makerFee));
-			expect(newBalances[taker][order.params.takerToken]).to.be.bignumber.equal(
-				balances[taker][order.params.takerToken].minus(fillTakerTokenAmount),
-			);
-			expect(newBalances[taker][order.params.makerToken]).to.be.bignumber.equal(
-				balances[taker][order.params.makerToken].add(fillMakerTokenAmount),
-			);
-			expect(newBalances[taker][zrx.address]).to.be.bignumber.equal(balances[taker][zrx.address].minus(takerFee));
-			expect(newBalances[feeRecipient][zrx.address]).to.be.bignumber.equal(
-				balances[feeRecipient][zrx.address].add(makerFee.add(takerFee)),
-			);
-		});
-
-		it('should throw if an order is expired', async () => {
-			const order = await orderFactory.newSignedOrderAsync({
-				expirationTimestampInSec: new BigNumber(Math.floor((Date.now() - 10000) / 1000)),
-			});
-
-			return expect(exWrapper.fillOrKillOrderAsync(order, taker)).to.be.rejectedWith(constants.REVERT);
-		});
-
-		it('should throw if entire fillTakerTokenAmount not filled', async () => {
-			const order = await orderFactory.newSignedOrderAsync();
-
-			const from = taker;
-			await exWrapper.fillOrderAsync(order, from, {
-				fillTakerTokenAmount: order.params.takerTokenAmount.div(2),
-			});
-
-			return expect(exWrapper.fillOrKillOrderAsync(order, taker)).to.be.rejectedWith(constants.REVERT);
-		});
-	});
-
-	describe('batch functions', () => {
-		let orders: Order[];
-		beforeEach(async () => {
-			orders = await Promise.all([
-				orderFactory.newSignedOrderAsync(),
-				orderFactory.newSignedOrderAsync(),
-				orderFactory.newSignedOrderAsync(),
-			]);
-			balances = await dmyBalances.getAsync();
-		});
-
-		describe('batchFillOrders', () => {
-			it('should transfer the correct amounts', async () => {
-				const fillTakerTokenAmounts: BigNumber[] = [];
-				const makerToken = rep.address;
-				const takerToken = dgd.address;
-				orders.forEach(order => {
-					const fillTakerTokenAmount = order.params.takerTokenAmount.div(2);
-					const fillMakerTokenAmount = fillTakerTokenAmount
-						.times(order.params.makerTokenAmount)
-						.dividedToIntegerBy(order.params.takerTokenAmount);
-					const makerFee = order.params.makerFee
-						.times(fillMakerTokenAmount)
-						.dividedToIntegerBy(order.params.makerTokenAmount);
-					const takerFee = order.params.takerFee
-						.times(fillMakerTokenAmount)
-						.dividedToIntegerBy(order.params.makerTokenAmount);
-					fillTakerTokenAmounts.push(fillTakerTokenAmount);
-					balances[maker][makerToken] = balances[maker][makerToken].minus(fillMakerTokenAmount);
-					balances[maker][takerToken] = balances[maker][takerToken].add(fillTakerTokenAmount);
-					balances[maker][zrx.address] = balances[maker][zrx.address].minus(makerFee);
-					balances[taker][makerToken] = balances[taker][makerToken].add(fillMakerTokenAmount);
-					balances[taker][takerToken] = balances[taker][takerToken].minus(fillTakerTokenAmount);
-					balances[taker][zrx.address] = balances[taker][zrx.address].minus(takerFee);
-					balances[feeRecipient][zrx.address] = balances[feeRecipient][zrx.address].add(
-						makerFee.add(takerFee),
-					);
-				});
-
-				await exWrapper.batchFillOrdersAsync(orders, taker, {
-					fillTakerTokenAmounts,
-				});
-
-				const newBalances = await dmyBalances.getAsync();
-				expect(newBalances).to.be.deep.equal(balances);
-			});
-		});
-
-		describe('batchFillOrKillOrders', () => {
-			it('should transfer the correct amounts', async () => {
-				const fillTakerTokenAmounts: BigNumber[] = [];
-				const makerToken = rep.address;
-				const takerToken = dgd.address;
-				orders.forEach(order => {
-					const fillTakerTokenAmount = order.params.takerTokenAmount.div(2);
-					const fillMakerTokenAmount = fillTakerTokenAmount
-						.times(order.params.makerTokenAmount)
-						.dividedToIntegerBy(order.params.takerTokenAmount);
-					const makerFee = order.params.makerFee
-						.times(fillMakerTokenAmount)
-						.dividedToIntegerBy(order.params.makerTokenAmount);
-					const takerFee = order.params.takerFee
-						.times(fillMakerTokenAmount)
-						.dividedToIntegerBy(order.params.makerTokenAmount);
-					fillTakerTokenAmounts.push(fillTakerTokenAmount);
-					balances[maker][makerToken] = balances[maker][makerToken].minus(fillMakerTokenAmount);
-					balances[maker][takerToken] = balances[maker][takerToken].add(fillTakerTokenAmount);
-					balances[maker][zrx.address] = balances[maker][zrx.address].minus(makerFee);
-					balances[taker][makerToken] = balances[taker][makerToken].add(fillMakerTokenAmount);
-					balances[taker][takerToken] = balances[taker][takerToken].minus(fillTakerTokenAmount);
-					balances[taker][zrx.address] = balances[taker][zrx.address].minus(takerFee);
-					balances[feeRecipient][zrx.address] = balances[feeRecipient][zrx.address].add(
-						makerFee.add(takerFee),
-					);
-				});
-
-				await exWrapper.batchFillOrKillOrdersAsync(orders, taker, {
-					fillTakerTokenAmounts,
-				});
-
-				const newBalances = await dmyBalances.getAsync();
-				expect(newBalances).to.be.deep.equal(balances);
-			});
-
-			it('should throw if a single order does not fill the expected amount', async () => {
-				const fillTakerTokenAmounts: BigNumber[] = [];
-				orders.forEach(order => {
-					const fillTakerTokenAmount = order.params.takerTokenAmount.div(2);
-					fillTakerTokenAmounts.push(fillTakerTokenAmount);
-				});
-
-				await exWrapper.fillOrKillOrderAsync(orders[0], taker);
-
-				return expect(
-					exWrapper.batchFillOrKillOrdersAsync(orders, taker, {
-						fillTakerTokenAmounts,
-					}),
-				).to.be.rejectedWith(constants.REVERT);
-			});
-		});
-
-		describe('fillOrdersUpTo', () => {
-			it('should stop when the entire fillTakerTokenAmount is filled', async () => {
-				const fillTakerTokenAmount = orders[0].params.takerTokenAmount.plus(
-					orders[1].params.takerTokenAmount.div(2),
-				);
-				await exWrapper.fillOrdersUpToAsync(orders, taker, {
-					fillTakerTokenAmount,
-				});
-
-				const newBalances = await dmyBalances.getAsync();
-
-				const fillMakerTokenAmount = orders[0].params.makerTokenAmount.add(
-					orders[1].params.makerTokenAmount.dividedToIntegerBy(2),
-				);
-				const makerFee = orders[0].params.makerFee.add(orders[1].params.makerFee.dividedToIntegerBy(2));
-				const takerFee = orders[0].params.takerFee.add(orders[1].params.takerFee.dividedToIntegerBy(2));
-				expect(newBalances[maker][orders[0].params.makerToken]).to.be.bignumber.equal(
-					balances[maker][orders[0].params.makerToken].minus(fillMakerTokenAmount),
-				);
-				expect(newBalances[maker][orders[0].params.takerToken]).to.be.bignumber.equal(
-					balances[maker][orders[0].params.takerToken].add(fillTakerTokenAmount),
-				);
-				expect(newBalances[maker][zrx.address]).to.be.bignumber.equal(
-					balances[maker][zrx.address].minus(makerFee),
-				);
-				expect(newBalances[taker][orders[0].params.takerToken]).to.be.bignumber.equal(
-					balances[taker][orders[0].params.takerToken].minus(fillTakerTokenAmount),
-				);
-				expect(newBalances[taker][orders[0].params.makerToken]).to.be.bignumber.equal(
-					balances[taker][orders[0].params.makerToken].add(fillMakerTokenAmount),
-				);
-				expect(newBalances[taker][zrx.address]).to.be.bignumber.equal(
-					balances[taker][zrx.address].minus(takerFee),
-				);
-				expect(newBalances[feeRecipient][zrx.address]).to.be.bignumber.equal(
-					balances[feeRecipient][zrx.address].add(makerFee.add(takerFee)),
-				);
-			});
-
-			it('should fill all orders if cannot fill entire fillTakerTokenAmount', async () => {
-				const fillTakerTokenAmount = ZeroEx.toBaseUnitAmount(new BigNumber(100000), 18);
-				orders.forEach(order => {
-					balances[maker][order.params.makerToken] = balances[maker][order.params.makerToken].minus(
-						order.params.makerTokenAmount,
-					);
-					balances[maker][order.params.takerToken] = balances[maker][order.params.takerToken].add(
-						order.params.takerTokenAmount,
-					);
-					balances[maker][zrx.address] = balances[maker][zrx.address].minus(order.params.makerFee);
-					balances[taker][order.params.makerToken] = balances[taker][order.params.makerToken].add(
-						order.params.makerTokenAmount,
-					);
-					balances[taker][order.params.takerToken] = balances[taker][order.params.takerToken].minus(
-						order.params.takerTokenAmount,
-					);
-					balances[taker][zrx.address] = balances[taker][zrx.address].minus(order.params.takerFee);
-					balances[feeRecipient][zrx.address] = balances[feeRecipient][zrx.address].add(
-						order.params.makerFee.add(order.params.takerFee),
-					);
-				});
-				await exWrapper.fillOrdersUpToAsync(orders, taker, {
-					fillTakerTokenAmount,
-				});
-
-				const newBalances = await dmyBalances.getAsync();
-				expect(newBalances).to.be.deep.equal(balances);
-			});
-
-			it('should throw when an order does not use the same takerToken', async () => {
-				orders = await Promise.all([
-					orderFactory.newSignedOrderAsync(),
-					orderFactory.newSignedOrderAsync({ takerToken: zrx.address }),
-					orderFactory.newSignedOrderAsync(),
-				]);
-
-				return expect(
-					exWrapper.fillOrdersUpToAsync(orders, taker, {
-						fillTakerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(1000), 18),
-					}),
-				).to.be.rejectedWith(constants.REVERT);
-			});
-		});
-
-		describe('batchCancelOrders', () => {
-			it('should be able to cancel multiple orders', async () => {
-				const cancelTakerTokenAmounts = _.map(orders, order => order.params.takerTokenAmount);
-				await exWrapper.batchCancelOrdersAsync(orders, maker, {
-					cancelTakerTokenAmounts,
-				});
-
-				await exWrapper.batchFillOrdersAsync(orders, taker, {
-					fillTakerTokenAmounts: cancelTakerTokenAmounts,
-				});
-				const newBalances = await dmyBalances.getAsync();
-				expect(balances).to.be.deep.equal(newBalances);
-			});
-		});
-	});
+    const maker = accounts[0];
+    const tokenOwner = accounts[0];
+    const taker = accounts[1] || accounts[accounts.length - 1];
+    const feeRecipient = accounts[2] || accounts[accounts.length - 1];
+
+    const INIT_BAL = ZeroEx.toBaseUnitAmount(new BigNumber(10000), 18);
+    const INIT_ALLOW = ZeroEx.toBaseUnitAmount(new BigNumber(10000), 18);
+
+    let rep: ContractInstance;
+    let dgd: ContractInstance;
+    let zrx: ContractInstance;
+    let exchange: ContractInstance;
+    let tokenRegistry: ContractInstance;
+
+    let balances: BalancesByOwner;
+
+    let exWrapper: ExchangeWrapper;
+    let dmyBalances: Balances;
+    let orderFactory: OrderFactory;
+
+    before(async () => {
+        [tokenRegistry, exchange] = await Promise.all([TokenRegistry.deployed(), Exchange.deployed()]);
+        exWrapper = new ExchangeWrapper(exchange);
+        const [repAddress, dgdAddress, zrxAddress] = await Promise.all([
+            tokenRegistry.getTokenAddressBySymbol('REP'),
+            tokenRegistry.getTokenAddressBySymbol('DGD'),
+            tokenRegistry.getTokenAddressBySymbol('ZRX'),
+        ]);
+
+        const defaultOrderParams = {
+            exchangeContractAddress: Exchange.address,
+            maker,
+            feeRecipient,
+            makerToken: repAddress,
+            takerToken: dgdAddress,
+            makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
+            takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
+            makerFee: ZeroEx.toBaseUnitAmount(new BigNumber(1), 18),
+            takerFee: ZeroEx.toBaseUnitAmount(new BigNumber(1), 18),
+        };
+        orderFactory = new OrderFactory(defaultOrderParams);
+
+        [rep, dgd, zrx] = await Promise.all([
+            DummyToken.at(repAddress),
+            DummyToken.at(dgdAddress),
+            DummyToken.at(zrxAddress),
+        ]);
+        dmyBalances = new Balances([rep, dgd, zrx], [maker, taker, feeRecipient]);
+        await Promise.all([
+            rep.approve(TokenTransferProxy.address, INIT_ALLOW, { from: maker }),
+            rep.approve(TokenTransferProxy.address, INIT_ALLOW, { from: taker }),
+            rep.setBalance(maker, INIT_BAL, { from: tokenOwner }),
+            rep.setBalance(taker, INIT_BAL, { from: tokenOwner }),
+            dgd.approve(TokenTransferProxy.address, INIT_ALLOW, { from: maker }),
+            dgd.approve(TokenTransferProxy.address, INIT_ALLOW, { from: taker }),
+            dgd.setBalance(maker, INIT_BAL, { from: tokenOwner }),
+            dgd.setBalance(taker, INIT_BAL, { from: tokenOwner }),
+            zrx.approve(TokenTransferProxy.address, INIT_ALLOW, { from: maker }),
+            zrx.approve(TokenTransferProxy.address, INIT_ALLOW, { from: taker }),
+            zrx.setBalance(maker, INIT_BAL, { from: tokenOwner }),
+            zrx.setBalance(taker, INIT_BAL, { from: tokenOwner }),
+        ]);
+    });
+
+    describe('fillOrKillOrder', () => {
+        beforeEach(async () => {
+            balances = await dmyBalances.getAsync();
+        });
+
+        it('should transfer the correct amounts', async () => {
+            const order = await orderFactory.newSignedOrderAsync({
+                makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
+                takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
+            });
+            const fillTakerTokenAmount = order.params.takerTokenAmount.div(2);
+            await exWrapper.fillOrKillOrderAsync(order, taker, {
+                fillTakerTokenAmount,
+            });
+
+            const newBalances = await dmyBalances.getAsync();
+
+            const fillMakerTokenAmount = fillTakerTokenAmount
+                .times(order.params.makerTokenAmount)
+                .dividedToIntegerBy(order.params.takerTokenAmount);
+            const makerFee = order.params.makerFee
+                .times(fillMakerTokenAmount)
+                .dividedToIntegerBy(order.params.makerTokenAmount);
+            const takerFee = order.params.takerFee
+                .times(fillMakerTokenAmount)
+                .dividedToIntegerBy(order.params.makerTokenAmount);
+            expect(newBalances[maker][order.params.makerToken]).to.be.bignumber.equal(
+                balances[maker][order.params.makerToken].minus(fillMakerTokenAmount),
+            );
+            expect(newBalances[maker][order.params.takerToken]).to.be.bignumber.equal(
+                balances[maker][order.params.takerToken].add(fillTakerTokenAmount),
+            );
+            expect(newBalances[maker][zrx.address]).to.be.bignumber.equal(balances[maker][zrx.address].minus(makerFee));
+            expect(newBalances[taker][order.params.takerToken]).to.be.bignumber.equal(
+                balances[taker][order.params.takerToken].minus(fillTakerTokenAmount),
+            );
+            expect(newBalances[taker][order.params.makerToken]).to.be.bignumber.equal(
+                balances[taker][order.params.makerToken].add(fillMakerTokenAmount),
+            );
+            expect(newBalances[taker][zrx.address]).to.be.bignumber.equal(balances[taker][zrx.address].minus(takerFee));
+            expect(newBalances[feeRecipient][zrx.address]).to.be.bignumber.equal(
+                balances[feeRecipient][zrx.address].add(makerFee.add(takerFee)),
+            );
+        });
+
+        it('should throw if an order is expired', async () => {
+            const order = await orderFactory.newSignedOrderAsync({
+                expirationTimestampInSec: new BigNumber(Math.floor((Date.now() - 10000) / 1000)),
+            });
+
+            return expect(exWrapper.fillOrKillOrderAsync(order, taker)).to.be.rejectedWith(constants.REVERT);
+        });
+
+        it('should throw if entire fillTakerTokenAmount not filled', async () => {
+            const order = await orderFactory.newSignedOrderAsync();
+
+            const from = taker;
+            await exWrapper.fillOrderAsync(order, from, {
+                fillTakerTokenAmount: order.params.takerTokenAmount.div(2),
+            });
+
+            return expect(exWrapper.fillOrKillOrderAsync(order, taker)).to.be.rejectedWith(constants.REVERT);
+        });
+    });
+
+    describe('batch functions', () => {
+        let orders: Order[];
+        beforeEach(async () => {
+            orders = await Promise.all([
+                orderFactory.newSignedOrderAsync(),
+                orderFactory.newSignedOrderAsync(),
+                orderFactory.newSignedOrderAsync(),
+            ]);
+            balances = await dmyBalances.getAsync();
+        });
+
+        describe('batchFillOrders', () => {
+            it('should transfer the correct amounts', async () => {
+                const fillTakerTokenAmounts: BigNumber[] = [];
+                const makerToken = rep.address;
+                const takerToken = dgd.address;
+                orders.forEach(order => {
+                    const fillTakerTokenAmount = order.params.takerTokenAmount.div(2);
+                    const fillMakerTokenAmount = fillTakerTokenAmount
+                        .times(order.params.makerTokenAmount)
+                        .dividedToIntegerBy(order.params.takerTokenAmount);
+                    const makerFee = order.params.makerFee
+                        .times(fillMakerTokenAmount)
+                        .dividedToIntegerBy(order.params.makerTokenAmount);
+                    const takerFee = order.params.takerFee
+                        .times(fillMakerTokenAmount)
+                        .dividedToIntegerBy(order.params.makerTokenAmount);
+                    fillTakerTokenAmounts.push(fillTakerTokenAmount);
+                    balances[maker][makerToken] = balances[maker][makerToken].minus(fillMakerTokenAmount);
+                    balances[maker][takerToken] = balances[maker][takerToken].add(fillTakerTokenAmount);
+                    balances[maker][zrx.address] = balances[maker][zrx.address].minus(makerFee);
+                    balances[taker][makerToken] = balances[taker][makerToken].add(fillMakerTokenAmount);
+                    balances[taker][takerToken] = balances[taker][takerToken].minus(fillTakerTokenAmount);
+                    balances[taker][zrx.address] = balances[taker][zrx.address].minus(takerFee);
+                    balances[feeRecipient][zrx.address] = balances[feeRecipient][zrx.address].add(
+                        makerFee.add(takerFee),
+                    );
+                });
+
+                await exWrapper.batchFillOrdersAsync(orders, taker, {
+                    fillTakerTokenAmounts,
+                });
+
+                const newBalances = await dmyBalances.getAsync();
+                expect(newBalances).to.be.deep.equal(balances);
+            });
+        });
+
+        describe('batchFillOrKillOrders', () => {
+            it('should transfer the correct amounts', async () => {
+                const fillTakerTokenAmounts: BigNumber[] = [];
+                const makerToken = rep.address;
+                const takerToken = dgd.address;
+                orders.forEach(order => {
+                    const fillTakerTokenAmount = order.params.takerTokenAmount.div(2);
+                    const fillMakerTokenAmount = fillTakerTokenAmount
+                        .times(order.params.makerTokenAmount)
+                        .dividedToIntegerBy(order.params.takerTokenAmount);
+                    const makerFee = order.params.makerFee
+                        .times(fillMakerTokenAmount)
+                        .dividedToIntegerBy(order.params.makerTokenAmount);
+                    const takerFee = order.params.takerFee
+                        .times(fillMakerTokenAmount)
+                        .dividedToIntegerBy(order.params.makerTokenAmount);
+                    fillTakerTokenAmounts.push(fillTakerTokenAmount);
+                    balances[maker][makerToken] = balances[maker][makerToken].minus(fillMakerTokenAmount);
+                    balances[maker][takerToken] = balances[maker][takerToken].add(fillTakerTokenAmount);
+                    balances[maker][zrx.address] = balances[maker][zrx.address].minus(makerFee);
+                    balances[taker][makerToken] = balances[taker][makerToken].add(fillMakerTokenAmount);
+                    balances[taker][takerToken] = balances[taker][takerToken].minus(fillTakerTokenAmount);
+                    balances[taker][zrx.address] = balances[taker][zrx.address].minus(takerFee);
+                    balances[feeRecipient][zrx.address] = balances[feeRecipient][zrx.address].add(
+                        makerFee.add(takerFee),
+                    );
+                });
+
+                await exWrapper.batchFillOrKillOrdersAsync(orders, taker, {
+                    fillTakerTokenAmounts,
+                });
+
+                const newBalances = await dmyBalances.getAsync();
+                expect(newBalances).to.be.deep.equal(balances);
+            });
+
+            it('should throw if a single order does not fill the expected amount', async () => {
+                const fillTakerTokenAmounts: BigNumber[] = [];
+                orders.forEach(order => {
+                    const fillTakerTokenAmount = order.params.takerTokenAmount.div(2);
+                    fillTakerTokenAmounts.push(fillTakerTokenAmount);
+                });
+
+                await exWrapper.fillOrKillOrderAsync(orders[0], taker);
+
+                return expect(
+                    exWrapper.batchFillOrKillOrdersAsync(orders, taker, {
+                        fillTakerTokenAmounts,
+                    }),
+                ).to.be.rejectedWith(constants.REVERT);
+            });
+        });
+
+        describe('fillOrdersUpTo', () => {
+            it('should stop when the entire fillTakerTokenAmount is filled', async () => {
+                const fillTakerTokenAmount = orders[0].params.takerTokenAmount.plus(
+                    orders[1].params.takerTokenAmount.div(2),
+                );
+                await exWrapper.fillOrdersUpToAsync(orders, taker, {
+                    fillTakerTokenAmount,
+                });
+
+                const newBalances = await dmyBalances.getAsync();
+
+                const fillMakerTokenAmount = orders[0].params.makerTokenAmount.add(
+                    orders[1].params.makerTokenAmount.dividedToIntegerBy(2),
+                );
+                const makerFee = orders[0].params.makerFee.add(orders[1].params.makerFee.dividedToIntegerBy(2));
+                const takerFee = orders[0].params.takerFee.add(orders[1].params.takerFee.dividedToIntegerBy(2));
+                expect(newBalances[maker][orders[0].params.makerToken]).to.be.bignumber.equal(
+                    balances[maker][orders[0].params.makerToken].minus(fillMakerTokenAmount),
+                );
+                expect(newBalances[maker][orders[0].params.takerToken]).to.be.bignumber.equal(
+                    balances[maker][orders[0].params.takerToken].add(fillTakerTokenAmount),
+                );
+                expect(newBalances[maker][zrx.address]).to.be.bignumber.equal(
+                    balances[maker][zrx.address].minus(makerFee),
+                );
+                expect(newBalances[taker][orders[0].params.takerToken]).to.be.bignumber.equal(
+                    balances[taker][orders[0].params.takerToken].minus(fillTakerTokenAmount),
+                );
+                expect(newBalances[taker][orders[0].params.makerToken]).to.be.bignumber.equal(
+                    balances[taker][orders[0].params.makerToken].add(fillMakerTokenAmount),
+                );
+                expect(newBalances[taker][zrx.address]).to.be.bignumber.equal(
+                    balances[taker][zrx.address].minus(takerFee),
+                );
+                expect(newBalances[feeRecipient][zrx.address]).to.be.bignumber.equal(
+                    balances[feeRecipient][zrx.address].add(makerFee.add(takerFee)),
+                );
+            });
+
+            it('should fill all orders if cannot fill entire fillTakerTokenAmount', async () => {
+                const fillTakerTokenAmount = ZeroEx.toBaseUnitAmount(new BigNumber(100000), 18);
+                orders.forEach(order => {
+                    balances[maker][order.params.makerToken] = balances[maker][order.params.makerToken].minus(
+                        order.params.makerTokenAmount,
+                    );
+                    balances[maker][order.params.takerToken] = balances[maker][order.params.takerToken].add(
+                        order.params.takerTokenAmount,
+                    );
+                    balances[maker][zrx.address] = balances[maker][zrx.address].minus(order.params.makerFee);
+                    balances[taker][order.params.makerToken] = balances[taker][order.params.makerToken].add(
+                        order.params.makerTokenAmount,
+                    );
+                    balances[taker][order.params.takerToken] = balances[taker][order.params.takerToken].minus(
+                        order.params.takerTokenAmount,
+                    );
+                    balances[taker][zrx.address] = balances[taker][zrx.address].minus(order.params.takerFee);
+                    balances[feeRecipient][zrx.address] = balances[feeRecipient][zrx.address].add(
+                        order.params.makerFee.add(order.params.takerFee),
+                    );
+                });
+                await exWrapper.fillOrdersUpToAsync(orders, taker, {
+                    fillTakerTokenAmount,
+                });
+
+                const newBalances = await dmyBalances.getAsync();
+                expect(newBalances).to.be.deep.equal(balances);
+            });
+
+            it('should throw when an order does not use the same takerToken', async () => {
+                orders = await Promise.all([
+                    orderFactory.newSignedOrderAsync(),
+                    orderFactory.newSignedOrderAsync({ takerToken: zrx.address }),
+                    orderFactory.newSignedOrderAsync(),
+                ]);
+
+                return expect(
+                    exWrapper.fillOrdersUpToAsync(orders, taker, {
+                        fillTakerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(1000), 18),
+                    }),
+                ).to.be.rejectedWith(constants.REVERT);
+            });
+        });
+
+        describe('batchCancelOrders', () => {
+            it('should be able to cancel multiple orders', async () => {
+                const cancelTakerTokenAmounts = _.map(orders, order => order.params.takerTokenAmount);
+                await exWrapper.batchCancelOrdersAsync(orders, maker, {
+                    cancelTakerTokenAmounts,
+                });
+
+                await exWrapper.batchFillOrdersAsync(orders, taker, {
+                    fillTakerTokenAmounts: cancelTakerTokenAmounts,
+                });
+                const newBalances = await dmyBalances.getAsync();
+                expect(balances).to.be.deep.equal(newBalances);
+            });
+        });
+    });
 });
diff --git a/packages/contracts/test/ts/multi_sig_with_time_lock.ts b/packages/contracts/test/ts/multi_sig_with_time_lock.ts
index fa2028437..ea939a758 100644
--- a/packages/contracts/test/ts/multi_sig_with_time_lock.ts
+++ b/packages/contracts/test/ts/multi_sig_with_time_lock.ts
@@ -23,93 +23,93 @@ const expect = chai.expect;
 const web3: Web3 = (global as any).web3;
 
 contract('MultiSigWalletWithTimeLock', (accounts: string[]) => {
-	const owners = [accounts[0], accounts[1]];
-	const SECONDS_TIME_LOCKED = 10000;
-
-	let multiSig: ContractInstance;
-	let multiSigWrapper: MultiSigWrapper;
-	let txId: number;
-	let initialSecondsTimeLocked: number;
-	let rpc: RPC;
-
-	before(async () => {
-		multiSig = await MultiSigWalletWithTimeLock.deployed();
-		multiSigWrapper = new MultiSigWrapper(multiSig);
-
-		const secondsTimeLocked = await multiSig.secondsTimeLocked.call();
-		initialSecondsTimeLocked = secondsTimeLocked.toNumber();
-		const rpcUrl = `http://${truffleConf.networks.development.host}:${truffleConf.networks.development.port}`;
-		rpc = new RPC(rpcUrl);
-	});
-
-	describe('changeTimeLock', () => {
-		it('should throw when not called by wallet', async () => {
-			return expect(multiSig.changeTimeLock(SECONDS_TIME_LOCKED, { from: owners[0] })).to.be.rejectedWith(
-				constants.REVERT,
-			);
-		});
-
-		it('should throw without enough confirmations', async () => {
-			const destination = multiSig.address;
-			const from = owners[0];
-			const dataParams = {
-				name: 'changeTimeLock',
-				abi: MULTI_SIG_ABI,
-				args: [SECONDS_TIME_LOCKED],
-			};
-			const subRes = await multiSigWrapper.submitTransactionAsync(destination, from, dataParams);
-
-			txId = subRes.logs[0].args.transactionId.toNumber();
-			return expect(multiSig.executeTransaction(txId)).to.be.rejectedWith(constants.REVERT);
-		});
-
-		it('should set confirmation time with enough confirmations', async () => {
-			const res = await multiSig.confirmTransaction(txId, { from: owners[1] });
-			expect(res.logs).to.have.length(2);
-			const blockNum = await promisify<number>(web3.eth.getBlockNumber)();
-			const blockInfo = await promisify<Web3.BlockWithoutTransactionData>(web3.eth.getBlock)(blockNum);
-			const timestamp = new BigNumber(blockInfo.timestamp);
-			const confirmationTimeBigNum = new BigNumber(await multiSig.confirmationTimes.call(txId));
-
-			expect(timestamp).to.be.bignumber.equal(confirmationTimeBigNum);
-		});
-
-		it('should be executable with enough confirmations and secondsTimeLocked of 0', async () => {
-			expect(initialSecondsTimeLocked).to.be.equal(0);
-
-			const res = await multiSig.executeTransaction(txId);
-			expect(res.logs).to.have.length(2);
-
-			const secondsTimeLocked = new BigNumber(await multiSig.secondsTimeLocked.call());
-			expect(secondsTimeLocked).to.be.bignumber.equal(SECONDS_TIME_LOCKED);
-		});
-
-		const newSecondsTimeLocked = 0;
-		it('should throw if it has enough confirmations but is not past the time lock', async () => {
-			const destination = multiSig.address;
-			const from = owners[0];
-			const dataParams = {
-				name: 'changeTimeLock',
-				abi: MULTI_SIG_ABI,
-				args: [newSecondsTimeLocked],
-			};
-			const subRes = await multiSigWrapper.submitTransactionAsync(destination, from, dataParams);
-
-			txId = subRes.logs[0].args.transactionId.toNumber();
-			const confRes = await multiSig.confirmTransaction(txId, {
-				from: owners[1],
-			});
-			expect(confRes.logs).to.have.length(2);
-
-			return expect(multiSig.executeTransaction(txId)).to.be.rejectedWith(constants.REVERT);
-		});
-
-		it('should execute if it has enough confirmations and is past the time lock', async () => {
-			await rpc.increaseTimeAsync(SECONDS_TIME_LOCKED);
-			await multiSig.executeTransaction(txId);
-
-			const secondsTimeLocked = new BigNumber(await multiSig.secondsTimeLocked.call());
-			expect(secondsTimeLocked).to.be.bignumber.equal(newSecondsTimeLocked);
-		});
-	});
+    const owners = [accounts[0], accounts[1]];
+    const SECONDS_TIME_LOCKED = 10000;
+
+    let multiSig: ContractInstance;
+    let multiSigWrapper: MultiSigWrapper;
+    let txId: number;
+    let initialSecondsTimeLocked: number;
+    let rpc: RPC;
+
+    before(async () => {
+        multiSig = await MultiSigWalletWithTimeLock.deployed();
+        multiSigWrapper = new MultiSigWrapper(multiSig);
+
+        const secondsTimeLocked = await multiSig.secondsTimeLocked.call();
+        initialSecondsTimeLocked = secondsTimeLocked.toNumber();
+        const rpcUrl = `http://${truffleConf.networks.development.host}:${truffleConf.networks.development.port}`;
+        rpc = new RPC(rpcUrl);
+    });
+
+    describe('changeTimeLock', () => {
+        it('should throw when not called by wallet', async () => {
+            return expect(multiSig.changeTimeLock(SECONDS_TIME_LOCKED, { from: owners[0] })).to.be.rejectedWith(
+                constants.REVERT,
+            );
+        });
+
+        it('should throw without enough confirmations', async () => {
+            const destination = multiSig.address;
+            const from = owners[0];
+            const dataParams = {
+                name: 'changeTimeLock',
+                abi: MULTI_SIG_ABI,
+                args: [SECONDS_TIME_LOCKED],
+            };
+            const subRes = await multiSigWrapper.submitTransactionAsync(destination, from, dataParams);
+
+            txId = subRes.logs[0].args.transactionId.toNumber();
+            return expect(multiSig.executeTransaction(txId)).to.be.rejectedWith(constants.REVERT);
+        });
+
+        it('should set confirmation time with enough confirmations', async () => {
+            const res = await multiSig.confirmTransaction(txId, { from: owners[1] });
+            expect(res.logs).to.have.length(2);
+            const blockNum = await promisify<number>(web3.eth.getBlockNumber)();
+            const blockInfo = await promisify<Web3.BlockWithoutTransactionData>(web3.eth.getBlock)(blockNum);
+            const timestamp = new BigNumber(blockInfo.timestamp);
+            const confirmationTimeBigNum = new BigNumber(await multiSig.confirmationTimes.call(txId));
+
+            expect(timestamp).to.be.bignumber.equal(confirmationTimeBigNum);
+        });
+
+        it('should be executable with enough confirmations and secondsTimeLocked of 0', async () => {
+            expect(initialSecondsTimeLocked).to.be.equal(0);
+
+            const res = await multiSig.executeTransaction(txId);
+            expect(res.logs).to.have.length(2);
+
+            const secondsTimeLocked = new BigNumber(await multiSig.secondsTimeLocked.call());
+            expect(secondsTimeLocked).to.be.bignumber.equal(SECONDS_TIME_LOCKED);
+        });
+
+        const newSecondsTimeLocked = 0;
+        it('should throw if it has enough confirmations but is not past the time lock', async () => {
+            const destination = multiSig.address;
+            const from = owners[0];
+            const dataParams = {
+                name: 'changeTimeLock',
+                abi: MULTI_SIG_ABI,
+                args: [newSecondsTimeLocked],
+            };
+            const subRes = await multiSigWrapper.submitTransactionAsync(destination, from, dataParams);
+
+            txId = subRes.logs[0].args.transactionId.toNumber();
+            const confRes = await multiSig.confirmTransaction(txId, {
+                from: owners[1],
+            });
+            expect(confRes.logs).to.have.length(2);
+
+            return expect(multiSig.executeTransaction(txId)).to.be.rejectedWith(constants.REVERT);
+        });
+
+        it('should execute if it has enough confirmations and is past the time lock', async () => {
+            await rpc.increaseTimeAsync(SECONDS_TIME_LOCKED);
+            await multiSig.executeTransaction(txId);
+
+            const secondsTimeLocked = new BigNumber(await multiSig.secondsTimeLocked.call());
+            expect(secondsTimeLocked).to.be.bignumber.equal(newSecondsTimeLocked);
+        });
+    });
 });
diff --git a/packages/contracts/test/ts/multi_sig_with_time_lock_except_remove_auth_addr.ts b/packages/contracts/test/ts/multi_sig_with_time_lock_except_remove_auth_addr.ts
index 9211cb1b6..62aa625fe 100644
--- a/packages/contracts/test/ts/multi_sig_with_time_lock_except_remove_auth_addr.ts
+++ b/packages/contracts/test/ts/multi_sig_with_time_lock_except_remove_auth_addr.ts
@@ -15,136 +15,136 @@ chaiSetup.configure();
 const expect = chai.expect;
 
 contract('MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress', (accounts: string[]) => {
-	const owners = [accounts[0], accounts[1]];
-	const requiredApprovals = 2;
-	const SECONDS_TIME_LOCKED = 1000000;
-
-	// initialize fake addresses
-	const authorizedAddress = `0x${crypto
-		.solSHA3([accounts[0]])
-		.slice(0, 20)
-		.toString('hex')}`;
-	const unauthorizedAddress = `0x${crypto
-		.solSHA3([accounts[1]])
-		.slice(0, 20)
-		.toString('hex')}`;
-
-	let tokenTransferProxy: ContractInstance;
-	let multiSig: ContractInstance;
-	let multiSigWrapper: MultiSigWrapper;
-
-	let validDestination: string;
-
-	beforeEach(async () => {
-		const initialOwner = accounts[0];
-		tokenTransferProxy = await TokenTransferProxy.new({ from: initialOwner });
-		await tokenTransferProxy.addAuthorizedAddress(authorizedAddress, {
-			from: initialOwner,
-		});
-		multiSig = await MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.new(
-			owners,
-			requiredApprovals,
-			SECONDS_TIME_LOCKED,
-			tokenTransferProxy.address,
-		);
-		await tokenTransferProxy.transferOwnership(multiSig.address, {
-			from: initialOwner,
-		});
-		multiSigWrapper = new MultiSigWrapper(multiSig);
-		validDestination = tokenTransferProxy.address;
-	});
-
-	describe('isFunctionRemoveAuthorizedAddress', () => {
-		it('should throw if data is not for removeAuthorizedAddress', async () => {
-			const data = MultiSigWrapper.encodeFnArgs('addAuthorizedAddress', PROXY_ABI, [owners[0]]);
-			return expect(multiSig.isFunctionRemoveAuthorizedAddress.call(data)).to.be.rejectedWith(constants.REVERT);
-		});
-
-		it('should return true if data is for removeAuthorizedAddress', async () => {
-			const data = MultiSigWrapper.encodeFnArgs('removeAuthorizedAddress', PROXY_ABI, [owners[0]]);
-			const isFunctionRemoveAuthorizedAddress = await multiSig.isFunctionRemoveAuthorizedAddress.call(data);
-			expect(isFunctionRemoveAuthorizedAddress).to.be.true();
-		});
-	});
-
-	describe('executeRemoveAuthorizedAddress', () => {
-		it('should throw without the required confirmations', async () => {
-			const dataParams: TransactionDataParams = {
-				name: 'removeAuthorizedAddress',
-				abi: PROXY_ABI,
-				args: [authorizedAddress],
-			};
-			const res = await multiSigWrapper.submitTransactionAsync(validDestination, owners[0], dataParams);
-			const txId = res.logs[0].args.transactionId.toString();
-
-			return expect(multiSig.executeRemoveAuthorizedAddress(txId)).to.be.rejectedWith(constants.REVERT);
-		});
-
-		it('should throw if tx destination is not the tokenTransferProxy', async () => {
-			const invalidTokenTransferProxy = await TokenTransferProxy.new();
-			const invalidDestination = invalidTokenTransferProxy.address;
-			const dataParams: TransactionDataParams = {
-				name: 'removeAuthorizedAddress',
-				abi: PROXY_ABI,
-				args: [authorizedAddress],
-			};
-			const res = await multiSigWrapper.submitTransactionAsync(invalidDestination, owners[0], dataParams);
-			const txId = res.logs[0].args.transactionId.toString();
-			await multiSig.confirmTransaction(txId, { from: owners[1] });
-			const isConfirmed = await multiSig.isConfirmed.call(txId);
-			expect(isConfirmed).to.be.true();
-
-			return expect(multiSig.executeRemoveAuthorizedAddress(txId)).to.be.rejectedWith(constants.REVERT);
-		});
-
-		it('should throw if tx data is not for removeAuthorizedAddress', async () => {
-			const dataParams: TransactionDataParams = {
-				name: 'addAuthorizedAddress',
-				abi: PROXY_ABI,
-				args: [unauthorizedAddress],
-			};
-			const res = await multiSigWrapper.submitTransactionAsync(validDestination, owners[0], dataParams);
-			const txId = res.logs[0].args.transactionId.toString();
-			await multiSig.confirmTransaction(txId, { from: owners[1] });
-			const isConfirmed = await multiSig.isConfirmed.call(txId);
-			expect(isConfirmed).to.be.true();
-
-			return expect(multiSig.executeRemoveAuthorizedAddress(txId)).to.be.rejectedWith(constants.REVERT);
-		});
-
-		it('should execute removeAuthorizedAddress for valid tokenTransferProxy if fully confirmed', async () => {
-			const dataParams: TransactionDataParams = {
-				name: 'removeAuthorizedAddress',
-				abi: PROXY_ABI,
-				args: [authorizedAddress],
-			};
-			const res = await multiSigWrapper.submitTransactionAsync(validDestination, owners[0], dataParams);
-			const txId = res.logs[0].args.transactionId.toString();
-			await multiSig.confirmTransaction(txId, { from: owners[1] });
-			const isConfirmed = await multiSig.isConfirmed.call(txId);
-			expect(isConfirmed).to.be.true();
-			await multiSig.executeRemoveAuthorizedAddress(txId);
-
-			const isAuthorized = await tokenTransferProxy.authorized.call(authorizedAddress);
-			expect(isAuthorized).to.be.false();
-		});
-
-		it('should throw if already executed', async () => {
-			const dataParams: TransactionDataParams = {
-				name: 'removeAuthorizedAddress',
-				abi: PROXY_ABI,
-				args: [authorizedAddress],
-			};
-			const res = await multiSigWrapper.submitTransactionAsync(validDestination, owners[0], dataParams);
-			const txId = res.logs[0].args.transactionId.toString();
-			await multiSig.confirmTransaction(txId, { from: owners[1] });
-			const isConfirmed = await multiSig.isConfirmed.call(txId);
-			expect(isConfirmed).to.be.true();
-			await multiSig.executeRemoveAuthorizedAddress(txId);
-			const tx = await multiSig.transactions.call(txId);
-			const isExecuted = tx[3];
-			expect(isExecuted).to.be.true();
-			return expect(multiSig.executeRemoveAuthorizedAddress(txId)).to.be.rejectedWith(constants.REVERT);
-		});
-	});
+    const owners = [accounts[0], accounts[1]];
+    const requiredApprovals = 2;
+    const SECONDS_TIME_LOCKED = 1000000;
+
+    // initialize fake addresses
+    const authorizedAddress = `0x${crypto
+        .solSHA3([accounts[0]])
+        .slice(0, 20)
+        .toString('hex')}`;
+    const unauthorizedAddress = `0x${crypto
+        .solSHA3([accounts[1]])
+        .slice(0, 20)
+        .toString('hex')}`;
+
+    let tokenTransferProxy: ContractInstance;
+    let multiSig: ContractInstance;
+    let multiSigWrapper: MultiSigWrapper;
+
+    let validDestination: string;
+
+    beforeEach(async () => {
+        const initialOwner = accounts[0];
+        tokenTransferProxy = await TokenTransferProxy.new({ from: initialOwner });
+        await tokenTransferProxy.addAuthorizedAddress(authorizedAddress, {
+            from: initialOwner,
+        });
+        multiSig = await MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.new(
+            owners,
+            requiredApprovals,
+            SECONDS_TIME_LOCKED,
+            tokenTransferProxy.address,
+        );
+        await tokenTransferProxy.transferOwnership(multiSig.address, {
+            from: initialOwner,
+        });
+        multiSigWrapper = new MultiSigWrapper(multiSig);
+        validDestination = tokenTransferProxy.address;
+    });
+
+    describe('isFunctionRemoveAuthorizedAddress', () => {
+        it('should throw if data is not for removeAuthorizedAddress', async () => {
+            const data = MultiSigWrapper.encodeFnArgs('addAuthorizedAddress', PROXY_ABI, [owners[0]]);
+            return expect(multiSig.isFunctionRemoveAuthorizedAddress.call(data)).to.be.rejectedWith(constants.REVERT);
+        });
+
+        it('should return true if data is for removeAuthorizedAddress', async () => {
+            const data = MultiSigWrapper.encodeFnArgs('removeAuthorizedAddress', PROXY_ABI, [owners[0]]);
+            const isFunctionRemoveAuthorizedAddress = await multiSig.isFunctionRemoveAuthorizedAddress.call(data);
+            expect(isFunctionRemoveAuthorizedAddress).to.be.true();
+        });
+    });
+
+    describe('executeRemoveAuthorizedAddress', () => {
+        it('should throw without the required confirmations', async () => {
+            const dataParams: TransactionDataParams = {
+                name: 'removeAuthorizedAddress',
+                abi: PROXY_ABI,
+                args: [authorizedAddress],
+            };
+            const res = await multiSigWrapper.submitTransactionAsync(validDestination, owners[0], dataParams);
+            const txId = res.logs[0].args.transactionId.toString();
+
+            return expect(multiSig.executeRemoveAuthorizedAddress(txId)).to.be.rejectedWith(constants.REVERT);
+        });
+
+        it('should throw if tx destination is not the tokenTransferProxy', async () => {
+            const invalidTokenTransferProxy = await TokenTransferProxy.new();
+            const invalidDestination = invalidTokenTransferProxy.address;
+            const dataParams: TransactionDataParams = {
+                name: 'removeAuthorizedAddress',
+                abi: PROXY_ABI,
+                args: [authorizedAddress],
+            };
+            const res = await multiSigWrapper.submitTransactionAsync(invalidDestination, owners[0], dataParams);
+            const txId = res.logs[0].args.transactionId.toString();
+            await multiSig.confirmTransaction(txId, { from: owners[1] });
+            const isConfirmed = await multiSig.isConfirmed.call(txId);
+            expect(isConfirmed).to.be.true();
+
+            return expect(multiSig.executeRemoveAuthorizedAddress(txId)).to.be.rejectedWith(constants.REVERT);
+        });
+
+        it('should throw if tx data is not for removeAuthorizedAddress', async () => {
+            const dataParams: TransactionDataParams = {
+                name: 'addAuthorizedAddress',
+                abi: PROXY_ABI,
+                args: [unauthorizedAddress],
+            };
+            const res = await multiSigWrapper.submitTransactionAsync(validDestination, owners[0], dataParams);
+            const txId = res.logs[0].args.transactionId.toString();
+            await multiSig.confirmTransaction(txId, { from: owners[1] });
+            const isConfirmed = await multiSig.isConfirmed.call(txId);
+            expect(isConfirmed).to.be.true();
+
+            return expect(multiSig.executeRemoveAuthorizedAddress(txId)).to.be.rejectedWith(constants.REVERT);
+        });
+
+        it('should execute removeAuthorizedAddress for valid tokenTransferProxy if fully confirmed', async () => {
+            const dataParams: TransactionDataParams = {
+                name: 'removeAuthorizedAddress',
+                abi: PROXY_ABI,
+                args: [authorizedAddress],
+            };
+            const res = await multiSigWrapper.submitTransactionAsync(validDestination, owners[0], dataParams);
+            const txId = res.logs[0].args.transactionId.toString();
+            await multiSig.confirmTransaction(txId, { from: owners[1] });
+            const isConfirmed = await multiSig.isConfirmed.call(txId);
+            expect(isConfirmed).to.be.true();
+            await multiSig.executeRemoveAuthorizedAddress(txId);
+
+            const isAuthorized = await tokenTransferProxy.authorized.call(authorizedAddress);
+            expect(isAuthorized).to.be.false();
+        });
+
+        it('should throw if already executed', async () => {
+            const dataParams: TransactionDataParams = {
+                name: 'removeAuthorizedAddress',
+                abi: PROXY_ABI,
+                args: [authorizedAddress],
+            };
+            const res = await multiSigWrapper.submitTransactionAsync(validDestination, owners[0], dataParams);
+            const txId = res.logs[0].args.transactionId.toString();
+            await multiSig.confirmTransaction(txId, { from: owners[1] });
+            const isConfirmed = await multiSig.isConfirmed.call(txId);
+            expect(isConfirmed).to.be.true();
+            await multiSig.executeRemoveAuthorizedAddress(txId);
+            const tx = await multiSig.transactions.call(txId);
+            const isExecuted = tx[3];
+            expect(isExecuted).to.be.true();
+            return expect(multiSig.executeRemoveAuthorizedAddress(txId)).to.be.rejectedWith(constants.REVERT);
+        });
+    });
 });
diff --git a/packages/contracts/test/ts/token_registry.ts b/packages/contracts/test/ts/token_registry.ts
index fadb276da..d1c551565 100644
--- a/packages/contracts/test/ts/token_registry.ts
+++ b/packages/contracts/test/ts/token_registry.ts
@@ -15,220 +15,220 @@ chaiSetup.configure();
 const expect = chai.expect;
 
 contract('TokenRegistry', (accounts: string[]) => {
-	const owner = accounts[0];
-	const notOwner = accounts[1];
-
-	const tokenAddress1 = `0x${ethUtil.setLength(ethUtil.toBuffer('0x1'), 20, false).toString('hex')}`;
-	const tokenAddress2 = `0x${ethUtil.setLength(ethUtil.toBuffer('0x2'), 20, false).toString('hex')}`;
-
-	const token1 = {
-		address: tokenAddress1,
-		name: 'testToken1',
-		symbol: 'TT1',
-		decimals: 18,
-		ipfsHash: `0x${ethUtil.sha3('ipfs1').toString('hex')}`,
-		swarmHash: `0x${ethUtil.sha3('swarm1').toString('hex')}`,
-	};
-
-	const token2 = {
-		address: tokenAddress2,
-		name: 'testToken2',
-		symbol: 'TT2',
-		decimals: 18,
-		ipfsHash: `0x${ethUtil.sha3('ipfs2').toString('hex')}`,
-		swarmHash: `0x${ethUtil.sha3('swarm2').toString('hex')}`,
-	};
-
-	const nullToken = {
-		address: ZeroEx.NULL_ADDRESS,
-		name: '',
-		symbol: '',
-		decimals: 0,
-		ipfsHash: constants.NULL_BYTES,
-		swarmHash: constants.NULL_BYTES,
-	};
-
-	let tokenReg: ContractInstance;
-	let tokenRegWrapper: TokenRegWrapper;
-
-	beforeEach(async () => {
-		tokenReg = await TokenRegistry.new();
-		tokenRegWrapper = new TokenRegWrapper(tokenReg);
-	});
-
-	describe('addToken', () => {
-		it('should throw when not called by owner', async () => {
-			return expect(tokenRegWrapper.addTokenAsync(token1, notOwner)).to.be.rejectedWith(constants.REVERT);
-		});
-
-		it('should add token metadata when called by owner', async () => {
-			await tokenRegWrapper.addTokenAsync(token1, owner);
-			const tokenData = await tokenRegWrapper.getTokenMetaDataAsync(token1.address);
-			expect(tokenData).to.be.deep.equal(token1);
-		});
-
-		it('should throw if token already exists', async () => {
-			await tokenRegWrapper.addTokenAsync(token1, owner);
-
-			return expect(tokenRegWrapper.addTokenAsync(token1, owner)).to.be.rejectedWith(constants.REVERT);
-		});
-
-		it('should throw if token address is null', async () => {
-			return expect(tokenRegWrapper.addTokenAsync(nullToken, owner)).to.be.rejectedWith(constants.REVERT);
-		});
-
-		it('should throw if name already exists', async () => {
-			await tokenRegWrapper.addTokenAsync(token1, owner);
-			const duplicateNameToken = _.assign({}, token2, { name: token1.name });
-
-			return expect(tokenRegWrapper.addTokenAsync(duplicateNameToken, owner)).to.be.rejectedWith(
-				constants.REVERT,
-			);
-		});
-
-		it('should throw if symbol already exists', async () => {
-			await tokenRegWrapper.addTokenAsync(token1, owner);
-			const duplicateSymbolToken = _.assign({}, token2, {
-				symbol: token1.symbol,
-			});
-
-			return expect(tokenRegWrapper.addTokenAsync(duplicateSymbolToken, owner)).to.be.rejectedWith(
-				constants.REVERT,
-			);
-		});
-	});
-
-	describe('after addToken', () => {
-		beforeEach(async () => {
-			await tokenRegWrapper.addTokenAsync(token1, owner);
-		});
-
-		describe('getTokenByName', () => {
-			it('should return token metadata when given the token name', async () => {
-				const tokenData = await tokenRegWrapper.getTokenByNameAsync(token1.name);
-				expect(tokenData).to.be.deep.equal(token1);
-			});
-		});
-
-		describe('getTokenBySymbol', () => {
-			it('should return token metadata when given the token symbol', async () => {
-				const tokenData = await tokenRegWrapper.getTokenBySymbolAsync(token1.symbol);
-				expect(tokenData).to.be.deep.equal(token1);
-			});
-		});
-
-		describe('setTokenName', () => {
-			it('should throw when not called by owner', async () => {
-				return expect(
-					tokenReg.setTokenName(token1.address, token2.name, { from: notOwner }),
-				).to.be.rejectedWith(constants.REVERT);
-			});
-
-			it('should change the token name when called by owner', async () => {
-				const res = await tokenReg.setTokenName(token1.address, token2.name, {
-					from: owner,
-				});
-				expect(res.logs).to.have.length(1);
-				const [newData, oldData] = await Promise.all([
-					tokenRegWrapper.getTokenByNameAsync(token2.name),
-					tokenRegWrapper.getTokenByNameAsync(token1.name),
-				]);
-
-				const expectedNewData = _.assign({}, token1, { name: token2.name });
-				const expectedOldData = nullToken;
-				expect(newData).to.be.deep.equal(expectedNewData);
-				expect(oldData).to.be.deep.equal(expectedOldData);
-			});
-
-			it('should throw if the name already exists', async () => {
-				await tokenRegWrapper.addTokenAsync(token2, owner);
-
-				return expect(tokenReg.setTokenName(token1.address, token2.name, { from: owner })).to.be.rejectedWith(
-					constants.REVERT,
-				);
-			});
-
-			it('should throw if token does not exist', async () => {
-				return expect(
-					tokenReg.setTokenName(nullToken.address, token2.name, { from: owner }),
-				).to.be.rejectedWith(constants.REVERT);
-			});
-		});
-
-		describe('setTokenSymbol', () => {
-			it('should throw when not called by owner', async () => {
-				return expect(
-					tokenReg.setTokenSymbol(token1.address, token2.symbol, {
-						from: notOwner,
-					}),
-				).to.be.rejectedWith(constants.REVERT);
-			});
-
-			it('should change the token symbol when called by owner', async () => {
-				const res = await tokenReg.setTokenSymbol(token1.address, token2.symbol, { from: owner });
-				expect(res.logs).to.have.length(1);
-				const [newData, oldData] = await Promise.all([
-					tokenRegWrapper.getTokenBySymbolAsync(token2.symbol),
-					tokenRegWrapper.getTokenBySymbolAsync(token1.symbol),
-				]);
-
-				const expectedNewData = _.assign({}, token1, { symbol: token2.symbol });
-				const expectedOldData = nullToken;
-				expect(newData).to.be.deep.equal(expectedNewData);
-				expect(oldData).to.be.deep.equal(expectedOldData);
-			});
-
-			it('should throw if the symbol already exists', async () => {
-				await tokenRegWrapper.addTokenAsync(token2, owner);
-
-				return expect(
-					tokenReg.setTokenSymbol(token1.address, token2.symbol, {
-						from: owner,
-					}),
-				).to.be.rejectedWith(constants.REVERT);
-			});
-
-			it('should throw if token does not exist', async () => {
-				return expect(
-					tokenReg.setTokenSymbol(nullToken.address, token2.symbol, {
-						from: owner,
-					}),
-				).to.be.rejectedWith(constants.REVERT);
-			});
-		});
-
-		describe('removeToken', () => {
-			it('should throw if not called by owner', async () => {
-				const index = 0;
-				return expect(tokenReg.removeToken(token1.address, index, { from: notOwner })).to.be.rejectedWith(
-					constants.REVERT,
-				);
-			});
-
-			it('should remove token metadata when called by owner', async () => {
-				const index = 0;
-				const res = await tokenReg.removeToken(token1.address, index, {
-					from: owner,
-				});
-				expect(res.logs).to.have.length(1);
-				const tokenData = await tokenRegWrapper.getTokenMetaDataAsync(token1.address);
-				expect(tokenData).to.be.deep.equal(nullToken);
-			});
-
-			it('should throw if token does not exist', async () => {
-				const index = 0;
-				return expect(tokenReg.removeToken(nullToken.address, index, { from: owner })).to.be.rejectedWith(
-					constants.REVERT,
-				);
-			});
-
-			it('should throw if token at given index does not match address', async () => {
-				await tokenRegWrapper.addTokenAsync(token2, owner);
-				const incorrectIndex = 0;
-				return expect(tokenReg.removeToken(token2.address, incorrectIndex, { from: owner })).to.be.rejectedWith(
-					constants.REVERT,
-				);
-			});
-		});
-	});
+    const owner = accounts[0];
+    const notOwner = accounts[1];
+
+    const tokenAddress1 = `0x${ethUtil.setLength(ethUtil.toBuffer('0x1'), 20, false).toString('hex')}`;
+    const tokenAddress2 = `0x${ethUtil.setLength(ethUtil.toBuffer('0x2'), 20, false).toString('hex')}`;
+
+    const token1 = {
+        address: tokenAddress1,
+        name: 'testToken1',
+        symbol: 'TT1',
+        decimals: 18,
+        ipfsHash: `0x${ethUtil.sha3('ipfs1').toString('hex')}`,
+        swarmHash: `0x${ethUtil.sha3('swarm1').toString('hex')}`,
+    };
+
+    const token2 = {
+        address: tokenAddress2,
+        name: 'testToken2',
+        symbol: 'TT2',
+        decimals: 18,
+        ipfsHash: `0x${ethUtil.sha3('ipfs2').toString('hex')}`,
+        swarmHash: `0x${ethUtil.sha3('swarm2').toString('hex')}`,
+    };
+
+    const nullToken = {
+        address: ZeroEx.NULL_ADDRESS,
+        name: '',
+        symbol: '',
+        decimals: 0,
+        ipfsHash: constants.NULL_BYTES,
+        swarmHash: constants.NULL_BYTES,
+    };
+
+    let tokenReg: ContractInstance;
+    let tokenRegWrapper: TokenRegWrapper;
+
+    beforeEach(async () => {
+        tokenReg = await TokenRegistry.new();
+        tokenRegWrapper = new TokenRegWrapper(tokenReg);
+    });
+
+    describe('addToken', () => {
+        it('should throw when not called by owner', async () => {
+            return expect(tokenRegWrapper.addTokenAsync(token1, notOwner)).to.be.rejectedWith(constants.REVERT);
+        });
+
+        it('should add token metadata when called by owner', async () => {
+            await tokenRegWrapper.addTokenAsync(token1, owner);
+            const tokenData = await tokenRegWrapper.getTokenMetaDataAsync(token1.address);
+            expect(tokenData).to.be.deep.equal(token1);
+        });
+
+        it('should throw if token already exists', async () => {
+            await tokenRegWrapper.addTokenAsync(token1, owner);
+
+            return expect(tokenRegWrapper.addTokenAsync(token1, owner)).to.be.rejectedWith(constants.REVERT);
+        });
+
+        it('should throw if token address is null', async () => {
+            return expect(tokenRegWrapper.addTokenAsync(nullToken, owner)).to.be.rejectedWith(constants.REVERT);
+        });
+
+        it('should throw if name already exists', async () => {
+            await tokenRegWrapper.addTokenAsync(token1, owner);
+            const duplicateNameToken = _.assign({}, token2, { name: token1.name });
+
+            return expect(tokenRegWrapper.addTokenAsync(duplicateNameToken, owner)).to.be.rejectedWith(
+                constants.REVERT,
+            );
+        });
+
+        it('should throw if symbol already exists', async () => {
+            await tokenRegWrapper.addTokenAsync(token1, owner);
+            const duplicateSymbolToken = _.assign({}, token2, {
+                symbol: token1.symbol,
+            });
+
+            return expect(tokenRegWrapper.addTokenAsync(duplicateSymbolToken, owner)).to.be.rejectedWith(
+                constants.REVERT,
+            );
+        });
+    });
+
+    describe('after addToken', () => {
+        beforeEach(async () => {
+            await tokenRegWrapper.addTokenAsync(token1, owner);
+        });
+
+        describe('getTokenByName', () => {
+            it('should return token metadata when given the token name', async () => {
+                const tokenData = await tokenRegWrapper.getTokenByNameAsync(token1.name);
+                expect(tokenData).to.be.deep.equal(token1);
+            });
+        });
+
+        describe('getTokenBySymbol', () => {
+            it('should return token metadata when given the token symbol', async () => {
+                const tokenData = await tokenRegWrapper.getTokenBySymbolAsync(token1.symbol);
+                expect(tokenData).to.be.deep.equal(token1);
+            });
+        });
+
+        describe('setTokenName', () => {
+            it('should throw when not called by owner', async () => {
+                return expect(
+                    tokenReg.setTokenName(token1.address, token2.name, { from: notOwner }),
+                ).to.be.rejectedWith(constants.REVERT);
+            });
+
+            it('should change the token name when called by owner', async () => {
+                const res = await tokenReg.setTokenName(token1.address, token2.name, {
+                    from: owner,
+                });
+                expect(res.logs).to.have.length(1);
+                const [newData, oldData] = await Promise.all([
+                    tokenRegWrapper.getTokenByNameAsync(token2.name),
+                    tokenRegWrapper.getTokenByNameAsync(token1.name),
+                ]);
+
+                const expectedNewData = _.assign({}, token1, { name: token2.name });
+                const expectedOldData = nullToken;
+                expect(newData).to.be.deep.equal(expectedNewData);
+                expect(oldData).to.be.deep.equal(expectedOldData);
+            });
+
+            it('should throw if the name already exists', async () => {
+                await tokenRegWrapper.addTokenAsync(token2, owner);
+
+                return expect(tokenReg.setTokenName(token1.address, token2.name, { from: owner })).to.be.rejectedWith(
+                    constants.REVERT,
+                );
+            });
+
+            it('should throw if token does not exist', async () => {
+                return expect(
+                    tokenReg.setTokenName(nullToken.address, token2.name, { from: owner }),
+                ).to.be.rejectedWith(constants.REVERT);
+            });
+        });
+
+        describe('setTokenSymbol', () => {
+            it('should throw when not called by owner', async () => {
+                return expect(
+                    tokenReg.setTokenSymbol(token1.address, token2.symbol, {
+                        from: notOwner,
+                    }),
+                ).to.be.rejectedWith(constants.REVERT);
+            });
+
+            it('should change the token symbol when called by owner', async () => {
+                const res = await tokenReg.setTokenSymbol(token1.address, token2.symbol, { from: owner });
+                expect(res.logs).to.have.length(1);
+                const [newData, oldData] = await Promise.all([
+                    tokenRegWrapper.getTokenBySymbolAsync(token2.symbol),
+                    tokenRegWrapper.getTokenBySymbolAsync(token1.symbol),
+                ]);
+
+                const expectedNewData = _.assign({}, token1, { symbol: token2.symbol });
+                const expectedOldData = nullToken;
+                expect(newData).to.be.deep.equal(expectedNewData);
+                expect(oldData).to.be.deep.equal(expectedOldData);
+            });
+
+            it('should throw if the symbol already exists', async () => {
+                await tokenRegWrapper.addTokenAsync(token2, owner);
+
+                return expect(
+                    tokenReg.setTokenSymbol(token1.address, token2.symbol, {
+                        from: owner,
+                    }),
+                ).to.be.rejectedWith(constants.REVERT);
+            });
+
+            it('should throw if token does not exist', async () => {
+                return expect(
+                    tokenReg.setTokenSymbol(nullToken.address, token2.symbol, {
+                        from: owner,
+                    }),
+                ).to.be.rejectedWith(constants.REVERT);
+            });
+        });
+
+        describe('removeToken', () => {
+            it('should throw if not called by owner', async () => {
+                const index = 0;
+                return expect(tokenReg.removeToken(token1.address, index, { from: notOwner })).to.be.rejectedWith(
+                    constants.REVERT,
+                );
+            });
+
+            it('should remove token metadata when called by owner', async () => {
+                const index = 0;
+                const res = await tokenReg.removeToken(token1.address, index, {
+                    from: owner,
+                });
+                expect(res.logs).to.have.length(1);
+                const tokenData = await tokenRegWrapper.getTokenMetaDataAsync(token1.address);
+                expect(tokenData).to.be.deep.equal(nullToken);
+            });
+
+            it('should throw if token does not exist', async () => {
+                const index = 0;
+                return expect(tokenReg.removeToken(nullToken.address, index, { from: owner })).to.be.rejectedWith(
+                    constants.REVERT,
+                );
+            });
+
+            it('should throw if token at given index does not match address', async () => {
+                await tokenRegWrapper.addTokenAsync(token2, owner);
+                const incorrectIndex = 0;
+                return expect(tokenReg.removeToken(token2.address, incorrectIndex, { from: owner })).to.be.rejectedWith(
+                    constants.REVERT,
+                );
+            });
+        });
+    });
 });
diff --git a/packages/contracts/test/ts/token_transfer_proxy/auth.ts b/packages/contracts/test/ts/token_transfer_proxy/auth.ts
index 69a6c0ada..9ae0a8fc3 100644
--- a/packages/contracts/test/ts/token_transfer_proxy/auth.ts
+++ b/packages/contracts/test/ts/token_transfer_proxy/auth.ts
@@ -9,91 +9,91 @@ const expect = chai.expect;
 const TokenTransferProxy = artifacts.require('./db/TokenTransferProxy.sol');
 
 contract('TokenTransferProxy', (accounts: string[]) => {
-	const owner = accounts[0];
-	const notOwner = accounts[1];
+    const owner = accounts[0];
+    const notOwner = accounts[1];
 
-	let tokenTransferProxy: ContractInstance;
-	let authorized: string;
-	let notAuthorized = owner;
+    let tokenTransferProxy: ContractInstance;
+    let authorized: string;
+    let notAuthorized = owner;
 
-	before(async () => {
-		tokenTransferProxy = await TokenTransferProxy.deployed();
-	});
+    before(async () => {
+        tokenTransferProxy = await TokenTransferProxy.deployed();
+    });
 
-	describe('addAuthorizedAddress', () => {
-		it('should throw if not called by owner', async () => {
-			return expect(tokenTransferProxy.addAuthorizedAddress(notOwner, { from: notOwner })).to.be.rejectedWith(
-				constants.REVERT,
-			);
-		});
+    describe('addAuthorizedAddress', () => {
+        it('should throw if not called by owner', async () => {
+            return expect(tokenTransferProxy.addAuthorizedAddress(notOwner, { from: notOwner })).to.be.rejectedWith(
+                constants.REVERT,
+            );
+        });
 
-		it('should allow owner to add an authorized address', async () => {
-			await tokenTransferProxy.addAuthorizedAddress(notAuthorized, {
-				from: owner,
-			});
-			authorized = notAuthorized;
-			notAuthorized = null;
-			const isAuthorized = await tokenTransferProxy.authorized.call(authorized);
-			expect(isAuthorized).to.be.true();
-		});
+        it('should allow owner to add an authorized address', async () => {
+            await tokenTransferProxy.addAuthorizedAddress(notAuthorized, {
+                from: owner,
+            });
+            authorized = notAuthorized;
+            notAuthorized = null;
+            const isAuthorized = await tokenTransferProxy.authorized.call(authorized);
+            expect(isAuthorized).to.be.true();
+        });
 
-		it('should throw if owner attempts to authorize a duplicate address', async () => {
-			return expect(tokenTransferProxy.addAuthorizedAddress(authorized, { from: owner })).to.be.rejectedWith(
-				constants.REVERT,
-			);
-		});
-	});
+        it('should throw if owner attempts to authorize a duplicate address', async () => {
+            return expect(tokenTransferProxy.addAuthorizedAddress(authorized, { from: owner })).to.be.rejectedWith(
+                constants.REVERT,
+            );
+        });
+    });
 
-	describe('removeAuthorizedAddress', () => {
-		it('should throw if not called by owner', async () => {
-			return expect(
-				tokenTransferProxy.removeAuthorizedAddress(authorized, {
-					from: notOwner,
-				}),
-			).to.be.rejectedWith(constants.REVERT);
-		});
+    describe('removeAuthorizedAddress', () => {
+        it('should throw if not called by owner', async () => {
+            return expect(
+                tokenTransferProxy.removeAuthorizedAddress(authorized, {
+                    from: notOwner,
+                }),
+            ).to.be.rejectedWith(constants.REVERT);
+        });
 
-		it('should allow owner to remove an authorized address', async () => {
-			await tokenTransferProxy.removeAuthorizedAddress(authorized, {
-				from: owner,
-			});
-			notAuthorized = authorized;
-			authorized = null;
+        it('should allow owner to remove an authorized address', async () => {
+            await tokenTransferProxy.removeAuthorizedAddress(authorized, {
+                from: owner,
+            });
+            notAuthorized = authorized;
+            authorized = null;
 
-			const isAuthorized = await tokenTransferProxy.authorized.call(notAuthorized);
-			expect(isAuthorized).to.be.false();
-		});
+            const isAuthorized = await tokenTransferProxy.authorized.call(notAuthorized);
+            expect(isAuthorized).to.be.false();
+        });
 
-		it('should throw if owner attempts to remove an address that is not authorized', async () => {
-			return expect(
-				tokenTransferProxy.removeAuthorizedAddress(notAuthorized, {
-					from: owner,
-				}),
-			).to.be.rejectedWith(constants.REVERT);
-		});
-	});
+        it('should throw if owner attempts to remove an address that is not authorized', async () => {
+            return expect(
+                tokenTransferProxy.removeAuthorizedAddress(notAuthorized, {
+                    from: owner,
+                }),
+            ).to.be.rejectedWith(constants.REVERT);
+        });
+    });
 
-	describe('getAuthorizedAddresses', () => {
-		it('should return all authorized addresses', async () => {
-			const initial = await tokenTransferProxy.getAuthorizedAddresses();
-			expect(initial).to.have.length(1);
-			await tokenTransferProxy.addAuthorizedAddress(notAuthorized, {
-				from: owner,
-			});
+    describe('getAuthorizedAddresses', () => {
+        it('should return all authorized addresses', async () => {
+            const initial = await tokenTransferProxy.getAuthorizedAddresses();
+            expect(initial).to.have.length(1);
+            await tokenTransferProxy.addAuthorizedAddress(notAuthorized, {
+                from: owner,
+            });
 
-			authorized = notAuthorized;
-			notAuthorized = null;
-			const afterAdd = await tokenTransferProxy.getAuthorizedAddresses();
-			expect(afterAdd).to.have.length(2);
-			expect(afterAdd).to.include(authorized);
+            authorized = notAuthorized;
+            notAuthorized = null;
+            const afterAdd = await tokenTransferProxy.getAuthorizedAddresses();
+            expect(afterAdd).to.have.length(2);
+            expect(afterAdd).to.include(authorized);
 
-			await tokenTransferProxy.removeAuthorizedAddress(authorized, {
-				from: owner,
-			});
-			notAuthorized = authorized;
-			authorized = null;
-			const afterRemove = await tokenTransferProxy.getAuthorizedAddresses();
-			expect(afterRemove).to.have.length(1);
-		});
-	});
+            await tokenTransferProxy.removeAuthorizedAddress(authorized, {
+                from: owner,
+            });
+            notAuthorized = authorized;
+            authorized = null;
+            const afterRemove = await tokenTransferProxy.getAuthorizedAddresses();
+            expect(afterRemove).to.have.length(1);
+        });
+    });
 });
diff --git a/packages/contracts/test/ts/token_transfer_proxy/transfer_from.ts b/packages/contracts/test/ts/token_transfer_proxy/transfer_from.ts
index 847256598..e1aff6dae 100644
--- a/packages/contracts/test/ts/token_transfer_proxy/transfer_from.ts
+++ b/packages/contracts/test/ts/token_transfer_proxy/transfer_from.ts
@@ -11,63 +11,63 @@ const expect = chai.expect;
 const { TokenTransferProxy, DummyToken, TokenRegistry } = new Artifacts(artifacts);
 
 contract('TokenTransferProxy', (accounts: string[]) => {
-	const INIT_BAL = 100000000;
-	const INIT_ALLOW = 100000000;
+    const INIT_BAL = 100000000;
+    const INIT_ALLOW = 100000000;
 
-	const owner = accounts[0];
-	const notAuthorized = owner;
+    const owner = accounts[0];
+    const notAuthorized = owner;
 
-	let tokenTransferProxy: ContractInstance;
-	let tokenRegistry: ContractInstance;
-	let rep: ContractInstance;
-	let dmyBalances: Balances;
+    let tokenTransferProxy: ContractInstance;
+    let tokenRegistry: ContractInstance;
+    let rep: ContractInstance;
+    let dmyBalances: Balances;
 
-	before(async () => {
-		[tokenTransferProxy, tokenRegistry] = await Promise.all([
-			TokenTransferProxy.deployed(),
-			TokenRegistry.deployed(),
-		]);
-		const repAddress = await tokenRegistry.getTokenAddressBySymbol('REP');
-		rep = DummyToken.at(repAddress);
+    before(async () => {
+        [tokenTransferProxy, tokenRegistry] = await Promise.all([
+            TokenTransferProxy.deployed(),
+            TokenRegistry.deployed(),
+        ]);
+        const repAddress = await tokenRegistry.getTokenAddressBySymbol('REP');
+        rep = DummyToken.at(repAddress);
 
-		dmyBalances = new Balances([rep], [accounts[0], accounts[1]]);
-		await Promise.all([
-			rep.approve(TokenTransferProxy.address, INIT_ALLOW, {
-				from: accounts[0],
-			}),
-			rep.setBalance(accounts[0], INIT_BAL, { from: owner }),
-			rep.approve(TokenTransferProxy.address, INIT_ALLOW, {
-				from: accounts[1],
-			}),
-			rep.setBalance(accounts[1], INIT_BAL, { from: owner }),
-		]);
-	});
+        dmyBalances = new Balances([rep], [accounts[0], accounts[1]]);
+        await Promise.all([
+            rep.approve(TokenTransferProxy.address, INIT_ALLOW, {
+                from: accounts[0],
+            }),
+            rep.setBalance(accounts[0], INIT_BAL, { from: owner }),
+            rep.approve(TokenTransferProxy.address, INIT_ALLOW, {
+                from: accounts[1],
+            }),
+            rep.setBalance(accounts[1], INIT_BAL, { from: owner }),
+        ]);
+    });
 
-	describe('transferFrom', () => {
-		it('should throw when called by an unauthorized address', async () => {
-			expect(
-				tokenTransferProxy.transferFrom(rep.address, accounts[0], accounts[1], 1000, { from: notAuthorized }),
-			).to.be.rejectedWith(constants.REVERT);
-		});
+    describe('transferFrom', () => {
+        it('should throw when called by an unauthorized address', async () => {
+            expect(
+                tokenTransferProxy.transferFrom(rep.address, accounts[0], accounts[1], 1000, { from: notAuthorized }),
+            ).to.be.rejectedWith(constants.REVERT);
+        });
 
-		it('should allow an authorized address to transfer', async () => {
-			const balances = await dmyBalances.getAsync();
+        it('should allow an authorized address to transfer', async () => {
+            const balances = await dmyBalances.getAsync();
 
-			await tokenTransferProxy.addAuthorizedAddress(notAuthorized, {
-				from: owner,
-			});
-			const transferAmt = 10000;
-			await tokenTransferProxy.transferFrom(rep.address, accounts[0], accounts[1], transferAmt, {
-				from: notAuthorized,
-			});
+            await tokenTransferProxy.addAuthorizedAddress(notAuthorized, {
+                from: owner,
+            });
+            const transferAmt = 10000;
+            await tokenTransferProxy.transferFrom(rep.address, accounts[0], accounts[1], transferAmt, {
+                from: notAuthorized,
+            });
 
-			const newBalances = await dmyBalances.getAsync();
-			expect(newBalances[accounts[0]][rep.address]).to.be.bignumber.equal(
-				balances[accounts[0]][rep.address].minus(transferAmt),
-			);
-			expect(newBalances[accounts[1]][rep.address]).to.be.bignumber.equal(
-				balances[accounts[1]][rep.address].add(transferAmt),
-			);
-		});
-	});
+            const newBalances = await dmyBalances.getAsync();
+            expect(newBalances[accounts[0]][rep.address]).to.be.bignumber.equal(
+                balances[accounts[0]][rep.address].minus(transferAmt),
+            );
+            expect(newBalances[accounts[1]][rep.address]).to.be.bignumber.equal(
+                balances[accounts[1]][rep.address].add(transferAmt),
+            );
+        });
+    });
 });
diff --git a/packages/contracts/test/ts/unlimited_allowance_token.ts b/packages/contracts/test/ts/unlimited_allowance_token.ts
index f2e070fbb..c90a52095 100644
--- a/packages/contracts/test/ts/unlimited_allowance_token.ts
+++ b/packages/contracts/test/ts/unlimited_allowance_token.ts
@@ -15,113 +15,113 @@ chaiSetup.configure();
 const expect = chai.expect;
 
 contract('UnlimitedAllowanceToken', (accounts: string[]) => {
-	const config = {
-		networkId: constants.TESTRPC_NETWORK_ID,
-	};
-	const zeroEx = new ZeroEx(web3.currentProvider, config);
-	const owner = accounts[0];
-	const spender = accounts[1];
-
-	const MAX_MINT_VALUE = new BigNumber(100000000000000000000);
-	let tokenAddress: string;
-	let token: ContractInstance;
-
-	beforeEach(async () => {
-		token = await DummyToken.new({ from: owner });
-		await token.mint(MAX_MINT_VALUE, { from: owner });
-		tokenAddress = token.address;
-	});
-
-	describe('transfer', () => {
-		it('should transfer balance from sender to receiver', async () => {
-			const receiver = spender;
-			const initOwnerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
-			const amountToTransfer = new BigNumber(1);
-			await zeroEx.token.transferAsync(tokenAddress, owner, receiver, amountToTransfer);
-			const finalOwnerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
-			const finalReceiverBalance = await zeroEx.token.getBalanceAsync(tokenAddress, receiver);
-
-			const expectedFinalOwnerBalance = initOwnerBalance.minus(amountToTransfer);
-			const expectedFinalReceiverBalance = amountToTransfer;
-			expect(finalOwnerBalance).to.be.bignumber.equal(expectedFinalOwnerBalance);
-			expect(finalReceiverBalance).to.be.bignumber.equal(expectedFinalReceiverBalance);
-		});
-
-		it('should return true on a 0 value transfer', async () => {
-			const didReturnTrue = await token.transfer.call(spender, 0, {
-				from: owner,
-			});
-			expect(didReturnTrue).to.be.true();
-		});
-	});
-
-	describe('transferFrom', () => {
-		it('should return false if owner has insufficient balance', async () => {
-			const ownerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
-			const amountToTransfer = ownerBalance.plus(1);
-			await zeroEx.token.setAllowanceAsync(tokenAddress, owner, spender, amountToTransfer);
-			const didReturnTrue = await token.transferFrom.call(owner, spender, amountToTransfer, { from: spender });
-			expect(didReturnTrue).to.be.false();
-		});
-
-		it('should return false if spender has insufficient allowance', async () => {
-			const ownerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
-			const amountToTransfer = ownerBalance;
-
-			const spenderAllowance = await zeroEx.token.getAllowanceAsync(tokenAddress, owner, spender);
-			const spenderAllowanceIsInsufficient = spenderAllowance.cmp(amountToTransfer) < 0;
-			expect(spenderAllowanceIsInsufficient).to.be.true();
-
-			const didReturnTrue = await token.transferFrom.call(owner, spender, amountToTransfer, { from: spender });
-			expect(didReturnTrue).to.be.false();
-		});
-
-		it('should return true on a 0 value transfer', async () => {
-			const amountToTransfer = 0;
-			const didReturnTrue = await token.transferFrom.call(owner, spender, amountToTransfer, { from: spender });
-			expect(didReturnTrue).to.be.true();
-		});
-
-		it('should not modify spender allowance if spender allowance is 2^256 - 1', async () => {
-			const initOwnerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
-			const amountToTransfer = initOwnerBalance;
-			const initSpenderAllowance = zeroEx.token.UNLIMITED_ALLOWANCE_IN_BASE_UNITS;
-			await zeroEx.token.setAllowanceAsync(tokenAddress, owner, spender, initSpenderAllowance);
-			await zeroEx.token.transferFromAsync(tokenAddress, owner, spender, spender, amountToTransfer, {
-				gasLimit: constants.MAX_TOKEN_TRANSFERFROM_GAS,
-			});
-
-			const newSpenderAllowance = await zeroEx.token.getAllowanceAsync(tokenAddress, owner, spender);
-			expect(initSpenderAllowance).to.be.bignumber.equal(newSpenderAllowance);
-		});
-
-		it('should transfer the correct balances if spender has sufficient allowance', async () => {
-			const initOwnerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
-			const amountToTransfer = initOwnerBalance;
-			const initSpenderAllowance = initOwnerBalance;
-			await zeroEx.token.setAllowanceAsync(tokenAddress, owner, spender, initSpenderAllowance);
-			await zeroEx.token.transferFromAsync(tokenAddress, owner, spender, spender, amountToTransfer, {
-				gasLimit: constants.MAX_TOKEN_TRANSFERFROM_GAS,
-			});
-
-			const newOwnerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
-			const newSpenderBalance = await zeroEx.token.getBalanceAsync(tokenAddress, spender);
-
-			expect(newOwnerBalance).to.be.bignumber.equal(0);
-			expect(newSpenderBalance).to.be.bignumber.equal(initOwnerBalance);
-		});
-
-		it('should modify allowance if spender has sufficient allowance less than 2^256 - 1', async () => {
-			const initOwnerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
-			const amountToTransfer = initOwnerBalance;
-			const initSpenderAllowance = initOwnerBalance;
-			await zeroEx.token.setAllowanceAsync(tokenAddress, owner, spender, initSpenderAllowance);
-			await zeroEx.token.transferFromAsync(tokenAddress, owner, spender, spender, amountToTransfer, {
-				gasLimit: constants.MAX_TOKEN_TRANSFERFROM_GAS,
-			});
-
-			const newSpenderAllowance = await zeroEx.token.getAllowanceAsync(tokenAddress, owner, spender);
-			expect(newSpenderAllowance).to.be.bignumber.equal(0);
-		});
-	});
+    const config = {
+        networkId: constants.TESTRPC_NETWORK_ID,
+    };
+    const zeroEx = new ZeroEx(web3.currentProvider, config);
+    const owner = accounts[0];
+    const spender = accounts[1];
+
+    const MAX_MINT_VALUE = new BigNumber(100000000000000000000);
+    let tokenAddress: string;
+    let token: ContractInstance;
+
+    beforeEach(async () => {
+        token = await DummyToken.new({ from: owner });
+        await token.mint(MAX_MINT_VALUE, { from: owner });
+        tokenAddress = token.address;
+    });
+
+    describe('transfer', () => {
+        it('should transfer balance from sender to receiver', async () => {
+            const receiver = spender;
+            const initOwnerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
+            const amountToTransfer = new BigNumber(1);
+            await zeroEx.token.transferAsync(tokenAddress, owner, receiver, amountToTransfer);
+            const finalOwnerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
+            const finalReceiverBalance = await zeroEx.token.getBalanceAsync(tokenAddress, receiver);
+
+            const expectedFinalOwnerBalance = initOwnerBalance.minus(amountToTransfer);
+            const expectedFinalReceiverBalance = amountToTransfer;
+            expect(finalOwnerBalance).to.be.bignumber.equal(expectedFinalOwnerBalance);
+            expect(finalReceiverBalance).to.be.bignumber.equal(expectedFinalReceiverBalance);
+        });
+
+        it('should return true on a 0 value transfer', async () => {
+            const didReturnTrue = await token.transfer.call(spender, 0, {
+                from: owner,
+            });
+            expect(didReturnTrue).to.be.true();
+        });
+    });
+
+    describe('transferFrom', () => {
+        it('should return false if owner has insufficient balance', async () => {
+            const ownerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
+            const amountToTransfer = ownerBalance.plus(1);
+            await zeroEx.token.setAllowanceAsync(tokenAddress, owner, spender, amountToTransfer);
+            const didReturnTrue = await token.transferFrom.call(owner, spender, amountToTransfer, { from: spender });
+            expect(didReturnTrue).to.be.false();
+        });
+
+        it('should return false if spender has insufficient allowance', async () => {
+            const ownerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
+            const amountToTransfer = ownerBalance;
+
+            const spenderAllowance = await zeroEx.token.getAllowanceAsync(tokenAddress, owner, spender);
+            const spenderAllowanceIsInsufficient = spenderAllowance.cmp(amountToTransfer) < 0;
+            expect(spenderAllowanceIsInsufficient).to.be.true();
+
+            const didReturnTrue = await token.transferFrom.call(owner, spender, amountToTransfer, { from: spender });
+            expect(didReturnTrue).to.be.false();
+        });
+
+        it('should return true on a 0 value transfer', async () => {
+            const amountToTransfer = 0;
+            const didReturnTrue = await token.transferFrom.call(owner, spender, amountToTransfer, { from: spender });
+            expect(didReturnTrue).to.be.true();
+        });
+
+        it('should not modify spender allowance if spender allowance is 2^256 - 1', async () => {
+            const initOwnerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
+            const amountToTransfer = initOwnerBalance;
+            const initSpenderAllowance = zeroEx.token.UNLIMITED_ALLOWANCE_IN_BASE_UNITS;
+            await zeroEx.token.setAllowanceAsync(tokenAddress, owner, spender, initSpenderAllowance);
+            await zeroEx.token.transferFromAsync(tokenAddress, owner, spender, spender, amountToTransfer, {
+                gasLimit: constants.MAX_TOKEN_TRANSFERFROM_GAS,
+            });
+
+            const newSpenderAllowance = await zeroEx.token.getAllowanceAsync(tokenAddress, owner, spender);
+            expect(initSpenderAllowance).to.be.bignumber.equal(newSpenderAllowance);
+        });
+
+        it('should transfer the correct balances if spender has sufficient allowance', async () => {
+            const initOwnerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
+            const amountToTransfer = initOwnerBalance;
+            const initSpenderAllowance = initOwnerBalance;
+            await zeroEx.token.setAllowanceAsync(tokenAddress, owner, spender, initSpenderAllowance);
+            await zeroEx.token.transferFromAsync(tokenAddress, owner, spender, spender, amountToTransfer, {
+                gasLimit: constants.MAX_TOKEN_TRANSFERFROM_GAS,
+            });
+
+            const newOwnerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
+            const newSpenderBalance = await zeroEx.token.getBalanceAsync(tokenAddress, spender);
+
+            expect(newOwnerBalance).to.be.bignumber.equal(0);
+            expect(newSpenderBalance).to.be.bignumber.equal(initOwnerBalance);
+        });
+
+        it('should modify allowance if spender has sufficient allowance less than 2^256 - 1', async () => {
+            const initOwnerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
+            const amountToTransfer = initOwnerBalance;
+            const initSpenderAllowance = initOwnerBalance;
+            await zeroEx.token.setAllowanceAsync(tokenAddress, owner, spender, initSpenderAllowance);
+            await zeroEx.token.transferFromAsync(tokenAddress, owner, spender, spender, amountToTransfer, {
+                gasLimit: constants.MAX_TOKEN_TRANSFERFROM_GAS,
+            });
+
+            const newSpenderAllowance = await zeroEx.token.getAllowanceAsync(tokenAddress, owner, spender);
+            expect(newSpenderAllowance).to.be.bignumber.equal(0);
+        });
+    });
 });
diff --git a/packages/contracts/test/ts/unlimited_allowance_token_v2.ts b/packages/contracts/test/ts/unlimited_allowance_token_v2.ts
index 4f2ab2e1e..1b29a02ba 100644
--- a/packages/contracts/test/ts/unlimited_allowance_token_v2.ts
+++ b/packages/contracts/test/ts/unlimited_allowance_token_v2.ts
@@ -15,127 +15,127 @@ chaiSetup.configure();
 const expect = chai.expect;
 
 contract('UnlimitedAllowanceTokenV2', (accounts: string[]) => {
-	const config = {
-		networkId: constants.TESTRPC_NETWORK_ID,
-	};
-	const zeroEx = new ZeroEx(web3.currentProvider, config);
-	const owner = accounts[0];
-	const spender = accounts[1];
-
-	const MAX_MINT_VALUE = new BigNumber(100000000000000000000);
-	let tokenAddress: string;
-	let token: ContractInstance;
-
-	beforeEach(async () => {
-		token = await DummyTokenV2.new({ from: owner });
-		await token.mint(MAX_MINT_VALUE, { from: owner });
-		tokenAddress = token.address;
-	});
-
-	describe('transfer', () => {
-		it('should throw if owner has insufficient balance', async () => {
-			const ownerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
-			const amountToTransfer = ownerBalance.plus(1);
-			return expect(token.transfer.call(spender, amountToTransfer, { from: owner })).to.be.rejectedWith(
-				constants.REVERT,
-			);
-		});
-
-		it('should transfer balance from sender to receiver', async () => {
-			const receiver = spender;
-			const initOwnerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
-			const amountToTransfer = new BigNumber(1);
-			await zeroEx.token.transferAsync(tokenAddress, owner, receiver, amountToTransfer);
-			const finalOwnerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
-			const finalReceiverBalance = await zeroEx.token.getBalanceAsync(tokenAddress, receiver);
-
-			const expectedFinalOwnerBalance = initOwnerBalance.minus(amountToTransfer);
-			const expectedFinalReceiverBalance = amountToTransfer;
-			expect(finalOwnerBalance).to.be.bignumber.equal(expectedFinalOwnerBalance);
-			expect(finalReceiverBalance).to.be.bignumber.equal(expectedFinalReceiverBalance);
-		});
-
-		it('should return true on a 0 value transfer', async () => {
-			const didReturnTrue = await token.transfer.call(spender, 0, {
-				from: owner,
-			});
-			expect(didReturnTrue).to.be.true();
-		});
-	});
-
-	describe('transferFrom', () => {
-		it('should throw if owner has insufficient balance', async () => {
-			const ownerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
-			const amountToTransfer = ownerBalance.plus(1);
-			await zeroEx.token.setAllowanceAsync(tokenAddress, owner, spender, amountToTransfer);
-			return expect(
-				token.transferFrom.call(owner, spender, amountToTransfer, {
-					from: spender,
-				}),
-			).to.be.rejectedWith(constants.REVERT);
-		});
-
-		it('should throw if spender has insufficient allowance', async () => {
-			const ownerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
-			const amountToTransfer = ownerBalance;
-
-			const spenderAllowance = await zeroEx.token.getAllowanceAsync(tokenAddress, owner, spender);
-			const spenderAllowanceIsInsufficient = spenderAllowance.cmp(amountToTransfer) < 0;
-			expect(spenderAllowanceIsInsufficient).to.be.true();
-
-			return expect(
-				token.transferFrom.call(owner, spender, amountToTransfer, {
-					from: spender,
-				}),
-			).to.be.rejectedWith(constants.REVERT);
-		});
-
-		it('should return true on a 0 value transfer', async () => {
-			const amountToTransfer = 0;
-			const didReturnTrue = await token.transferFrom.call(owner, spender, amountToTransfer, { from: spender });
-			expect(didReturnTrue).to.be.true();
-		});
-
-		it('should not modify spender allowance if spender allowance is 2^256 - 1', async () => {
-			const initOwnerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
-			const amountToTransfer = initOwnerBalance;
-			const initSpenderAllowance = zeroEx.token.UNLIMITED_ALLOWANCE_IN_BASE_UNITS;
-			await zeroEx.token.setAllowanceAsync(tokenAddress, owner, spender, initSpenderAllowance);
-			await zeroEx.token.transferFromAsync(tokenAddress, owner, spender, spender, amountToTransfer, {
-				gasLimit: constants.MAX_TOKEN_TRANSFERFROM_GAS,
-			});
-
-			const newSpenderAllowance = await zeroEx.token.getAllowanceAsync(tokenAddress, owner, spender);
-			expect(initSpenderAllowance).to.be.bignumber.equal(newSpenderAllowance);
-		});
-
-		it('should transfer the correct balances if spender has sufficient allowance', async () => {
-			const initOwnerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
-			const amountToTransfer = initOwnerBalance;
-			const initSpenderAllowance = initOwnerBalance;
-			await zeroEx.token.setAllowanceAsync(tokenAddress, owner, spender, initSpenderAllowance);
-			await zeroEx.token.transferFromAsync(tokenAddress, owner, spender, spender, amountToTransfer, {
-				gasLimit: constants.MAX_TOKEN_TRANSFERFROM_GAS,
-			});
-
-			const newOwnerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
-			const newSpenderBalance = await zeroEx.token.getBalanceAsync(tokenAddress, spender);
-
-			expect(newOwnerBalance).to.be.bignumber.equal(0);
-			expect(newSpenderBalance).to.be.bignumber.equal(initOwnerBalance);
-		});
-
-		it('should modify allowance if spender has sufficient allowance less than 2^256 - 1', async () => {
-			const initOwnerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
-			const amountToTransfer = initOwnerBalance;
-			const initSpenderAllowance = initOwnerBalance;
-			await zeroEx.token.setAllowanceAsync(tokenAddress, owner, spender, initSpenderAllowance);
-			await zeroEx.token.transferFromAsync(tokenAddress, owner, spender, spender, amountToTransfer, {
-				gasLimit: constants.MAX_TOKEN_TRANSFERFROM_GAS,
-			});
-
-			const newSpenderAllowance = await zeroEx.token.getAllowanceAsync(tokenAddress, owner, spender);
-			expect(newSpenderAllowance).to.be.bignumber.equal(0);
-		});
-	});
+    const config = {
+        networkId: constants.TESTRPC_NETWORK_ID,
+    };
+    const zeroEx = new ZeroEx(web3.currentProvider, config);
+    const owner = accounts[0];
+    const spender = accounts[1];
+
+    const MAX_MINT_VALUE = new BigNumber(100000000000000000000);
+    let tokenAddress: string;
+    let token: ContractInstance;
+
+    beforeEach(async () => {
+        token = await DummyTokenV2.new({ from: owner });
+        await token.mint(MAX_MINT_VALUE, { from: owner });
+        tokenAddress = token.address;
+    });
+
+    describe('transfer', () => {
+        it('should throw if owner has insufficient balance', async () => {
+            const ownerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
+            const amountToTransfer = ownerBalance.plus(1);
+            return expect(token.transfer.call(spender, amountToTransfer, { from: owner })).to.be.rejectedWith(
+                constants.REVERT,
+            );
+        });
+
+        it('should transfer balance from sender to receiver', async () => {
+            const receiver = spender;
+            const initOwnerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
+            const amountToTransfer = new BigNumber(1);
+            await zeroEx.token.transferAsync(tokenAddress, owner, receiver, amountToTransfer);
+            const finalOwnerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
+            const finalReceiverBalance = await zeroEx.token.getBalanceAsync(tokenAddress, receiver);
+
+            const expectedFinalOwnerBalance = initOwnerBalance.minus(amountToTransfer);
+            const expectedFinalReceiverBalance = amountToTransfer;
+            expect(finalOwnerBalance).to.be.bignumber.equal(expectedFinalOwnerBalance);
+            expect(finalReceiverBalance).to.be.bignumber.equal(expectedFinalReceiverBalance);
+        });
+
+        it('should return true on a 0 value transfer', async () => {
+            const didReturnTrue = await token.transfer.call(spender, 0, {
+                from: owner,
+            });
+            expect(didReturnTrue).to.be.true();
+        });
+    });
+
+    describe('transferFrom', () => {
+        it('should throw if owner has insufficient balance', async () => {
+            const ownerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
+            const amountToTransfer = ownerBalance.plus(1);
+            await zeroEx.token.setAllowanceAsync(tokenAddress, owner, spender, amountToTransfer);
+            return expect(
+                token.transferFrom.call(owner, spender, amountToTransfer, {
+                    from: spender,
+                }),
+            ).to.be.rejectedWith(constants.REVERT);
+        });
+
+        it('should throw if spender has insufficient allowance', async () => {
+            const ownerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
+            const amountToTransfer = ownerBalance;
+
+            const spenderAllowance = await zeroEx.token.getAllowanceAsync(tokenAddress, owner, spender);
+            const spenderAllowanceIsInsufficient = spenderAllowance.cmp(amountToTransfer) < 0;
+            expect(spenderAllowanceIsInsufficient).to.be.true();
+
+            return expect(
+                token.transferFrom.call(owner, spender, amountToTransfer, {
+                    from: spender,
+                }),
+            ).to.be.rejectedWith(constants.REVERT);
+        });
+
+        it('should return true on a 0 value transfer', async () => {
+            const amountToTransfer = 0;
+            const didReturnTrue = await token.transferFrom.call(owner, spender, amountToTransfer, { from: spender });
+            expect(didReturnTrue).to.be.true();
+        });
+
+        it('should not modify spender allowance if spender allowance is 2^256 - 1', async () => {
+            const initOwnerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
+            const amountToTransfer = initOwnerBalance;
+            const initSpenderAllowance = zeroEx.token.UNLIMITED_ALLOWANCE_IN_BASE_UNITS;
+            await zeroEx.token.setAllowanceAsync(tokenAddress, owner, spender, initSpenderAllowance);
+            await zeroEx.token.transferFromAsync(tokenAddress, owner, spender, spender, amountToTransfer, {
+                gasLimit: constants.MAX_TOKEN_TRANSFERFROM_GAS,
+            });
+
+            const newSpenderAllowance = await zeroEx.token.getAllowanceAsync(tokenAddress, owner, spender);
+            expect(initSpenderAllowance).to.be.bignumber.equal(newSpenderAllowance);
+        });
+
+        it('should transfer the correct balances if spender has sufficient allowance', async () => {
+            const initOwnerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
+            const amountToTransfer = initOwnerBalance;
+            const initSpenderAllowance = initOwnerBalance;
+            await zeroEx.token.setAllowanceAsync(tokenAddress, owner, spender, initSpenderAllowance);
+            await zeroEx.token.transferFromAsync(tokenAddress, owner, spender, spender, amountToTransfer, {
+                gasLimit: constants.MAX_TOKEN_TRANSFERFROM_GAS,
+            });
+
+            const newOwnerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
+            const newSpenderBalance = await zeroEx.token.getBalanceAsync(tokenAddress, spender);
+
+            expect(newOwnerBalance).to.be.bignumber.equal(0);
+            expect(newSpenderBalance).to.be.bignumber.equal(initOwnerBalance);
+        });
+
+        it('should modify allowance if spender has sufficient allowance less than 2^256 - 1', async () => {
+            const initOwnerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
+            const amountToTransfer = initOwnerBalance;
+            const initSpenderAllowance = initOwnerBalance;
+            await zeroEx.token.setAllowanceAsync(tokenAddress, owner, spender, initSpenderAllowance);
+            await zeroEx.token.transferFromAsync(tokenAddress, owner, spender, spender, amountToTransfer, {
+                gasLimit: constants.MAX_TOKEN_TRANSFERFROM_GAS,
+            });
+
+            const newSpenderAllowance = await zeroEx.token.getAllowanceAsync(tokenAddress, owner, spender);
+            expect(newSpenderAllowance).to.be.bignumber.equal(0);
+        });
+    });
 });
diff --git a/packages/contracts/test/ts/utils/chai_setup.ts b/packages/contracts/test/ts/utils/chai_setup.ts
index e156b5f7c..078edd309 100644
--- a/packages/contracts/test/ts/utils/chai_setup.ts
+++ b/packages/contracts/test/ts/utils/chai_setup.ts
@@ -4,10 +4,10 @@ import ChaiBigNumber = require('chai-bignumber');
 import * as dirtyChai from 'dirty-chai';
 
 export const chaiSetup = {
-	configure() {
-		chai.config.includeStack = true;
-		chai.use(ChaiBigNumber());
-		chai.use(dirtyChai);
-		chai.use(chaiAsPromised);
-	},
+    configure() {
+        chai.config.includeStack = true;
+        chai.use(ChaiBigNumber());
+        chai.use(dirtyChai);
+        chai.use(chaiAsPromised);
+    },
 };
diff --git a/packages/contracts/test/ts/zrx_token.ts b/packages/contracts/test/ts/zrx_token.ts
index a0b11cdb6..766c94c2a 100644
--- a/packages/contracts/test/ts/zrx_token.ts
+++ b/packages/contracts/test/ts/zrx_token.ts
@@ -15,161 +15,161 @@ const { Exchange, ZRXToken } = new Artifacts(artifacts);
 const web3: Web3 = (global as any).web3;
 
 contract('ZRXToken', (accounts: string[]) => {
-	const owner = accounts[0];
-	const spender = accounts[1];
-	let zeroEx: ZeroEx;
-
-	let MAX_UINT: BigNumber;
-
-	let zrx: ContractInstance;
-	let zrxAddress: string;
-
-	beforeEach(async () => {
-		zeroEx = new ZeroEx(web3.currentProvider, {
-			exchangeContractAddress: Exchange.address,
-			networkId: constants.TESTRPC_NETWORK_ID,
-		});
-		zrx = await ZRXToken.new();
-		zrxAddress = zrx.address;
-		MAX_UINT = zeroEx.token.UNLIMITED_ALLOWANCE_IN_BASE_UNITS;
-	});
-
-	describe('constants', () => {
-		it('should have 18 decimals', async () => {
-			const decimals = new BigNumber(await zrx.decimals.call());
-			const expectedDecimals = 18;
-			expect(decimals).to.be.bignumber.equal(expectedDecimals);
-		});
-
-		it('should have a total supply of 1 billion tokens', async () => {
-			const totalSupply = new BigNumber(await zrx.totalSupply.call());
-			const expectedTotalSupply = 1000000000;
-			expect(ZeroEx.toUnitAmount(totalSupply, 18)).to.be.bignumber.equal(expectedTotalSupply);
-		});
-
-		it('should be named 0x Protocol Token', async () => {
-			const name = await zrx.name.call();
-			const expectedName = '0x Protocol Token';
-			expect(name).to.be.equal(expectedName);
-		});
-
-		it('should have the symbol ZRX', async () => {
-			const symbol = await zrx.symbol.call();
-			const expectedSymbol = 'ZRX';
-			expect(symbol).to.be.equal(expectedSymbol);
-		});
-	});
-
-	describe('constructor', () => {
-		it('should initialize owner balance to totalSupply', async () => {
-			const ownerBalance = await zeroEx.token.getBalanceAsync(zrxAddress, owner);
-			const totalSupply = new BigNumber(await zrx.totalSupply.call());
-			expect(totalSupply).to.be.bignumber.equal(ownerBalance);
-		});
-	});
-
-	describe('transfer', () => {
-		it('should transfer balance from sender to receiver', async () => {
-			const receiver = spender;
-			const initOwnerBalance = await zeroEx.token.getBalanceAsync(zrxAddress, owner);
-			const amountToTransfer = new BigNumber(1);
-			const txHash = await zeroEx.token.transferAsync(zrxAddress, owner, receiver, amountToTransfer);
-			await zeroEx.awaitTransactionMinedAsync(txHash);
-			const finalOwnerBalance = await zeroEx.token.getBalanceAsync(zrxAddress, owner);
-			const finalReceiverBalance = await zeroEx.token.getBalanceAsync(zrxAddress, receiver);
-
-			const expectedFinalOwnerBalance = initOwnerBalance.minus(amountToTransfer);
-			const expectedFinalReceiverBalance = amountToTransfer;
-			expect(finalOwnerBalance).to.be.bignumber.equal(expectedFinalOwnerBalance);
-			expect(finalReceiverBalance).to.be.bignumber.equal(expectedFinalReceiverBalance);
-		});
-
-		it('should return true on a 0 value transfer', async () => {
-			const didReturnTrue = await zrx.transfer.call(spender, 0, {
-				from: owner,
-			});
-			expect(didReturnTrue).to.be.true();
-		});
-	});
-
-	describe('transferFrom', () => {
-		it('should return false if owner has insufficient balance', async () => {
-			const ownerBalance = await zeroEx.token.getBalanceAsync(zrxAddress, owner);
-			const amountToTransfer = ownerBalance.plus(1);
-			const txHash = await zeroEx.token.setAllowanceAsync(zrxAddress, owner, spender, amountToTransfer, {
-				gasLimit: constants.MAX_TOKEN_APPROVE_GAS,
-			});
-			await zeroEx.awaitTransactionMinedAsync(txHash);
-			const didReturnTrue = await zrx.transferFrom.call(owner, spender, amountToTransfer, { from: spender });
-			expect(didReturnTrue).to.be.false();
-		});
-
-		it('should return false if spender has insufficient allowance', async () => {
-			const ownerBalance = await zeroEx.token.getBalanceAsync(zrxAddress, owner);
-			const amountToTransfer = ownerBalance;
-
-			const spenderAllowance = await zeroEx.token.getAllowanceAsync(zrxAddress, owner, spender);
-			const spenderAllowanceIsInsufficient = spenderAllowance.cmp(amountToTransfer) < 0;
-			expect(spenderAllowanceIsInsufficient).to.be.true();
-
-			const didReturnTrue = await zrx.transferFrom.call(owner, spender, amountToTransfer, { from: spender });
-			expect(didReturnTrue).to.be.false();
-		});
-
-		it('should return true on a 0 value transfer', async () => {
-			const amountToTransfer = 0;
-			const didReturnTrue = await zrx.transferFrom.call(owner, spender, amountToTransfer, { from: spender });
-			expect(didReturnTrue).to.be.true();
-		});
-
-		it('should not modify spender allowance if spender allowance is 2^256 - 1', async () => {
-			const initOwnerBalance = await zeroEx.token.getBalanceAsync(zrxAddress, owner);
-			const amountToTransfer = initOwnerBalance;
-			const initSpenderAllowance = MAX_UINT;
-			let txHash = await zeroEx.token.setAllowanceAsync(zrxAddress, owner, spender, initSpenderAllowance, {
-				gasLimit: constants.MAX_TOKEN_APPROVE_GAS,
-			});
-			await zeroEx.awaitTransactionMinedAsync(txHash);
-			txHash = await zeroEx.token.transferFromAsync(zrxAddress, owner, spender, spender, amountToTransfer, {
-				gasLimit: constants.MAX_TOKEN_TRANSFERFROM_GAS,
-			});
-			await zeroEx.awaitTransactionMinedAsync(txHash);
-
-			const newSpenderAllowance = await zeroEx.token.getAllowanceAsync(zrxAddress, owner, spender);
-			expect(initSpenderAllowance).to.be.bignumber.equal(newSpenderAllowance);
-		});
-
-		it('should transfer the correct balances if spender has sufficient allowance', async () => {
-			const initOwnerBalance = await zeroEx.token.getBalanceAsync(zrxAddress, owner);
-			const initSpenderBalance = await zeroEx.token.getBalanceAsync(zrxAddress, spender);
-			const amountToTransfer = initOwnerBalance;
-			const initSpenderAllowance = initOwnerBalance;
-			let txHash = await zeroEx.token.setAllowanceAsync(zrxAddress, owner, spender, initSpenderAllowance);
-			await zeroEx.awaitTransactionMinedAsync(txHash);
-			txHash = await zeroEx.token.transferFromAsync(zrxAddress, owner, spender, spender, amountToTransfer, {
-				gasLimit: constants.MAX_TOKEN_TRANSFERFROM_GAS,
-			});
-			await zeroEx.awaitTransactionMinedAsync(txHash);
-
-			const newOwnerBalance = await zeroEx.token.getBalanceAsync(zrxAddress, owner);
-			const newSpenderBalance = await zeroEx.token.getBalanceAsync(zrxAddress, spender);
-
-			expect(newOwnerBalance).to.be.bignumber.equal(0);
-			expect(newSpenderBalance).to.be.bignumber.equal(initSpenderBalance.plus(initOwnerBalance));
-		});
-
-		it('should modify allowance if spender has sufficient allowance less than 2^256 - 1', async () => {
-			const initOwnerBalance = await zeroEx.token.getBalanceAsync(zrxAddress, owner);
-			const amountToTransfer = initOwnerBalance;
-			let txHash = await zeroEx.token.setAllowanceAsync(zrxAddress, owner, spender, amountToTransfer);
-			await zeroEx.awaitTransactionMinedAsync(txHash);
-			txHash = await zeroEx.token.transferFromAsync(zrxAddress, owner, spender, spender, amountToTransfer, {
-				gasLimit: constants.MAX_TOKEN_TRANSFERFROM_GAS,
-			});
-			await zeroEx.awaitTransactionMinedAsync(txHash);
-
-			const newSpenderAllowance = await zeroEx.token.getAllowanceAsync(zrxAddress, owner, spender);
-			expect(newSpenderAllowance).to.be.bignumber.equal(0);
-		});
-	});
+    const owner = accounts[0];
+    const spender = accounts[1];
+    let zeroEx: ZeroEx;
+
+    let MAX_UINT: BigNumber;
+
+    let zrx: ContractInstance;
+    let zrxAddress: string;
+
+    beforeEach(async () => {
+        zeroEx = new ZeroEx(web3.currentProvider, {
+            exchangeContractAddress: Exchange.address,
+            networkId: constants.TESTRPC_NETWORK_ID,
+        });
+        zrx = await ZRXToken.new();
+        zrxAddress = zrx.address;
+        MAX_UINT = zeroEx.token.UNLIMITED_ALLOWANCE_IN_BASE_UNITS;
+    });
+
+    describe('constants', () => {
+        it('should have 18 decimals', async () => {
+            const decimals = new BigNumber(await zrx.decimals.call());
+            const expectedDecimals = 18;
+            expect(decimals).to.be.bignumber.equal(expectedDecimals);
+        });
+
+        it('should have a total supply of 1 billion tokens', async () => {
+            const totalSupply = new BigNumber(await zrx.totalSupply.call());
+            const expectedTotalSupply = 1000000000;
+            expect(ZeroEx.toUnitAmount(totalSupply, 18)).to.be.bignumber.equal(expectedTotalSupply);
+        });
+
+        it('should be named 0x Protocol Token', async () => {
+            const name = await zrx.name.call();
+            const expectedName = '0x Protocol Token';
+            expect(name).to.be.equal(expectedName);
+        });
+
+        it('should have the symbol ZRX', async () => {
+            const symbol = await zrx.symbol.call();
+            const expectedSymbol = 'ZRX';
+            expect(symbol).to.be.equal(expectedSymbol);
+        });
+    });
+
+    describe('constructor', () => {
+        it('should initialize owner balance to totalSupply', async () => {
+            const ownerBalance = await zeroEx.token.getBalanceAsync(zrxAddress, owner);
+            const totalSupply = new BigNumber(await zrx.totalSupply.call());
+            expect(totalSupply).to.be.bignumber.equal(ownerBalance);
+        });
+    });
+
+    describe('transfer', () => {
+        it('should transfer balance from sender to receiver', async () => {
+            const receiver = spender;
+            const initOwnerBalance = await zeroEx.token.getBalanceAsync(zrxAddress, owner);
+            const amountToTransfer = new BigNumber(1);
+            const txHash = await zeroEx.token.transferAsync(zrxAddress, owner, receiver, amountToTransfer);
+            await zeroEx.awaitTransactionMinedAsync(txHash);
+            const finalOwnerBalance = await zeroEx.token.getBalanceAsync(zrxAddress, owner);
+            const finalReceiverBalance = await zeroEx.token.getBalanceAsync(zrxAddress, receiver);
+
+            const expectedFinalOwnerBalance = initOwnerBalance.minus(amountToTransfer);
+            const expectedFinalReceiverBalance = amountToTransfer;
+            expect(finalOwnerBalance).to.be.bignumber.equal(expectedFinalOwnerBalance);
+            expect(finalReceiverBalance).to.be.bignumber.equal(expectedFinalReceiverBalance);
+        });
+
+        it('should return true on a 0 value transfer', async () => {
+            const didReturnTrue = await zrx.transfer.call(spender, 0, {
+                from: owner,
+            });
+            expect(didReturnTrue).to.be.true();
+        });
+    });
+
+    describe('transferFrom', () => {
+        it('should return false if owner has insufficient balance', async () => {
+            const ownerBalance = await zeroEx.token.getBalanceAsync(zrxAddress, owner);
+            const amountToTransfer = ownerBalance.plus(1);
+            const txHash = await zeroEx.token.setAllowanceAsync(zrxAddress, owner, spender, amountToTransfer, {
+                gasLimit: constants.MAX_TOKEN_APPROVE_GAS,
+            });
+            await zeroEx.awaitTransactionMinedAsync(txHash);
+            const didReturnTrue = await zrx.transferFrom.call(owner, spender, amountToTransfer, { from: spender });
+            expect(didReturnTrue).to.be.false();
+        });
+
+        it('should return false if spender has insufficient allowance', async () => {
+            const ownerBalance = await zeroEx.token.getBalanceAsync(zrxAddress, owner);
+            const amountToTransfer = ownerBalance;
+
+            const spenderAllowance = await zeroEx.token.getAllowanceAsync(zrxAddress, owner, spender);
+            const spenderAllowanceIsInsufficient = spenderAllowance.cmp(amountToTransfer) < 0;
+            expect(spenderAllowanceIsInsufficient).to.be.true();
+
+            const didReturnTrue = await zrx.transferFrom.call(owner, spender, amountToTransfer, { from: spender });
+            expect(didReturnTrue).to.be.false();
+        });
+
+        it('should return true on a 0 value transfer', async () => {
+            const amountToTransfer = 0;
+            const didReturnTrue = await zrx.transferFrom.call(owner, spender, amountToTransfer, { from: spender });
+            expect(didReturnTrue).to.be.true();
+        });
+
+        it('should not modify spender allowance if spender allowance is 2^256 - 1', async () => {
+            const initOwnerBalance = await zeroEx.token.getBalanceAsync(zrxAddress, owner);
+            const amountToTransfer = initOwnerBalance;
+            const initSpenderAllowance = MAX_UINT;
+            let txHash = await zeroEx.token.setAllowanceAsync(zrxAddress, owner, spender, initSpenderAllowance, {
+                gasLimit: constants.MAX_TOKEN_APPROVE_GAS,
+            });
+            await zeroEx.awaitTransactionMinedAsync(txHash);
+            txHash = await zeroEx.token.transferFromAsync(zrxAddress, owner, spender, spender, amountToTransfer, {
+                gasLimit: constants.MAX_TOKEN_TRANSFERFROM_GAS,
+            });
+            await zeroEx.awaitTransactionMinedAsync(txHash);
+
+            const newSpenderAllowance = await zeroEx.token.getAllowanceAsync(zrxAddress, owner, spender);
+            expect(initSpenderAllowance).to.be.bignumber.equal(newSpenderAllowance);
+        });
+
+        it('should transfer the correct balances if spender has sufficient allowance', async () => {
+            const initOwnerBalance = await zeroEx.token.getBalanceAsync(zrxAddress, owner);
+            const initSpenderBalance = await zeroEx.token.getBalanceAsync(zrxAddress, spender);
+            const amountToTransfer = initOwnerBalance;
+            const initSpenderAllowance = initOwnerBalance;
+            let txHash = await zeroEx.token.setAllowanceAsync(zrxAddress, owner, spender, initSpenderAllowance);
+            await zeroEx.awaitTransactionMinedAsync(txHash);
+            txHash = await zeroEx.token.transferFromAsync(zrxAddress, owner, spender, spender, amountToTransfer, {
+                gasLimit: constants.MAX_TOKEN_TRANSFERFROM_GAS,
+            });
+            await zeroEx.awaitTransactionMinedAsync(txHash);
+
+            const newOwnerBalance = await zeroEx.token.getBalanceAsync(zrxAddress, owner);
+            const newSpenderBalance = await zeroEx.token.getBalanceAsync(zrxAddress, spender);
+
+            expect(newOwnerBalance).to.be.bignumber.equal(0);
+            expect(newSpenderBalance).to.be.bignumber.equal(initSpenderBalance.plus(initOwnerBalance));
+        });
+
+        it('should modify allowance if spender has sufficient allowance less than 2^256 - 1', async () => {
+            const initOwnerBalance = await zeroEx.token.getBalanceAsync(zrxAddress, owner);
+            const amountToTransfer = initOwnerBalance;
+            let txHash = await zeroEx.token.setAllowanceAsync(zrxAddress, owner, spender, amountToTransfer);
+            await zeroEx.awaitTransactionMinedAsync(txHash);
+            txHash = await zeroEx.token.transferFromAsync(zrxAddress, owner, spender, spender, amountToTransfer, {
+                gasLimit: constants.MAX_TOKEN_TRANSFERFROM_GAS,
+            });
+            await zeroEx.awaitTransactionMinedAsync(txHash);
+
+            const newSpenderAllowance = await zeroEx.token.getAllowanceAsync(zrxAddress, owner, spender);
+            expect(newSpenderAllowance).to.be.bignumber.equal(0);
+        });
+    });
 });
diff --git a/packages/contracts/tsconfig.json b/packages/contracts/tsconfig.json
index e88b3c3f0..38008a542 100644
--- a/packages/contracts/tsconfig.json
+++ b/packages/contracts/tsconfig.json
@@ -1,25 +1,25 @@
 {
-	"extends": "../../tsconfig",
-	"compilerOptions": {
-		"outDir": "lib",
-		"baseUrl": ".",
-		"declaration": false,
-		"strictNullChecks": false,
-		"strictFunctionTypes": false,
-		"allowJs": true
-	},
-	"include": [
-		"../../node_modules/types-ethereumjs-util/index.d.ts",
-		"../../node_modules/chai-typescript-typings/index.d.ts",
-		"../../node_modules/web3-typescript-typings/index.d.ts",
-		"../../node_modules/chai-as-promised-typescript-typings/index.d.ts",
-		"../../node_modules/types-ethereumjs-util/index.d.ts",
-		"../../node_modules/types-bn/index.d.ts",
-		"./globals.d.ts",
-		"./util/**/*",
-		"./test/**/*",
-		"./migrations/**/*",
-		"./deploy/**/*"
-	],
-	"exclude": ["./deploy/solc/solc_bin"]
+    "extends": "../../tsconfig",
+    "compilerOptions": {
+        "outDir": "lib",
+        "baseUrl": ".",
+        "declaration": false,
+        "strictNullChecks": false,
+        "strictFunctionTypes": false,
+        "allowJs": true
+    },
+    "include": [
+        "../../node_modules/types-ethereumjs-util/index.d.ts",
+        "../../node_modules/chai-typescript-typings/index.d.ts",
+        "../../node_modules/web3-typescript-typings/index.d.ts",
+        "../../node_modules/chai-as-promised-typescript-typings/index.d.ts",
+        "../../node_modules/types-ethereumjs-util/index.d.ts",
+        "../../node_modules/types-bn/index.d.ts",
+        "./globals.d.ts",
+        "./util/**/*",
+        "./test/**/*",
+        "./migrations/**/*",
+        "./deploy/**/*"
+    ],
+    "exclude": ["./deploy/solc/solc_bin"]
 }
diff --git a/packages/contracts/tslint.json b/packages/contracts/tslint.json
index e63054bfc..ffaefe83a 100644
--- a/packages/contracts/tslint.json
+++ b/packages/contracts/tslint.json
@@ -1,3 +1,3 @@
 {
-	"extends": ["@0xproject/tslint-config"]
+    "extends": ["@0xproject/tslint-config"]
 }
diff --git a/packages/contracts/util/artifacts.ts b/packages/contracts/util/artifacts.ts
index ab9518d41..ecb18cbce 100644
--- a/packages/contracts/util/artifacts.ts
+++ b/packages/contracts/util/artifacts.ts
@@ -1,28 +1,28 @@
 export class Artifacts {
-	public Migrations: any;
-	public TokenTransferProxy: any;
-	public TokenRegistry: any;
-	public MultiSigWalletWithTimeLock: any;
-	public Exchange: any;
-	public ZRXToken: any;
-	public DummyToken: any;
-	public DummyTokenV2: any;
-	public EtherToken: any;
-	public MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress: any;
-	public MaliciousToken: any;
-	constructor(artifacts: any) {
-		this.Migrations = artifacts.require('Migrations');
-		this.TokenTransferProxy = artifacts.require('TokenTransferProxy');
-		this.TokenRegistry = artifacts.require('TokenRegistry');
-		this.MultiSigWalletWithTimeLock = artifacts.require('MultiSigWalletWithTimeLock');
-		this.Exchange = artifacts.require('Exchange');
-		this.ZRXToken = artifacts.require('ZRXToken');
-		this.DummyToken = artifacts.require('DummyToken');
-		this.DummyTokenV2 = artifacts.require('DummyToken_v2');
-		this.EtherToken = artifacts.require('WETH9');
-		this.MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress = artifacts.require(
-			'MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress',
-		);
-		this.MaliciousToken = artifacts.require('MaliciousToken');
-	}
+    public Migrations: any;
+    public TokenTransferProxy: any;
+    public TokenRegistry: any;
+    public MultiSigWalletWithTimeLock: any;
+    public Exchange: any;
+    public ZRXToken: any;
+    public DummyToken: any;
+    public DummyTokenV2: any;
+    public EtherToken: any;
+    public MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress: any;
+    public MaliciousToken: any;
+    constructor(artifacts: any) {
+        this.Migrations = artifacts.require('Migrations');
+        this.TokenTransferProxy = artifacts.require('TokenTransferProxy');
+        this.TokenRegistry = artifacts.require('TokenRegistry');
+        this.MultiSigWalletWithTimeLock = artifacts.require('MultiSigWalletWithTimeLock');
+        this.Exchange = artifacts.require('Exchange');
+        this.ZRXToken = artifacts.require('ZRXToken');
+        this.DummyToken = artifacts.require('DummyToken');
+        this.DummyTokenV2 = artifacts.require('DummyToken_v2');
+        this.EtherToken = artifacts.require('WETH9');
+        this.MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress = artifacts.require(
+            'MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress',
+        );
+        this.MaliciousToken = artifacts.require('MaliciousToken');
+    }
 }
diff --git a/packages/contracts/util/balances.ts b/packages/contracts/util/balances.ts
index f8c103670..6a1659ab1 100644
--- a/packages/contracts/util/balances.ts
+++ b/packages/contracts/util/balances.ts
@@ -4,24 +4,24 @@ import * as _ from 'lodash';
 import { BalancesByOwner, ContractInstance } from './types';
 
 export class Balances {
-	private _tokenContractInstances: ContractInstance[];
-	private _ownerAddresses: string[];
-	constructor(tokenContractInstances: ContractInstance[], ownerAddresses: string[]) {
-		this._tokenContractInstances = tokenContractInstances;
-		this._ownerAddresses = ownerAddresses;
-	}
-	public async getAsync(): Promise<BalancesByOwner> {
-		const balancesByOwner: BalancesByOwner = {};
-		for (const tokenContractInstance of this._tokenContractInstances) {
-			for (const ownerAddress of this._ownerAddresses) {
-				let balance = await tokenContractInstance.balanceOf(ownerAddress);
-				balance = new BigNumber(balance);
-				if (_.isUndefined(balancesByOwner[ownerAddress])) {
-					balancesByOwner[ownerAddress] = {};
-				}
-				balancesByOwner[ownerAddress][tokenContractInstance.address] = balance;
-			}
-		}
-		return balancesByOwner;
-	}
+    private _tokenContractInstances: ContractInstance[];
+    private _ownerAddresses: string[];
+    constructor(tokenContractInstances: ContractInstance[], ownerAddresses: string[]) {
+        this._tokenContractInstances = tokenContractInstances;
+        this._ownerAddresses = ownerAddresses;
+    }
+    public async getAsync(): Promise<BalancesByOwner> {
+        const balancesByOwner: BalancesByOwner = {};
+        for (const tokenContractInstance of this._tokenContractInstances) {
+            for (const ownerAddress of this._ownerAddresses) {
+                let balance = await tokenContractInstance.balanceOf(ownerAddress);
+                balance = new BigNumber(balance);
+                if (_.isUndefined(balancesByOwner[ownerAddress])) {
+                    balancesByOwner[ownerAddress] = {};
+                }
+                balancesByOwner[ownerAddress][tokenContractInstance.address] = balance;
+            }
+        }
+        return balancesByOwner;
+    }
 }
diff --git a/packages/contracts/util/constants.ts b/packages/contracts/util/constants.ts
index 85fd31be3..e61b2f802 100644
--- a/packages/contracts/util/constants.ts
+++ b/packages/contracts/util/constants.ts
@@ -1,9 +1,9 @@
 export const constants = {
-	NULL_BYTES: '0x',
-	INVALID_OPCODE: 'invalid opcode',
-	REVERT: 'revert',
-	TESTRPC_NETWORK_ID: 50,
-	MAX_ETHERTOKEN_WITHDRAW_GAS: 43000,
-	MAX_TOKEN_TRANSFERFROM_GAS: 80000,
-	MAX_TOKEN_APPROVE_GAS: 60000,
+    NULL_BYTES: '0x',
+    INVALID_OPCODE: 'invalid opcode',
+    REVERT: 'revert',
+    TESTRPC_NETWORK_ID: 50,
+    MAX_ETHERTOKEN_WITHDRAW_GAS: 43000,
+    MAX_TOKEN_TRANSFERFROM_GAS: 80000,
+    MAX_TOKEN_APPROVE_GAS: 60000,
 };
diff --git a/packages/contracts/util/crypto.ts b/packages/contracts/util/crypto.ts
index 29bbf206a..9173df643 100644
--- a/packages/contracts/util/crypto.ts
+++ b/packages/contracts/util/crypto.ts
@@ -4,7 +4,7 @@ import ethUtil = require('ethereumjs-util');
 import * as _ from 'lodash';
 
 export const crypto = {
-	/*
+    /*
    * We convert types from JS to Solidity as follows:
    * BigNumber -> uint256
    * number -> uint8
@@ -12,26 +12,26 @@ export const crypto = {
    * boolean -> bool
    * valid Ethereum address -> address
    */
-	solSHA3(args: any[]): Buffer {
-		const argTypes: string[] = [];
-		_.each(args, (arg, i) => {
-			const isNumber = _.isFinite(arg);
-			if (isNumber) {
-				argTypes.push('uint8');
-			} else if (arg.isBigNumber) {
-				argTypes.push('uint256');
-				args[i] = new BN(arg.toString(10), 10);
-			} else if (ethUtil.isValidAddress(arg)) {
-				argTypes.push('address');
-			} else if (_.isString(arg)) {
-				argTypes.push('string');
-			} else if (_.isBoolean(arg)) {
-				argTypes.push('bool');
-			} else {
-				throw new Error(`Unable to guess arg type: ${arg}`);
-			}
-		});
-		const hash = ABI.soliditySHA3(argTypes, args);
-		return hash;
-	},
+    solSHA3(args: any[]): Buffer {
+        const argTypes: string[] = [];
+        _.each(args, (arg, i) => {
+            const isNumber = _.isFinite(arg);
+            if (isNumber) {
+                argTypes.push('uint8');
+            } else if (arg.isBigNumber) {
+                argTypes.push('uint256');
+                args[i] = new BN(arg.toString(10), 10);
+            } else if (ethUtil.isValidAddress(arg)) {
+                argTypes.push('address');
+            } else if (_.isString(arg)) {
+                argTypes.push('string');
+            } else if (_.isBoolean(arg)) {
+                argTypes.push('bool');
+            } else {
+                throw new Error(`Unable to guess arg type: ${arg}`);
+            }
+        });
+        const hash = ABI.soliditySHA3(argTypes, args);
+        return hash;
+    },
 };
diff --git a/packages/contracts/util/exchange_wrapper.ts b/packages/contracts/util/exchange_wrapper.ts
index 3a3c44aae..ca79f92c4 100644
--- a/packages/contracts/util/exchange_wrapper.ts
+++ b/packages/contracts/util/exchange_wrapper.ts
@@ -6,186 +6,186 @@ import { Order } from './order';
 import { ContractInstance } from './types';
 
 export class ExchangeWrapper {
-	private _exchange: ContractInstance;
-	constructor(exchangeContractInstance: ContractInstance) {
-		this._exchange = exchangeContractInstance;
-	}
-	public async fillOrderAsync(
-		order: Order,
-		from: string,
-		opts: {
-			fillTakerTokenAmount?: BigNumber;
-			shouldThrowOnInsufficientBalanceOrAllowance?: boolean;
-		} = {},
-	) {
-		const shouldThrowOnInsufficientBalanceOrAllowance = !!opts.shouldThrowOnInsufficientBalanceOrAllowance;
-		const params = order.createFill(shouldThrowOnInsufficientBalanceOrAllowance, opts.fillTakerTokenAmount);
-		const tx = await this._exchange.fillOrder(
-			params.orderAddresses,
-			params.orderValues,
-			params.fillTakerTokenAmount,
-			params.shouldThrowOnInsufficientBalanceOrAllowance,
-			params.v,
-			params.r,
-			params.s,
-			{ from },
-		);
-		_.each(tx.logs, log => wrapLogBigNumbers(log));
-		return tx;
-	}
-	public async cancelOrderAsync(order: Order, from: string, opts: { cancelTakerTokenAmount?: BigNumber } = {}) {
-		const params = order.createCancel(opts.cancelTakerTokenAmount);
-		const tx = await this._exchange.cancelOrder(
-			params.orderAddresses,
-			params.orderValues,
-			params.cancelTakerTokenAmount,
-			{ from },
-		);
-		_.each(tx.logs, log => wrapLogBigNumbers(log));
-		return tx;
-	}
-	public async fillOrKillOrderAsync(order: Order, from: string, opts: { fillTakerTokenAmount?: BigNumber } = {}) {
-		const shouldThrowOnInsufficientBalanceOrAllowance = true;
-		const params = order.createFill(shouldThrowOnInsufficientBalanceOrAllowance, opts.fillTakerTokenAmount);
-		const tx = await this._exchange.fillOrKillOrder(
-			params.orderAddresses,
-			params.orderValues,
-			params.fillTakerTokenAmount,
-			params.v,
-			params.r,
-			params.s,
-			{ from },
-		);
-		_.each(tx.logs, log => wrapLogBigNumbers(log));
-		return tx;
-	}
-	public async batchFillOrdersAsync(
-		orders: Order[],
-		from: string,
-		opts: {
-			fillTakerTokenAmounts?: BigNumber[];
-			shouldThrowOnInsufficientBalanceOrAllowance?: boolean;
-		} = {},
-	) {
-		const shouldThrowOnInsufficientBalanceOrAllowance = !!opts.shouldThrowOnInsufficientBalanceOrAllowance;
-		const params = formatters.createBatchFill(
-			orders,
-			shouldThrowOnInsufficientBalanceOrAllowance,
-			opts.fillTakerTokenAmounts,
-		);
-		const tx = await this._exchange.batchFillOrders(
-			params.orderAddresses,
-			params.orderValues,
-			params.fillTakerTokenAmounts,
-			params.shouldThrowOnInsufficientBalanceOrAllowance,
-			params.v,
-			params.r,
-			params.s,
-			{ from },
-		);
-		_.each(tx.logs, log => wrapLogBigNumbers(log));
-		return tx;
-	}
-	public async batchFillOrKillOrdersAsync(
-		orders: Order[],
-		from: string,
-		opts: { fillTakerTokenAmounts?: BigNumber[] } = {},
-	) {
-		const params = formatters.createBatchFill(orders, undefined, opts.fillTakerTokenAmounts);
-		const tx = await this._exchange.batchFillOrKillOrders(
-			params.orderAddresses,
-			params.orderValues,
-			params.fillTakerTokenAmounts,
-			params.v,
-			params.r,
-			params.s,
-			{ from },
-		);
-		_.each(tx.logs, log => wrapLogBigNumbers(log));
-		return tx;
-	}
-	public async fillOrdersUpToAsync(
-		orders: Order[],
-		from: string,
-		opts: {
-			fillTakerTokenAmount?: BigNumber;
-			shouldThrowOnInsufficientBalanceOrAllowance?: boolean;
-		} = {},
-	) {
-		const shouldThrowOnInsufficientBalanceOrAllowance = !!opts.shouldThrowOnInsufficientBalanceOrAllowance;
-		const params = formatters.createFillUpTo(
-			orders,
-			shouldThrowOnInsufficientBalanceOrAllowance,
-			opts.fillTakerTokenAmount,
-		);
-		const tx = await this._exchange.fillOrdersUpTo(
-			params.orderAddresses,
-			params.orderValues,
-			params.fillTakerTokenAmount,
-			params.shouldThrowOnInsufficientBalanceOrAllowance,
-			params.v,
-			params.r,
-			params.s,
-			{ from },
-		);
-		_.each(tx.logs, log => wrapLogBigNumbers(log));
-		return tx;
-	}
-	public async batchCancelOrdersAsync(
-		orders: Order[],
-		from: string,
-		opts: { cancelTakerTokenAmounts?: BigNumber[] } = {},
-	) {
-		const params = formatters.createBatchCancel(orders, opts.cancelTakerTokenAmounts);
-		const tx = await this._exchange.batchCancelOrders(
-			params.orderAddresses,
-			params.orderValues,
-			params.cancelTakerTokenAmounts,
-			{ from },
-		);
-		_.each(tx.logs, log => wrapLogBigNumbers(log));
-		return tx;
-	}
-	public async getOrderHashAsync(order: Order): Promise<string> {
-		const shouldThrowOnInsufficientBalanceOrAllowance = false;
-		const params = order.createFill(shouldThrowOnInsufficientBalanceOrAllowance);
-		const orderHash = await this._exchange.getOrderHash(params.orderAddresses, params.orderValues);
-		return orderHash;
-	}
-	public async isValidSignatureAsync(order: Order): Promise<boolean> {
-		const isValidSignature = await this._exchange.isValidSignature(
-			order.params.maker,
-			order.params.orderHashHex,
-			order.params.v,
-			order.params.r,
-			order.params.s,
-		);
-		return isValidSignature;
-	}
-	public async isRoundingErrorAsync(
-		numerator: BigNumber,
-		denominator: BigNumber,
-		target: BigNumber,
-	): Promise<boolean> {
-		const isRoundingError = await this._exchange.isRoundingError(numerator, denominator, target);
-		return isRoundingError;
-	}
-	public async getPartialAmountAsync(
-		numerator: BigNumber,
-		denominator: BigNumber,
-		target: BigNumber,
-	): Promise<BigNumber> {
-		const partialAmount = new BigNumber(await this._exchange.getPartialAmount(numerator, denominator, target));
-		return partialAmount;
-	}
+    private _exchange: ContractInstance;
+    constructor(exchangeContractInstance: ContractInstance) {
+        this._exchange = exchangeContractInstance;
+    }
+    public async fillOrderAsync(
+        order: Order,
+        from: string,
+        opts: {
+            fillTakerTokenAmount?: BigNumber;
+            shouldThrowOnInsufficientBalanceOrAllowance?: boolean;
+        } = {},
+    ) {
+        const shouldThrowOnInsufficientBalanceOrAllowance = !!opts.shouldThrowOnInsufficientBalanceOrAllowance;
+        const params = order.createFill(shouldThrowOnInsufficientBalanceOrAllowance, opts.fillTakerTokenAmount);
+        const tx = await this._exchange.fillOrder(
+            params.orderAddresses,
+            params.orderValues,
+            params.fillTakerTokenAmount,
+            params.shouldThrowOnInsufficientBalanceOrAllowance,
+            params.v,
+            params.r,
+            params.s,
+            { from },
+        );
+        _.each(tx.logs, log => wrapLogBigNumbers(log));
+        return tx;
+    }
+    public async cancelOrderAsync(order: Order, from: string, opts: { cancelTakerTokenAmount?: BigNumber } = {}) {
+        const params = order.createCancel(opts.cancelTakerTokenAmount);
+        const tx = await this._exchange.cancelOrder(
+            params.orderAddresses,
+            params.orderValues,
+            params.cancelTakerTokenAmount,
+            { from },
+        );
+        _.each(tx.logs, log => wrapLogBigNumbers(log));
+        return tx;
+    }
+    public async fillOrKillOrderAsync(order: Order, from: string, opts: { fillTakerTokenAmount?: BigNumber } = {}) {
+        const shouldThrowOnInsufficientBalanceOrAllowance = true;
+        const params = order.createFill(shouldThrowOnInsufficientBalanceOrAllowance, opts.fillTakerTokenAmount);
+        const tx = await this._exchange.fillOrKillOrder(
+            params.orderAddresses,
+            params.orderValues,
+            params.fillTakerTokenAmount,
+            params.v,
+            params.r,
+            params.s,
+            { from },
+        );
+        _.each(tx.logs, log => wrapLogBigNumbers(log));
+        return tx;
+    }
+    public async batchFillOrdersAsync(
+        orders: Order[],
+        from: string,
+        opts: {
+            fillTakerTokenAmounts?: BigNumber[];
+            shouldThrowOnInsufficientBalanceOrAllowance?: boolean;
+        } = {},
+    ) {
+        const shouldThrowOnInsufficientBalanceOrAllowance = !!opts.shouldThrowOnInsufficientBalanceOrAllowance;
+        const params = formatters.createBatchFill(
+            orders,
+            shouldThrowOnInsufficientBalanceOrAllowance,
+            opts.fillTakerTokenAmounts,
+        );
+        const tx = await this._exchange.batchFillOrders(
+            params.orderAddresses,
+            params.orderValues,
+            params.fillTakerTokenAmounts,
+            params.shouldThrowOnInsufficientBalanceOrAllowance,
+            params.v,
+            params.r,
+            params.s,
+            { from },
+        );
+        _.each(tx.logs, log => wrapLogBigNumbers(log));
+        return tx;
+    }
+    public async batchFillOrKillOrdersAsync(
+        orders: Order[],
+        from: string,
+        opts: { fillTakerTokenAmounts?: BigNumber[] } = {},
+    ) {
+        const params = formatters.createBatchFill(orders, undefined, opts.fillTakerTokenAmounts);
+        const tx = await this._exchange.batchFillOrKillOrders(
+            params.orderAddresses,
+            params.orderValues,
+            params.fillTakerTokenAmounts,
+            params.v,
+            params.r,
+            params.s,
+            { from },
+        );
+        _.each(tx.logs, log => wrapLogBigNumbers(log));
+        return tx;
+    }
+    public async fillOrdersUpToAsync(
+        orders: Order[],
+        from: string,
+        opts: {
+            fillTakerTokenAmount?: BigNumber;
+            shouldThrowOnInsufficientBalanceOrAllowance?: boolean;
+        } = {},
+    ) {
+        const shouldThrowOnInsufficientBalanceOrAllowance = !!opts.shouldThrowOnInsufficientBalanceOrAllowance;
+        const params = formatters.createFillUpTo(
+            orders,
+            shouldThrowOnInsufficientBalanceOrAllowance,
+            opts.fillTakerTokenAmount,
+        );
+        const tx = await this._exchange.fillOrdersUpTo(
+            params.orderAddresses,
+            params.orderValues,
+            params.fillTakerTokenAmount,
+            params.shouldThrowOnInsufficientBalanceOrAllowance,
+            params.v,
+            params.r,
+            params.s,
+            { from },
+        );
+        _.each(tx.logs, log => wrapLogBigNumbers(log));
+        return tx;
+    }
+    public async batchCancelOrdersAsync(
+        orders: Order[],
+        from: string,
+        opts: { cancelTakerTokenAmounts?: BigNumber[] } = {},
+    ) {
+        const params = formatters.createBatchCancel(orders, opts.cancelTakerTokenAmounts);
+        const tx = await this._exchange.batchCancelOrders(
+            params.orderAddresses,
+            params.orderValues,
+            params.cancelTakerTokenAmounts,
+            { from },
+        );
+        _.each(tx.logs, log => wrapLogBigNumbers(log));
+        return tx;
+    }
+    public async getOrderHashAsync(order: Order): Promise<string> {
+        const shouldThrowOnInsufficientBalanceOrAllowance = false;
+        const params = order.createFill(shouldThrowOnInsufficientBalanceOrAllowance);
+        const orderHash = await this._exchange.getOrderHash(params.orderAddresses, params.orderValues);
+        return orderHash;
+    }
+    public async isValidSignatureAsync(order: Order): Promise<boolean> {
+        const isValidSignature = await this._exchange.isValidSignature(
+            order.params.maker,
+            order.params.orderHashHex,
+            order.params.v,
+            order.params.r,
+            order.params.s,
+        );
+        return isValidSignature;
+    }
+    public async isRoundingErrorAsync(
+        numerator: BigNumber,
+        denominator: BigNumber,
+        target: BigNumber,
+    ): Promise<boolean> {
+        const isRoundingError = await this._exchange.isRoundingError(numerator, denominator, target);
+        return isRoundingError;
+    }
+    public async getPartialAmountAsync(
+        numerator: BigNumber,
+        denominator: BigNumber,
+        target: BigNumber,
+    ): Promise<BigNumber> {
+        const partialAmount = new BigNumber(await this._exchange.getPartialAmount(numerator, denominator, target));
+        return partialAmount;
+    }
 }
 
 function 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]);
-		}
-	}
+    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]);
+        }
+    }
 }
diff --git a/packages/contracts/util/formatters.ts b/packages/contracts/util/formatters.ts
index c452b8e79..0d0ef6df4 100644
--- a/packages/contracts/util/formatters.ts
+++ b/packages/contracts/util/formatters.ts
@@ -5,107 +5,107 @@ import { Order } from './order';
 import { BatchCancelOrders, BatchFillOrders, FillOrdersUpTo } from './types';
 
 export const formatters = {
-	createBatchFill(
-		orders: Order[],
-		shouldThrowOnInsufficientBalanceOrAllowance: boolean,
-		fillTakerTokenAmounts: BigNumber[] = [],
-	) {
-		const batchFill: BatchFillOrders = {
-			orderAddresses: [],
-			orderValues: [],
-			fillTakerTokenAmounts,
-			shouldThrowOnInsufficientBalanceOrAllowance,
-			v: [],
-			r: [],
-			s: [],
-		};
-		_.forEach(orders, order => {
-			batchFill.orderAddresses.push([
-				order.params.maker,
-				order.params.taker,
-				order.params.makerToken,
-				order.params.takerToken,
-				order.params.feeRecipient,
-			]);
-			batchFill.orderValues.push([
-				order.params.makerTokenAmount,
-				order.params.takerTokenAmount,
-				order.params.makerFee,
-				order.params.takerFee,
-				order.params.expirationTimestampInSec,
-				order.params.salt,
-			]);
-			batchFill.v.push(order.params.v);
-			batchFill.r.push(order.params.r);
-			batchFill.s.push(order.params.s);
-			if (fillTakerTokenAmounts.length < orders.length) {
-				batchFill.fillTakerTokenAmounts.push(order.params.takerTokenAmount);
-			}
-		});
-		return batchFill;
-	},
-	createFillUpTo(
-		orders: Order[],
-		shouldThrowOnInsufficientBalanceOrAllowance: boolean,
-		fillTakerTokenAmount: BigNumber,
-	) {
-		const fillUpTo: FillOrdersUpTo = {
-			orderAddresses: [],
-			orderValues: [],
-			fillTakerTokenAmount,
-			shouldThrowOnInsufficientBalanceOrAllowance,
-			v: [],
-			r: [],
-			s: [],
-		};
-		orders.forEach(order => {
-			fillUpTo.orderAddresses.push([
-				order.params.maker,
-				order.params.taker,
-				order.params.makerToken,
-				order.params.takerToken,
-				order.params.feeRecipient,
-			]);
-			fillUpTo.orderValues.push([
-				order.params.makerTokenAmount,
-				order.params.takerTokenAmount,
-				order.params.makerFee,
-				order.params.takerFee,
-				order.params.expirationTimestampInSec,
-				order.params.salt,
-			]);
-			fillUpTo.v.push(order.params.v);
-			fillUpTo.r.push(order.params.r);
-			fillUpTo.s.push(order.params.s);
-		});
-		return fillUpTo;
-	},
-	createBatchCancel(orders: Order[], cancelTakerTokenAmounts: BigNumber[] = []) {
-		const batchCancel: BatchCancelOrders = {
-			orderAddresses: [],
-			orderValues: [],
-			cancelTakerTokenAmounts,
-		};
-		orders.forEach(order => {
-			batchCancel.orderAddresses.push([
-				order.params.maker,
-				order.params.taker,
-				order.params.makerToken,
-				order.params.takerToken,
-				order.params.feeRecipient,
-			]);
-			batchCancel.orderValues.push([
-				order.params.makerTokenAmount,
-				order.params.takerTokenAmount,
-				order.params.makerFee,
-				order.params.takerFee,
-				order.params.expirationTimestampInSec,
-				order.params.salt,
-			]);
-			if (cancelTakerTokenAmounts.length < orders.length) {
-				batchCancel.cancelTakerTokenAmounts.push(order.params.takerTokenAmount);
-			}
-		});
-		return batchCancel;
-	},
+    createBatchFill(
+        orders: Order[],
+        shouldThrowOnInsufficientBalanceOrAllowance: boolean,
+        fillTakerTokenAmounts: BigNumber[] = [],
+    ) {
+        const batchFill: BatchFillOrders = {
+            orderAddresses: [],
+            orderValues: [],
+            fillTakerTokenAmounts,
+            shouldThrowOnInsufficientBalanceOrAllowance,
+            v: [],
+            r: [],
+            s: [],
+        };
+        _.forEach(orders, order => {
+            batchFill.orderAddresses.push([
+                order.params.maker,
+                order.params.taker,
+                order.params.makerToken,
+                order.params.takerToken,
+                order.params.feeRecipient,
+            ]);
+            batchFill.orderValues.push([
+                order.params.makerTokenAmount,
+                order.params.takerTokenAmount,
+                order.params.makerFee,
+                order.params.takerFee,
+                order.params.expirationTimestampInSec,
+                order.params.salt,
+            ]);
+            batchFill.v.push(order.params.v);
+            batchFill.r.push(order.params.r);
+            batchFill.s.push(order.params.s);
+            if (fillTakerTokenAmounts.length < orders.length) {
+                batchFill.fillTakerTokenAmounts.push(order.params.takerTokenAmount);
+            }
+        });
+        return batchFill;
+    },
+    createFillUpTo(
+        orders: Order[],
+        shouldThrowOnInsufficientBalanceOrAllowance: boolean,
+        fillTakerTokenAmount: BigNumber,
+    ) {
+        const fillUpTo: FillOrdersUpTo = {
+            orderAddresses: [],
+            orderValues: [],
+            fillTakerTokenAmount,
+            shouldThrowOnInsufficientBalanceOrAllowance,
+            v: [],
+            r: [],
+            s: [],
+        };
+        orders.forEach(order => {
+            fillUpTo.orderAddresses.push([
+                order.params.maker,
+                order.params.taker,
+                order.params.makerToken,
+                order.params.takerToken,
+                order.params.feeRecipient,
+            ]);
+            fillUpTo.orderValues.push([
+                order.params.makerTokenAmount,
+                order.params.takerTokenAmount,
+                order.params.makerFee,
+                order.params.takerFee,
+                order.params.expirationTimestampInSec,
+                order.params.salt,
+            ]);
+            fillUpTo.v.push(order.params.v);
+            fillUpTo.r.push(order.params.r);
+            fillUpTo.s.push(order.params.s);
+        });
+        return fillUpTo;
+    },
+    createBatchCancel(orders: Order[], cancelTakerTokenAmounts: BigNumber[] = []) {
+        const batchCancel: BatchCancelOrders = {
+            orderAddresses: [],
+            orderValues: [],
+            cancelTakerTokenAmounts,
+        };
+        orders.forEach(order => {
+            batchCancel.orderAddresses.push([
+                order.params.maker,
+                order.params.taker,
+                order.params.makerToken,
+                order.params.takerToken,
+                order.params.feeRecipient,
+            ]);
+            batchCancel.orderValues.push([
+                order.params.makerTokenAmount,
+                order.params.takerTokenAmount,
+                order.params.makerFee,
+                order.params.takerFee,
+                order.params.expirationTimestampInSec,
+                order.params.salt,
+            ]);
+            if (cancelTakerTokenAmounts.length < orders.length) {
+                batchCancel.cancelTakerTokenAmounts.push(order.params.takerTokenAmount);
+            }
+        });
+        return batchCancel;
+    },
 };
diff --git a/packages/contracts/util/multi_sig_wrapper.ts b/packages/contracts/util/multi_sig_wrapper.ts
index ca9f07ce5..0e2e671ec 100644
--- a/packages/contracts/util/multi_sig_wrapper.ts
+++ b/packages/contracts/util/multi_sig_wrapper.ts
@@ -6,34 +6,34 @@ import * as Web3 from 'web3';
 import { ContractInstance, TransactionDataParams } from './types';
 
 export class MultiSigWrapper {
-	private _multiSig: ContractInstance;
-	public static encodeFnArgs(name: string, abi: Web3.AbiDefinition[], args: any[]) {
-		const abiEntity = _.find(abi, { name }) as Web3.MethodAbi;
-		if (_.isUndefined(abiEntity)) {
-			throw new Error(`Did not find abi entry for name: ${name}`);
-		}
-		const types = _.map(abiEntity.inputs, input => input.type);
-		const funcSig = ethUtil.bufferToHex(ABI.methodID(name, types));
-		const argsData = _.map(args, arg => {
-			const target = _.isBoolean(arg) ? +arg : arg;
-			const targetBuff = ethUtil.toBuffer(target);
-			return ethUtil.setLengthLeft(targetBuff, 32).toString('hex');
-		});
-		return funcSig + argsData.join('');
-	}
-	constructor(multiSigContractInstance: ContractInstance) {
-		this._multiSig = multiSigContractInstance;
-	}
-	public async submitTransactionAsync(
-		destination: string,
-		from: string,
-		dataParams: TransactionDataParams,
-		value: number = 0,
-	) {
-		const { name, abi, args = [] } = dataParams;
-		const encoded = MultiSigWrapper.encodeFnArgs(name, abi, args);
-		return this._multiSig.submitTransaction(destination, value, encoded, {
-			from,
-		});
-	}
+    private _multiSig: ContractInstance;
+    public static encodeFnArgs(name: string, abi: Web3.AbiDefinition[], args: any[]) {
+        const abiEntity = _.find(abi, { name }) as Web3.MethodAbi;
+        if (_.isUndefined(abiEntity)) {
+            throw new Error(`Did not find abi entry for name: ${name}`);
+        }
+        const types = _.map(abiEntity.inputs, input => input.type);
+        const funcSig = ethUtil.bufferToHex(ABI.methodID(name, types));
+        const argsData = _.map(args, arg => {
+            const target = _.isBoolean(arg) ? +arg : arg;
+            const targetBuff = ethUtil.toBuffer(target);
+            return ethUtil.setLengthLeft(targetBuff, 32).toString('hex');
+        });
+        return funcSig + argsData.join('');
+    }
+    constructor(multiSigContractInstance: ContractInstance) {
+        this._multiSig = multiSigContractInstance;
+    }
+    public async submitTransactionAsync(
+        destination: string,
+        from: string,
+        dataParams: TransactionDataParams,
+        value: number = 0,
+    ) {
+        const { name, abi, args = [] } = dataParams;
+        const encoded = MultiSigWrapper.encodeFnArgs(name, abi, args);
+        return this._multiSig.submitTransaction(destination, value, encoded, {
+            from,
+        });
+    }
 }
diff --git a/packages/contracts/util/order.ts b/packages/contracts/util/order.ts
index 31194c03e..e202d485b 100644
--- a/packages/contracts/util/order.ts
+++ b/packages/contracts/util/order.ts
@@ -11,98 +11,98 @@ import { OrderParams } from './types';
 const web3: Web3 = (global as any).web3;
 
 export class Order {
-	public params: OrderParams;
-	constructor(params: OrderParams) {
-		this.params = params;
-	}
-	public isValidSignature() {
-		const { v, r, s } = this.params;
-		if (_.isUndefined(v) || _.isUndefined(r) || _.isUndefined(s)) {
-			throw new Error('Cannot call isValidSignature on unsigned order');
-		}
-		const orderHash = this._getOrderHash();
-		const msgHash = ethUtil.hashPersonalMessage(ethUtil.toBuffer(orderHash));
-		try {
-			const pubKey = ethUtil.ecrecover(msgHash, v, ethUtil.toBuffer(r), ethUtil.toBuffer(s));
-			const recoveredAddress = ethUtil.bufferToHex(ethUtil.pubToAddress(pubKey));
-			return recoveredAddress === this.params.maker;
-		} catch (err) {
-			return false;
-		}
-	}
-	public async signAsync() {
-		const orderHash = this._getOrderHash();
-		const signature = await promisify<string>(web3.eth.sign)(this.params.maker, orderHash);
-		const { v, r, s } = ethUtil.fromRpcSig(signature);
-		this.params = _.assign(this.params, {
-			orderHashHex: orderHash,
-			v,
-			r: ethUtil.bufferToHex(r),
-			s: ethUtil.bufferToHex(s),
-		});
-	}
-	public createFill(shouldThrowOnInsufficientBalanceOrAllowance?: boolean, fillTakerTokenAmount?: BigNumber) {
-		const fill = {
-			orderAddresses: [
-				this.params.maker,
-				this.params.taker,
-				this.params.makerToken,
-				this.params.takerToken,
-				this.params.feeRecipient,
-			],
-			orderValues: [
-				this.params.makerTokenAmount,
-				this.params.takerTokenAmount,
-				this.params.makerFee,
-				this.params.takerFee,
-				this.params.expirationTimestampInSec,
-				this.params.salt,
-			],
-			fillTakerTokenAmount: fillTakerTokenAmount || this.params.takerTokenAmount,
-			shouldThrowOnInsufficientBalanceOrAllowance: !!shouldThrowOnInsufficientBalanceOrAllowance,
-			v: this.params.v,
-			r: this.params.r,
-			s: this.params.s,
-		};
-		return fill;
-	}
-	public createCancel(cancelTakerTokenAmount?: BigNumber) {
-		const cancel = {
-			orderAddresses: [
-				this.params.maker,
-				this.params.taker,
-				this.params.makerToken,
-				this.params.takerToken,
-				this.params.feeRecipient,
-			],
-			orderValues: [
-				this.params.makerTokenAmount,
-				this.params.takerTokenAmount,
-				this.params.makerFee,
-				this.params.takerFee,
-				this.params.expirationTimestampInSec,
-				this.params.salt,
-			],
-			cancelTakerTokenAmount: cancelTakerTokenAmount || this.params.takerTokenAmount,
-		};
-		return cancel;
-	}
-	private _getOrderHash(): string {
-		const orderHash = crypto.solSHA3([
-			this.params.exchangeContractAddress,
-			this.params.maker,
-			this.params.taker,
-			this.params.makerToken,
-			this.params.takerToken,
-			this.params.feeRecipient,
-			this.params.makerTokenAmount,
-			this.params.takerTokenAmount,
-			this.params.makerFee,
-			this.params.takerFee,
-			this.params.expirationTimestampInSec,
-			this.params.salt,
-		]);
-		const orderHashHex = ethUtil.bufferToHex(orderHash);
-		return orderHashHex;
-	}
+    public params: OrderParams;
+    constructor(params: OrderParams) {
+        this.params = params;
+    }
+    public isValidSignature() {
+        const { v, r, s } = this.params;
+        if (_.isUndefined(v) || _.isUndefined(r) || _.isUndefined(s)) {
+            throw new Error('Cannot call isValidSignature on unsigned order');
+        }
+        const orderHash = this._getOrderHash();
+        const msgHash = ethUtil.hashPersonalMessage(ethUtil.toBuffer(orderHash));
+        try {
+            const pubKey = ethUtil.ecrecover(msgHash, v, ethUtil.toBuffer(r), ethUtil.toBuffer(s));
+            const recoveredAddress = ethUtil.bufferToHex(ethUtil.pubToAddress(pubKey));
+            return recoveredAddress === this.params.maker;
+        } catch (err) {
+            return false;
+        }
+    }
+    public async signAsync() {
+        const orderHash = this._getOrderHash();
+        const signature = await promisify<string>(web3.eth.sign)(this.params.maker, orderHash);
+        const { v, r, s } = ethUtil.fromRpcSig(signature);
+        this.params = _.assign(this.params, {
+            orderHashHex: orderHash,
+            v,
+            r: ethUtil.bufferToHex(r),
+            s: ethUtil.bufferToHex(s),
+        });
+    }
+    public createFill(shouldThrowOnInsufficientBalanceOrAllowance?: boolean, fillTakerTokenAmount?: BigNumber) {
+        const fill = {
+            orderAddresses: [
+                this.params.maker,
+                this.params.taker,
+                this.params.makerToken,
+                this.params.takerToken,
+                this.params.feeRecipient,
+            ],
+            orderValues: [
+                this.params.makerTokenAmount,
+                this.params.takerTokenAmount,
+                this.params.makerFee,
+                this.params.takerFee,
+                this.params.expirationTimestampInSec,
+                this.params.salt,
+            ],
+            fillTakerTokenAmount: fillTakerTokenAmount || this.params.takerTokenAmount,
+            shouldThrowOnInsufficientBalanceOrAllowance: !!shouldThrowOnInsufficientBalanceOrAllowance,
+            v: this.params.v,
+            r: this.params.r,
+            s: this.params.s,
+        };
+        return fill;
+    }
+    public createCancel(cancelTakerTokenAmount?: BigNumber) {
+        const cancel = {
+            orderAddresses: [
+                this.params.maker,
+                this.params.taker,
+                this.params.makerToken,
+                this.params.takerToken,
+                this.params.feeRecipient,
+            ],
+            orderValues: [
+                this.params.makerTokenAmount,
+                this.params.takerTokenAmount,
+                this.params.makerFee,
+                this.params.takerFee,
+                this.params.expirationTimestampInSec,
+                this.params.salt,
+            ],
+            cancelTakerTokenAmount: cancelTakerTokenAmount || this.params.takerTokenAmount,
+        };
+        return cancel;
+    }
+    private _getOrderHash(): string {
+        const orderHash = crypto.solSHA3([
+            this.params.exchangeContractAddress,
+            this.params.maker,
+            this.params.taker,
+            this.params.makerToken,
+            this.params.takerToken,
+            this.params.feeRecipient,
+            this.params.makerTokenAmount,
+            this.params.takerTokenAmount,
+            this.params.makerFee,
+            this.params.takerFee,
+            this.params.expirationTimestampInSec,
+            this.params.salt,
+        ]);
+        const orderHashHex = ethUtil.bufferToHex(orderHash);
+        return orderHashHex;
+    }
 }
diff --git a/packages/contracts/util/order_factory.ts b/packages/contracts/util/order_factory.ts
index 55034655b..a45877de0 100644
--- a/packages/contracts/util/order_factory.ts
+++ b/packages/contracts/util/order_factory.ts
@@ -6,24 +6,24 @@ import { Order } from './order';
 import { DefaultOrderParams, OptionalOrderParams, OrderParams } from './types';
 
 export class OrderFactory {
-	private _defaultOrderParams: DefaultOrderParams;
-	constructor(defaultOrderParams: DefaultOrderParams) {
-		this._defaultOrderParams = defaultOrderParams;
-	}
-	public async newSignedOrderAsync(customOrderParams: OptionalOrderParams = {}) {
-		const randomExpiration = new BigNumber(Math.floor((Date.now() + Math.random() * 100000000000) / 1000));
-		const orderParams: OrderParams = _.assign(
-			{},
-			{
-				expirationTimestampInSec: randomExpiration,
-				salt: ZeroEx.generatePseudoRandomSalt(),
-				taker: ZeroEx.NULL_ADDRESS,
-			},
-			this._defaultOrderParams,
-			customOrderParams,
-		);
-		const order = new Order(orderParams);
-		await order.signAsync();
-		return order;
-	}
+    private _defaultOrderParams: DefaultOrderParams;
+    constructor(defaultOrderParams: DefaultOrderParams) {
+        this._defaultOrderParams = defaultOrderParams;
+    }
+    public async newSignedOrderAsync(customOrderParams: OptionalOrderParams = {}) {
+        const randomExpiration = new BigNumber(Math.floor((Date.now() + Math.random() * 100000000000) / 1000));
+        const orderParams: OrderParams = _.assign(
+            {},
+            {
+                expirationTimestampInSec: randomExpiration,
+                salt: ZeroEx.generatePseudoRandomSalt(),
+                taker: ZeroEx.NULL_ADDRESS,
+            },
+            this._defaultOrderParams,
+            customOrderParams,
+        );
+        const order = new Order(orderParams);
+        await order.signAsync();
+        return order;
+    }
 }
diff --git a/packages/contracts/util/token_registry_wrapper.ts b/packages/contracts/util/token_registry_wrapper.ts
index d1983db7c..07a577dea 100644
--- a/packages/contracts/util/token_registry_wrapper.ts
+++ b/packages/contracts/util/token_registry_wrapper.ts
@@ -1,56 +1,56 @@
 import { ContractInstance, Token } from './types';
 
 export class TokenRegWrapper {
-	private _tokenReg: ContractInstance;
-	constructor(tokenRegContractInstance: ContractInstance) {
-		this._tokenReg = tokenRegContractInstance;
-	}
-	public addTokenAsync(token: Token, from: string) {
-		const tx = this._tokenReg.addToken(
-			token.address,
-			token.name,
-			token.symbol,
-			token.decimals,
-			token.ipfsHash,
-			token.swarmHash,
-			{ from },
-		);
-		return tx;
-	}
-	public async getTokenMetaDataAsync(tokenAddress: string) {
-		const data = await this._tokenReg.getTokenMetaData(tokenAddress);
-		const token: Token = {
-			address: data[0],
-			name: data[1],
-			symbol: data[2],
-			decimals: data[3].toNumber(),
-			ipfsHash: data[4],
-			swarmHash: data[5],
-		};
-		return token;
-	}
-	public async getTokenByNameAsync(tokenName: string) {
-		const data = await this._tokenReg.getTokenByName(tokenName);
-		const token: Token = {
-			address: data[0],
-			name: data[1],
-			symbol: data[2],
-			decimals: data[3].toNumber(),
-			ipfsHash: data[4],
-			swarmHash: data[5],
-		};
-		return token;
-	}
-	public async getTokenBySymbolAsync(tokenSymbol: string) {
-		const data = await this._tokenReg.getTokenBySymbol(tokenSymbol);
-		const token: Token = {
-			address: data[0],
-			name: data[1],
-			symbol: data[2],
-			decimals: data[3].toNumber(),
-			ipfsHash: data[4],
-			swarmHash: data[5],
-		};
-		return token;
-	}
+    private _tokenReg: ContractInstance;
+    constructor(tokenRegContractInstance: ContractInstance) {
+        this._tokenReg = tokenRegContractInstance;
+    }
+    public addTokenAsync(token: Token, from: string) {
+        const tx = this._tokenReg.addToken(
+            token.address,
+            token.name,
+            token.symbol,
+            token.decimals,
+            token.ipfsHash,
+            token.swarmHash,
+            { from },
+        );
+        return tx;
+    }
+    public async getTokenMetaDataAsync(tokenAddress: string) {
+        const data = await this._tokenReg.getTokenMetaData(tokenAddress);
+        const token: Token = {
+            address: data[0],
+            name: data[1],
+            symbol: data[2],
+            decimals: data[3].toNumber(),
+            ipfsHash: data[4],
+            swarmHash: data[5],
+        };
+        return token;
+    }
+    public async getTokenByNameAsync(tokenName: string) {
+        const data = await this._tokenReg.getTokenByName(tokenName);
+        const token: Token = {
+            address: data[0],
+            name: data[1],
+            symbol: data[2],
+            decimals: data[3].toNumber(),
+            ipfsHash: data[4],
+            swarmHash: data[5],
+        };
+        return token;
+    }
+    public async getTokenBySymbolAsync(tokenSymbol: string) {
+        const data = await this._tokenReg.getTokenBySymbol(tokenSymbol);
+        const token: Token = {
+            address: data[0],
+            name: data[1],
+            symbol: data[2],
+            decimals: data[3].toNumber(),
+            ipfsHash: data[4],
+            swarmHash: data[5],
+        };
+        return token;
+    }
 }
diff --git a/packages/contracts/util/types.ts b/packages/contracts/util/types.ts
index 675f3f17d..e511ca9f4 100644
--- a/packages/contracts/util/types.ts
+++ b/packages/contracts/util/types.ts
@@ -2,118 +2,118 @@ import { BigNumber } from '@0xproject/utils';
 import * as Web3 from 'web3';
 
 export interface BalancesByOwner {
-	[ownerAddress: string]: {
-		[tokenAddress: string]: BigNumber;
-	};
+    [ownerAddress: string]: {
+        [tokenAddress: string]: BigNumber;
+    };
 }
 
 export interface BatchFillOrders {
-	orderAddresses: string[][];
-	orderValues: BigNumber[][];
-	fillTakerTokenAmounts: BigNumber[];
-	shouldThrowOnInsufficientBalanceOrAllowance: boolean;
-	v: number[];
-	r: string[];
-	s: string[];
+    orderAddresses: string[][];
+    orderValues: BigNumber[][];
+    fillTakerTokenAmounts: BigNumber[];
+    shouldThrowOnInsufficientBalanceOrAllowance: boolean;
+    v: number[];
+    r: string[];
+    s: string[];
 }
 
 export interface FillOrdersUpTo {
-	orderAddresses: string[][];
-	orderValues: BigNumber[][];
-	fillTakerTokenAmount: BigNumber;
-	shouldThrowOnInsufficientBalanceOrAllowance: boolean;
-	v: number[];
-	r: string[];
-	s: string[];
+    orderAddresses: string[][];
+    orderValues: BigNumber[][];
+    fillTakerTokenAmount: BigNumber;
+    shouldThrowOnInsufficientBalanceOrAllowance: boolean;
+    v: number[];
+    r: string[];
+    s: string[];
 }
 
 export interface BatchCancelOrders {
-	orderAddresses: string[][];
-	orderValues: BigNumber[][];
-	cancelTakerTokenAmounts: BigNumber[];
+    orderAddresses: string[][];
+    orderValues: BigNumber[][];
+    cancelTakerTokenAmounts: BigNumber[];
 }
 
 export interface DefaultOrderParams {
-	exchangeContractAddress: string;
-	maker: string;
-	feeRecipient: string;
-	makerToken: string;
-	takerToken: string;
-	makerTokenAmount: BigNumber;
-	takerTokenAmount: BigNumber;
-	makerFee: BigNumber;
-	takerFee: BigNumber;
+    exchangeContractAddress: string;
+    maker: string;
+    feeRecipient: string;
+    makerToken: string;
+    takerToken: string;
+    makerTokenAmount: BigNumber;
+    takerTokenAmount: BigNumber;
+    makerFee: BigNumber;
+    takerFee: BigNumber;
 }
 
 export interface OptionalOrderParams {
-	exchangeContractAddress?: string;
-	maker?: string;
-	taker?: string;
-	feeRecipient?: string;
-	makerToken?: string;
-	takerToken?: string;
-	makerTokenAmount?: BigNumber;
-	takerTokenAmount?: BigNumber;
-	makerFee?: BigNumber;
-	takerFee?: BigNumber;
-	expirationTimestampInSec?: BigNumber;
+    exchangeContractAddress?: string;
+    maker?: string;
+    taker?: string;
+    feeRecipient?: string;
+    makerToken?: string;
+    takerToken?: string;
+    makerTokenAmount?: BigNumber;
+    takerTokenAmount?: BigNumber;
+    makerFee?: BigNumber;
+    takerFee?: BigNumber;
+    expirationTimestampInSec?: BigNumber;
 }
 
 export interface OrderParams {
-	exchangeContractAddress: string;
-	maker: string;
-	taker: string;
-	feeRecipient: string;
-	makerToken: string;
-	takerToken: string;
-	makerTokenAmount: BigNumber;
-	takerTokenAmount: BigNumber;
-	makerFee: BigNumber;
-	takerFee: BigNumber;
-	expirationTimestampInSec: BigNumber;
-	salt: BigNumber;
-	orderHashHex?: string;
-	v?: number;
-	r?: string;
-	s?: string;
+    exchangeContractAddress: string;
+    maker: string;
+    taker: string;
+    feeRecipient: string;
+    makerToken: string;
+    takerToken: string;
+    makerTokenAmount: BigNumber;
+    takerTokenAmount: BigNumber;
+    makerFee: BigNumber;
+    takerFee: BigNumber;
+    expirationTimestampInSec: BigNumber;
+    salt: BigNumber;
+    orderHashHex?: string;
+    v?: number;
+    r?: string;
+    s?: string;
 }
 
 export interface TransactionDataParams {
-	name: string;
-	abi: Web3.AbiDefinition[];
-	args: any[];
+    name: string;
+    abi: Web3.AbiDefinition[];
+    args: any[];
 }
 
 export interface MultiSigConfig {
-	owners: string[];
-	confirmationsRequired: number;
-	secondsRequired: number;
+    owners: string[];
+    confirmationsRequired: number;
+    secondsRequired: number;
 }
 
 export interface MultiSigConfigByNetwork {
-	[networkName: string]: MultiSigConfig;
+    [networkName: string]: MultiSigConfig;
 }
 
 export interface Token {
-	address?: string;
-	name: string;
-	symbol: string;
-	decimals: number;
-	ipfsHash: string;
-	swarmHash: string;
+    address?: string;
+    name: string;
+    symbol: string;
+    decimals: number;
+    ipfsHash: string;
+    swarmHash: string;
 }
 
 export interface TokenInfoByNetwork {
-	development: Token[];
-	live: Token[];
+    development: Token[];
+    live: Token[];
 }
 
 // Named type aliases to improve readability
 export type ContractInstance = any;
 
 export enum ExchangeContractErrs {
-	ERROR_ORDER_EXPIRED,
-	ERROR_ORDER_FULLY_FILLED_OR_CANCELLED,
-	ERROR_ROUNDING_ERROR_TOO_LARGE,
-	ERROR_INSUFFICIENT_BALANCE_OR_ALLOWANCE,
+    ERROR_ORDER_EXPIRED,
+    ERROR_ORDER_FULLY_FILLED_OR_CANCELLED,
+    ERROR_ROUNDING_ERROR_TOO_LARGE,
+    ERROR_INSUFFICIENT_BALANCE_OR_ALLOWANCE,
 }