Fix indentations

11 files changed, 1873 insertions, 1844 deletions

diff --git a/packages/contracts/test/ts/ether_token.ts b/packages/contracts/test/ts/ether_token.ts
index 7e98e9bef..857371578 100644
--- a/packages/contracts/test/ts/ether_token.ts
+++ b/packages/contracts/test/ts/ether_token.ts
@@ -18,100 +18,101 @@ 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,
-        etherTokenContractAddress: etherTokenAddress,
-    });
-  });
-
-  const sendTransactionAsync = promisify(web3.eth.sendTransaction);
-  const getEthBalanceAsync = async (owner: string) => {
-    const balanceStr = await promisify(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(ethToDeposit, account))
-        .to.be.rejectedWith(ZeroExError.InsufficientEthBalanceForDeposit);
+    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,
+                etherTokenContractAddress: etherTokenAddress,
+        });
     });
 
-    it('should convert deposited Ether to wrapped Ether tokens', async () => {
-      const initEthBalance = await getEthBalanceAsync(account);
-      const initEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
+    const sendTransactionAsync = promisify(web3.eth.sendTransaction);
+    const getEthBalanceAsync = async (owner: string) => {
+        const balanceStr = await promisify(web3.eth.getBalance)(owner);
+        const balance = new BigNumber(balanceStr);
+        return balance;
+    };
 
-      const ethToDeposit = new BigNumber(web3.toWei(1, 'ether'));
+    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);
 
-      const txHash = await zeroEx.etherToken.depositAsync(ethToDeposit, account);
-      const receipt = await zeroEx.awaitTransactionMinedAsync(txHash);
+            return expect(zeroEx.etherToken.depositAsync(ethToDeposit, account))
+                .to.be.rejectedWith(ZeroExError.InsufficientEthBalanceForDeposit);
+        });
 
-      const ethSpentOnGas = gasPrice.times(receipt.gasUsed);
-      const finalEthBalance = await getEthBalanceAsync(account);
-      const finalEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
+        it('should convert deposited Ether to wrapped Ether tokens', async () => {
+            const initEthBalance = await getEthBalanceAsync(account);
+            const initEthTokenBalance = 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 ethToDeposit = new BigNumber(web3.toWei(1, 'ether'));
 
-  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);
+            const txHash = await zeroEx.etherToken.depositAsync(ethToDeposit, account);
+            const receipt = await zeroEx.awaitTransactionMinedAsync(txHash);
 
-      return expect(zeroEx.etherToken.withdrawAsync(ethTokensToWithdraw, account))
-        .to.be.rejectedWith(ZeroExError.InsufficientWEthBalanceForWithdrawal);
-    });
+            const ethSpentOnGas = gasPrice.times(receipt.gasUsed);
+            const finalEthBalance = await getEthBalanceAsync(account);
+            const finalEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
 
-    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(ethTokensToWithdraw, 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));
+        });
+    });
 
-      expect(finalEthBalance).to.be.bignumber.equal(initEthBalance.plus(ethTokensToWithdraw.minus(ethSpentOnGas)));
-      expect(finalEthTokenBalance).to.be.bignumber.equal(initEthTokenBalance.minus(ethTokensToWithdraw));
+    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(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(ethTokensToWithdraw, 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.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);
+    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 ethToDeposit = ZeroEx.toBaseUnitAmount(new BigNumber(1), 18);
 
-      const txHash = await sendTransactionAsync({
-        from: account,
-        to: etherTokenAddress,
-        value: ethToDeposit,
-        gasPrice,
-      });
+            const txHash = await sendTransactionAsync({
+                from: account,
+                to: etherTokenAddress,
+                value: ethToDeposit,
+                gasPrice,
+            });
 
-      const receipt = await zeroEx.awaitTransactionMinedAsync(txHash);
+            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);
+            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));
+            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 97eb296e0..2e7fb8343 100644
--- a/packages/contracts/test/ts/exchange/core.ts
+++ b/packages/contracts/test/ts/exchange/core.ts
@@ -17,11 +17,11 @@ import {chaiSetup} from '../utils/chai_setup';
 chaiSetup.configure();
 const expect = chai.expect;
 const {
-  Exchange,
-  TokenTransferProxy,
-  DummyToken,
-  TokenRegistry,
-  MaliciousToken,
+    Exchange,
+    TokenTransferProxy,
+    DummyToken,
+    TokenRegistry,
+    MaliciousToken,
 } = new Artifacts(artifacts);
 
 // In order to benefit from type-safety, we re-assign the global web3 instance injected by Truffle
@@ -29,716 +29,738 @@ const {
 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,
-    });
-
-    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
+    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,
+        });
+
+        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
+            const paidMakerFee = order.params.makerFee
                            .times(fillMakerTokenAmount)
                            .dividedToIntegerBy(order.params.makerTokenAmount);
-      const paidTakerFee = order.params.takerFee
+            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
+            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
+            const paidMakerFee = order.params.makerFee
                            .times(fillMakerTokenAmount)
                            .dividedToIntegerBy(order.params.makerTokenAmount);
-      const paidTakerFee = order.params.takerFee
+            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
+            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
+            const paidMakerFee = order.params.makerFee
                            .times(fillMakerTokenAmount)
                            .dividedToIntegerBy(order.params.makerTokenAmount);
-      const paidTakerFee = order.params.takerFee
+            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
+            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
+            const paidMakerFee = order.params.makerFee
                            .times(fillMakerTokenAmount)
                            .dividedToIntegerBy(order.params.makerTokenAmount);
-      const paidTakerFee = order.params.takerFee
+            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.INVALID_OPCODE);
-    });
-
-    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.INVALID_OPCODE);
-    });
-
-    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.INVALID_OPCODE);
-    });
-
-    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.INVALID_OPCODE);
-    });
-
-    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.INVALID_OPCODE);
-    });
-
-    it('should not change balances if maker balances are too low to fill order and \
-        shouldThrowOnInsufficientBalanceOrAllowance = false',
+            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.INVALID_OPCODE);
+        });
+
+        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.INVALID_OPCODE);
+        });
+
+        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.INVALID_OPCODE);
+        });
+
+        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.INVALID_OPCODE);
+        });
+
+        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.INVALID_OPCODE);
+        });
+
+        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 \
-        shouldThrowOnInsufficientBalanceOrAllowance = true',
+        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),
-      });
+            order = await orderFactory.newSignedOrderAsync({
+                makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100000), 18),
+            });
 
-      return expect(exWrapper.fillOrderAsync(order, taker, {shouldThrowOnInsufficientBalanceOrAllowance: true}))
-        .to.be.rejectedWith(constants.INVALID_OPCODE);
-    });
+            return expect(exWrapper.fillOrderAsync(order, taker, {shouldThrowOnInsufficientBalanceOrAllowance: true}))
+                .to.be.rejectedWith(constants.INVALID_OPCODE);
+        });
 
-    it('should not change balances if taker balances are too low to fill order and \
-        shouldThrowOnInsufficientBalanceOrAllowance = false',
+        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 \
-        shouldThrowOnInsufficientBalanceOrAllowance = true',
+        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),
-      });
+            order = await orderFactory.newSignedOrderAsync({
+                takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100000), 18),
+            });
 
-      return expect(exWrapper.fillOrderAsync(order, taker, {shouldThrowOnInsufficientBalanceOrAllowance: true}))
-        .to.be.rejectedWith(constants.INVALID_OPCODE);
-    });
+            return expect(exWrapper.fillOrderAsync(order, taker, {shouldThrowOnInsufficientBalanceOrAllowance: true}))
+                .to.be.rejectedWith(constants.INVALID_OPCODE);
+        });
 
-    it('should not change balances if maker allowances are too low to fill order and \
-        shouldThrowOnInsufficientBalanceOrAllowance = false',
+        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 \
-        shouldThrowOnInsufficientBalanceOrAllowance = true',
+        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.INVALID_OPCODE);
-      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',
+            await rep.approve(TokenTransferProxy.address, 0, {from: maker});
+            expect(exWrapper.fillOrderAsync(order, taker, {shouldThrowOnInsufficientBalanceOrAllowance: true}))
+                .to.be.rejectedWith(constants.INVALID_OPCODE);
+            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 \
-        shouldThrowOnInsufficientBalanceOrAllowance = true',
+        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.INVALID_OPCODE);
-      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',
+            await dgd.approve(TokenTransferProxy.address, 0, {from: taker});
+            expect(exWrapper.fillOrderAsync(order, taker, {shouldThrowOnInsufficientBalanceOrAllowance: true}))
+                .to.be.rejectedWith(constants.INVALID_OPCODE);
+            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, \
-        and shouldThrowOnInsufficientBalanceOrAllowance = false',
+            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, \
-        and shouldThrowOnInsufficientBalanceOrAllowance = false',
+            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, \
-        and shouldThrowOnInsufficientBalanceOrAllowance = false',
+            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 \
-        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.INVALID_OPCODE);
-    });
-
-    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.INVALID_OPCODE);
-    });
-
-    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.INVALID_OPCODE);
-    });
-
-    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.INVALID_OPCODE);
-    });
-
-    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.INVALID_OPCODE);
-    });
-
-    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
+            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.INVALID_OPCODE);
+        });
+
+        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.INVALID_OPCODE);
+        });
+
+        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.INVALID_OPCODE);
+        });
+
+        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.INVALID_OPCODE);
+        });
+
+        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.INVALID_OPCODE);
+        });
+
+        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
+            const paidMakerFee = order.params.makerFee
                            .times(cancelMakerTokenAmount)
                            .dividedToIntegerBy(order.params.makerTokenAmount);
-      const paidTakerFee = order.params.takerFee
+            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 errId = res.logs[0].args.errorId.toNumber();
-      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);
+            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 errId = res.logs[0].args.errorId.toNumber();
+            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);
+        });
     });
-  });
 });
diff --git a/packages/contracts/test/ts/exchange/helpers.ts b/packages/contracts/test/ts/exchange/helpers.ts
index 5ccc02b80..a39f4d9e2 100644
--- a/packages/contracts/test/ts/exchange/helpers.ts
+++ b/packages/contracts/test/ts/exchange/helpers.ts
@@ -13,161 +13,161 @@ chaiSetup.configure();
 const expect = chai.expect;
 
 const {
-  Exchange,
-  TokenRegistry,
+    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);
+    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);
     });
-  });
 
-  describe('isValidSignature', () => {
     beforeEach(async () => {
-      order = await orderFactory.newSignedOrderAsync();
+        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();
+    describe('getOrderHash', () => {
+        it('should output the correct orderHash', async () => {
+            const orderHashHex = await exchangeWrapper.getOrderHashAsync(order);
+            expect(order.params.orderHashHex).to.be.equal(orderHashHex);
+        });
     });
 
-    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();
+    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();
+        });
     });
 
-    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();
+    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();
+        });
     });
 
-    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);
+    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 aa0e286a7..c40d60104 100644
--- a/packages/contracts/test/ts/exchange/wrapper.ts
+++ b/packages/contracts/test/ts/exchange/wrapper.ts
@@ -15,303 +15,307 @@ import {chaiSetup} from '../utils/chai_setup';
 chaiSetup.configure();
 const expect = chai.expect;
 const {
-  Exchange,
-  TokenTransferProxy,
-  DummyToken,
-  TokenRegistry,
+    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();
+    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}),
+        ]);
     });
 
-    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});
+    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 newBalances = await dmyBalances.getAsync();
 
-      const fillMakerTokenAmount = fillTakerTokenAmount
+            const fillMakerTokenAmount = fillTakerTokenAmount
                                    .times(order.params.makerTokenAmount)
                                    .dividedToIntegerBy(order.params.takerTokenAmount);
-      const makerFee = order.params.makerFee
+            const makerFee = order.params.makerFee
                        .times(fillMakerTokenAmount)
                        .dividedToIntegerBy(order.params.makerTokenAmount);
-      const takerFee = order.params.takerFee
+            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)));
-    });
+            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)),
-      });
+        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.INVALID_OPCODE);
-    });
+            return expect(exWrapper.fillOrKillOrderAsync(order, taker))
+                .to.be.rejectedWith(constants.INVALID_OPCODE);
+        });
 
-    it('should throw if entire fillTakerTokenAmount not filled', async () => {
-      const order = await orderFactory.newSignedOrderAsync();
+        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)});
+            const from = taker;
+            await exWrapper.fillOrderAsync(order, from, {fillTakerTokenAmount: order.params.takerTokenAmount.div(2)});
 
-      return expect(exWrapper.fillOrKillOrderAsync(order, taker))
-        .to.be.rejectedWith(constants.INVALID_OPCODE);
-    });
-  });
-
-  describe('batch functions', () => {
-    let orders: Order[];
-    beforeEach(async () => {
-      orders = await Promise.all([
-        orderFactory.newSignedOrderAsync(),
-        orderFactory.newSignedOrderAsync(),
-        orderFactory.newSignedOrderAsync(),
-      ]);
-      balances = await dmyBalances.getAsync();
+            return expect(exWrapper.fillOrKillOrderAsync(order, taker))
+                .to.be.rejectedWith(constants.INVALID_OPCODE);
+        });
     });
 
-    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
+    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
+                    const makerFee = order.params.makerFee
                            .times(fillMakerTokenAmount)
                            .dividedToIntegerBy(order.params.makerTokenAmount);
-          const takerFee = order.params.takerFee
+                    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));
+                    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);
+            });
         });
 
-        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
+        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
+                    const makerFee = order.params.makerFee
                            .times(fillMakerTokenAmount)
                            .dividedToIntegerBy(order.params.makerTokenAmount);
-          const takerFee = order.params.takerFee
+                    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[] = [];
-        const makerToken = rep.address;
-        const takerToken = dgd.address;
-        orders.forEach(order => {
-          const fillTakerTokenAmount = order.params.takerTokenAmount.div(2);
-          fillTakerTokenAmounts.push(fillTakerTokenAmount);
+                    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[] = [];
+                const makerToken = rep.address;
+                const takerToken = dgd.address;
+                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.INVALID_OPCODE);
+            });
         });
 
-        await exWrapper.fillOrKillOrderAsync(orders[0], taker);
-
-        return expect(exWrapper.batchFillOrKillOrdersAsync(orders, taker, {fillTakerTokenAmounts}))
-            .to.be.rejectedWith(constants.INVALID_OPCODE);
-      });
-    });
-
-    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]
+        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]
+                    balances[maker][order.params.takerToken] = balances[maker][order.params.takerToken]
                                                      .add(order.params.takerTokenAmount);
-          balances[maker][zrx.address] = balances[maker][zrx.address]
+                    balances[maker][zrx.address] = balances[maker][zrx.address]
                                          .minus(order.params.makerFee);
-          balances[taker][order.params.makerToken] = balances[taker][order.params.makerToken]
+                    balances[taker][order.params.makerToken] = balances[taker][order.params.makerToken]
                                                      .add(order.params.makerTokenAmount);
-          balances[taker][order.params.takerToken] = balances[taker][order.params.takerToken]
+                    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));
+                    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.INVALID_OPCODE);
+            });
         });
-        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(),
-        ]);
+        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});
 
-        return expect(
-            exWrapper.fillOrdersUpToAsync(
-                orders, taker, {fillTakerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(1000), 18)}),
-        ).to.be.rejectedWith(constants.INVALID_OPCODE);
-      });
-    });
-
-    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});
-
-        const res = await exWrapper.batchFillOrdersAsync(
-            orders, taker, {fillTakerTokenAmounts: cancelTakerTokenAmounts});
-        const newBalances = await dmyBalances.getAsync();
-        expect(balances).to.be.deep.equal(newBalances);
-      });
+                const res = 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 ea761a8b7..6ab3014ab 100644
--- a/packages/contracts/test/ts/multi_sig_with_time_lock.ts
+++ b/packages/contracts/test/ts/multi_sig_with_time_lock.ts
@@ -23,89 +23,89 @@ 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();
-    rpc = new RPC();
-  });
-
-  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.INVALID_OPCODE);
+    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();
+        rpc = new RPC();
     });
 
-    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.INVALID_OPCODE);
+    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.INVALID_OPCODE);
+        });
+
+        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.INVALID_OPCODE);
+        });
+
+        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(web3.eth.getBlockNumber)();
+            const blockInfo = await promisify(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.INVALID_OPCODE);
+        });
+
+        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);
+        });
     });
-
-    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(web3.eth.getBlockNumber)();
-      const blockInfo = await promisify(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.INVALID_OPCODE);
-    });
-
-    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 38c37ac68..ed0a6c3dd 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,122 +15,123 @@ 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.INVALID_OPCODE);
+    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;
     });
 
-    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.INVALID_OPCODE);
-    });
-
-    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.INVALID_OPCODE);
-    });
-
-    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.INVALID_OPCODE);
-    });
-
-    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();
+    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.INVALID_OPCODE);
+        });
+
+        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();
+        });
     });
 
-    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.INVALID_OPCODE);
+    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.INVALID_OPCODE);
+        });
+
+        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.INVALID_OPCODE);
+        });
+
+        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.INVALID_OPCODE);
+        });
+
+        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.INVALID_OPCODE);
+        });
     });
-  });
 });
diff --git a/packages/contracts/test/ts/token_registry.ts b/packages/contracts/test/ts/token_registry.ts
index c4605d16d..ed0bbf55b 100644
--- a/packages/contracts/test/ts/token_registry.ts
+++ b/packages/contracts/test/ts/token_registry.ts
@@ -15,198 +15,198 @@ 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.INVALID_OPCODE);
-    });
+    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;
 
-    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);
+    beforeEach(async () => {
+        tokenReg = await TokenRegistry.new();
+        tokenRegWrapper = new TokenRegWrapper(tokenReg);
     });
 
-    it('should throw if token already exists', async () => {
-      await tokenRegWrapper.addTokenAsync(token1, owner);
+    describe('addToken', () => {
+        it('should throw when not called by owner', async () => {
+            return expect(tokenRegWrapper.addTokenAsync(token1, notOwner)).to.be.rejectedWith(constants.INVALID_OPCODE);
+        });
 
-      return expect(tokenRegWrapper.addTokenAsync(token1, owner)).to.be.rejectedWith(constants.INVALID_OPCODE);
-    });
+        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 address is null', async () => {
-      return expect(tokenRegWrapper.addTokenAsync(nullToken, owner)).to.be.rejectedWith(constants.INVALID_OPCODE);
-    });
+        it('should throw if token already exists', async () => {
+            await tokenRegWrapper.addTokenAsync(token1, owner);
 
-    it('should throw if name already exists', async () => {
-      await tokenRegWrapper.addTokenAsync(token1, owner);
-      const duplicateNameToken = _.assign({}, token2, {name: token1.name});
+            return expect(tokenRegWrapper.addTokenAsync(token1, owner)).to.be.rejectedWith(constants.INVALID_OPCODE);
+        });
 
-      return expect(tokenRegWrapper.addTokenAsync(duplicateNameToken, owner))
-        .to.be.rejectedWith(constants.INVALID_OPCODE);
-    });
+        it('should throw if token address is null', async () => {
+            return expect(tokenRegWrapper.addTokenAsync(nullToken, owner)).to.be.rejectedWith(constants.INVALID_OPCODE);
+        });
 
-    it('should throw if symbol already exists', async () => {
-      await tokenRegWrapper.addTokenAsync(token1, owner);
-      const duplicateSymbolToken = _.assign({}, token2, {symbol: token1.symbol});
+        it('should throw if name already exists', async () => {
+            await tokenRegWrapper.addTokenAsync(token1, owner);
+            const duplicateNameToken = _.assign({}, token2, {name: token1.name});
 
-      return expect(tokenRegWrapper.addTokenAsync(duplicateSymbolToken, owner))
-        .to.be.rejectedWith(constants.INVALID_OPCODE);
-    });
-  });
+            return expect(tokenRegWrapper.addTokenAsync(duplicateNameToken, owner))
+                .to.be.rejectedWith(constants.INVALID_OPCODE);
+        });
 
-  describe('after addToken', () => {
-    beforeEach(async () => {
-      await tokenRegWrapper.addTokenAsync(token1, owner);
-    });
+        it('should throw if symbol already exists', async () => {
+            await tokenRegWrapper.addTokenAsync(token1, owner);
+            const duplicateSymbolToken = _.assign({}, token2, {symbol: token1.symbol});
 
-    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);
-      });
+            return expect(tokenRegWrapper.addTokenAsync(duplicateSymbolToken, owner))
+                .to.be.rejectedWith(constants.INVALID_OPCODE);
+        });
     });
 
-    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.INVALID_OPCODE);
-      });
-
-      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.INVALID_OPCODE);
-      });
-
-      it('should throw if token does not exist', async () => {
-        return expect(tokenReg.setTokenName(nullToken.address, token2.name, {from: owner}))
-          .to.be.rejectedWith(constants.INVALID_OPCODE);
-      });
-    });
-
-    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.INVALID_OPCODE);
-      });
-
-      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.INVALID_OPCODE);
-      });
-
-      it('should throw if token does not exist', async () => {
-        return expect(tokenReg.setTokenSymbol(nullToken.address, token2.symbol, {from: owner}))
-          .to.be.rejectedWith(constants.INVALID_OPCODE);
-      });
-    });
-
-    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.INVALID_OPCODE);
-      });
-
-      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.INVALID_OPCODE);
-      });
-
-      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.INVALID_OPCODE);
-      });
-
+    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.INVALID_OPCODE);
+            });
+
+            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.INVALID_OPCODE);
+            });
+
+            it('should throw if token does not exist', async () => {
+                return expect(tokenReg.setTokenName(nullToken.address, token2.name, {from: owner}))
+                    .to.be.rejectedWith(constants.INVALID_OPCODE);
+            });
+        });
+
+        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.INVALID_OPCODE);
+            });
+
+            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.INVALID_OPCODE);
+            });
+
+            it('should throw if token does not exist', async () => {
+                return expect(tokenReg.setTokenSymbol(nullToken.address, token2.symbol, {from: owner}))
+                    .to.be.rejectedWith(constants.INVALID_OPCODE);
+            });
+        });
+
+        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.INVALID_OPCODE);
+            });
+
+            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.INVALID_OPCODE);
+            });
+
+            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.INVALID_OPCODE);
+            });
+
+        });
     });
-  });
 });
diff --git a/packages/contracts/test/ts/token_transfer_proxy/auth.ts b/packages/contracts/test/ts/token_transfer_proxy/auth.ts
index d027fa9e7..785fbc016 100644
--- a/packages/contracts/test/ts/token_transfer_proxy/auth.ts
+++ b/packages/contracts/test/ts/token_transfer_proxy/auth.ts
@@ -9,75 +9,75 @@ 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();
-  });
-
-  describe('addAuthorizedAddress', () => {
-    it('should throw if not called by owner', async () => {
-      return expect(tokenTransferProxy.addAuthorizedAddress(notOwner, {from: notOwner}))
-        .to.be.rejectedWith(constants.INVALID_OPCODE);
+    before(async () => {
+        tokenTransferProxy = await TokenTransferProxy.deployed();
     });
 
-    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();
-    });
+    describe('addAuthorizedAddress', () => {
+        it('should throw if not called by owner', async () => {
+            return expect(tokenTransferProxy.addAuthorizedAddress(notOwner, {from: notOwner}))
+                .to.be.rejectedWith(constants.INVALID_OPCODE);
+        });
 
-    it('should throw if owner attempts to authorize a duplicate address', async () => {
-      return expect(tokenTransferProxy.addAuthorizedAddress(authorized, {from: owner}))
-        .to.be.rejectedWith(constants.INVALID_OPCODE);
-    });
-  });
+        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();
+        });
 
-  describe('removeAuthorizedAddress', () => {
-    it('should throw if not called by owner', async () => {
-      return expect(tokenTransferProxy.removeAuthorizedAddress(authorized, {from: notOwner}))
-        .to.be.rejectedWith(constants.INVALID_OPCODE);
+        it('should throw if owner attempts to authorize a duplicate address', async () => {
+            return expect(tokenTransferProxy.addAuthorizedAddress(authorized, {from: owner}))
+                .to.be.rejectedWith(constants.INVALID_OPCODE);
+        });
     });
 
-    it('should allow owner to remove an authorized address', async () => {
-      await tokenTransferProxy.removeAuthorizedAddress(authorized, {from: owner});
-      notAuthorized = authorized;
-      authorized = null;
+    describe('removeAuthorizedAddress', () => {
+        it('should throw if not called by owner', async () => {
+            return expect(tokenTransferProxy.removeAuthorizedAddress(authorized, {from: notOwner}))
+                .to.be.rejectedWith(constants.INVALID_OPCODE);
+        });
 
-      const isAuthorized = await tokenTransferProxy.authorized.call(notAuthorized);
-      expect(isAuthorized).to.be.false();
-    });
+        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();
+        });
 
-    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.INVALID_OPCODE);
+        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.INVALID_OPCODE);
+        });
     });
-  });
 
-  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 d16c5cd4b..6e0bfdc1a 100644
--- a/packages/contracts/test/ts/token_transfer_proxy/transfer_from.ts
+++ b/packages/contracts/test/ts/token_transfer_proxy/transfer_from.ts
@@ -9,58 +9,59 @@ import {chaiSetup} from '../utils/chai_setup';
 chaiSetup.configure();
 const expect = chai.expect;
 const {
-  TokenTransferProxy,
-  DummyToken,
-  TokenRegistry,
+    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}),
-    ]);
-  });
-
-  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.INVALID_OPCODE);
+        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}),
+        ]);
     });
 
-    it('should allow an authorized address to transfer', async () => {
-      const balances = await dmyBalances.getAsync();
+    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.INVALID_OPCODE);
+        });
+
+        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/unlimitedAllowanceToken.ts b/packages/contracts/test/ts/unlimitedAllowanceToken.ts
index cf217a8b6..ca3fcd7d2 100644
--- a/packages/contracts/test/ts/unlimitedAllowanceToken.ts
+++ b/packages/contracts/test/ts/unlimitedAllowanceToken.ts
@@ -14,102 +14,102 @@ chaiSetup.configure();
 const expect = chai.expect;
 
 contract('UnlimitedAllowanceToken', (accounts: string[]) => {
-  const zeroEx = new ZeroEx(web3.currentProvider);
-  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);
+    const zeroEx = new ZeroEx(web3.currentProvider);
+    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;
     });
 
-    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('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);
-
-      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);
-
-      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);
 
-      const newSpenderAllowance = await zeroEx.token.getAllowanceAsync(tokenAddress, owner, spender);
-      expect(newSpenderAllowance).to.be.bignumber.equal(0);
+    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);
+
+            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);
+
+            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);
+
+            const newSpenderAllowance = await zeroEx.token.getAllowanceAsync(tokenAddress, owner, spender);
+            expect(newSpenderAllowance).to.be.bignumber.equal(0);
+        });
     });
-  });
 });
diff --git a/packages/contracts/test/ts/zrxToken.ts b/packages/contracts/test/ts/zrxToken.ts
index 8099c0942..471ee93f2 100644
--- a/packages/contracts/test/ts/zrxToken.ts
+++ b/packages/contracts/test/ts/zrxToken.ts
@@ -14,155 +14,155 @@ 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,
-    });
-    zrxAddress = await zeroEx.exchange.getZRXTokenAddressAsync();
-    zrx = await ZRXToken.at(zrxAddress);
-    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);
-      let txHash = await zeroEx.token.setAllowanceAsync(zrxAddress, owner, spender, amountToTransfer);
-      await zeroEx.awaitTransactionMinedAsync(txHash);
-      const didReturnTrue = await zrx.transferFrom.call(owner, spender, amountToTransfer, {from: spender});
-      expect(didReturnTrue).to.be.false();
-      // Reset allowance
-      txHash = await zeroEx.token.setAllowanceAsync(zrxAddress, owner, spender, new BigNumber(0));
-      await zeroEx.awaitTransactionMinedAsync(txHash);
-    });
-
-    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();
+    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,
+        });
+        zrxAddress = await zeroEx.exchange.getZRXTokenAddressAsync();
+        zrx = await ZRXToken.at(zrxAddress);
+        MAX_UINT = zeroEx.token.UNLIMITED_ALLOWANCE_IN_BASE_UNITS;
     });
 
-    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();
+    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);
+        });
     });
 
-    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);
-      await zeroEx.awaitTransactionMinedAsync(txHash);
-      txHash = await zeroEx.token.transferFromAsync(zrxAddress, owner, spender, spender, amountToTransfer);
-      await zeroEx.awaitTransactionMinedAsync(txHash);
-
-      const newSpenderAllowance = await zeroEx.token.getAllowanceAsync(zrxAddress, owner, spender);
-      expect(initSpenderAllowance).to.be.bignumber.equal(newSpenderAllowance);
-      // Restore balance
-      txHash = await zeroEx.token.transferAsync(zrxAddress, spender, owner, amountToTransfer);
-      await zeroEx.awaitTransactionMinedAsync(txHash);
+    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);
+        });
     });
 
-    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);
-      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));
+    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();
+        });
     });
 
-    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;
-      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);
-      await zeroEx.awaitTransactionMinedAsync(txHash);
-
-      const newSpenderAllowance = await zeroEx.token.getAllowanceAsync(zrxAddress, owner, spender);
-      expect(newSpenderAllowance).to.be.bignumber.equal(0);
+    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);
+            let txHash = await zeroEx.token.setAllowanceAsync(zrxAddress, owner, spender, amountToTransfer);
+            await zeroEx.awaitTransactionMinedAsync(txHash);
+            const didReturnTrue = await zrx.transferFrom.call(owner, spender, amountToTransfer, {from: spender});
+            expect(didReturnTrue).to.be.false();
+            // Reset allowance
+            txHash = await zeroEx.token.setAllowanceAsync(zrxAddress, owner, spender, new BigNumber(0));
+            await zeroEx.awaitTransactionMinedAsync(txHash);
+        });
+
+        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);
+            await zeroEx.awaitTransactionMinedAsync(txHash);
+            txHash = await zeroEx.token.transferFromAsync(zrxAddress, owner, spender, spender, amountToTransfer);
+            await zeroEx.awaitTransactionMinedAsync(txHash);
+
+            const newSpenderAllowance = await zeroEx.token.getAllowanceAsync(zrxAddress, owner, spender);
+            expect(initSpenderAllowance).to.be.bignumber.equal(newSpenderAllowance);
+            // Restore balance
+            txHash = await zeroEx.token.transferAsync(zrxAddress, spender, owner, amountToTransfer);
+            await zeroEx.awaitTransactionMinedAsync(txHash);
+        });
+
+        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);
+            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;
+            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);
+            await zeroEx.awaitTransactionMinedAsync(txHash);
+
+            const newSpenderAllowance = await zeroEx.token.getAllowanceAsync(zrxAddress, owner, spender);
+            expect(newSpenderAllowance).to.be.bignumber.equal(0);
+        });
     });
-  });
 });