Address feedback

2 files changed, 17 insertions, 7 deletions

diff --git a/test/exchange_wrapper_test.ts b/test/exchange_wrapper_test.ts
index 2d7810bcc..5cc864d12 100644
--- a/test/exchange_wrapper_test.ts
+++ b/test/exchange_wrapper_test.ts
@@ -229,9 +229,9 @@ describe('ExchangeWrapper', () => {
                     const signedOrder = await fillScenarios.createFillableSignedOrderAsync(
                         makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, fillableAmount,
                     );
-                    const nonExistentSenderAddress = userAddresses[6];
+                    const nonTakerAddress = userAddresses[6];
                     return expect(zeroEx.exchange.fillOrderAsync(
-                        signedOrder, fillTakerAmount, shouldCheckTransfer, nonExistentSenderAddress,
+                        signedOrder, fillTakerAmount, shouldCheckTransfer, nonTakerAddress,
                     )).to.be.rejectedWith(ExchangeContractErrs.TRANSACTION_SENDER_IS_NOT_FILL_ORDER_TAKER);
                 });
                 it('should throw when order is expired', async () => {
@@ -520,7 +520,7 @@ describe('ExchangeWrapper', () => {
                             order: signedOrderWithDifferentMaker,
                             takerTokenCancelAmount: cancelAmount,
                         },
-                    ])).to.be.rejectedWith('Can not cancel orders from multiple makers in a single batch');
+                    ])).to.be.rejectedWith(ExchangeContractErrs.MULTIPLE_MAKERS_IN_SINGLE_CANCEL_BATCH);
                 });
             });
             describe('successful batch cancels', () => {
diff --git a/test/utils/fill_scenarios.ts b/test/utils/fill_scenarios.ts
index 8ff27ceb1..539333b9b 100644
--- a/test/utils/fill_scenarios.ts
+++ b/test/utils/fill_scenarios.ts
@@ -72,19 +72,29 @@ export class FillScenarios {
         await this.zeroEx.token.transferAsync(makerTokenAddress, this.coinbase, makerAddress, makerFillableAmount);
         const oldMakerAllowance = await this.zeroEx.token.getProxyAllowanceAsync(makerTokenAddress, makerAddress);
         await this.zeroEx.token.setProxyAllowanceAsync(
-            makerTokenAddress, makerAddress, oldMakerAllowance.plus(makerFillableAmount));
+            makerTokenAddress, makerAddress, oldMakerAllowance.plus(makerFillableAmount),
+        );
         await this.zeroEx.token.transferAsync(takerTokenAddress, this.coinbase, takerAddress, takerFillableAmount);
         const oldTakerAllowance = await this.zeroEx.token.getProxyAllowanceAsync(takerTokenAddress, takerAddress);
         await this.zeroEx.token.setProxyAllowanceAsync(
-            takerTokenAddress, takerAddress, oldTakerAllowance.plus(takerFillableAmount));
+            takerTokenAddress, takerAddress, oldTakerAllowance.plus(takerFillableAmount),
+        );
 
         if (!makerFee.isZero()) {
             await this.zeroEx.token.transferAsync(this.zrxTokenAddress, this.coinbase, makerAddress, makerFee);
-            await this.zeroEx.token.setProxyAllowanceAsync(this.zrxTokenAddress, makerAddress, makerFee);
+            const oldMakerFeeAllowance =
+                await this.zeroEx.token.getProxyAllowanceAsync(this.zrxTokenAddress, makerAddress);
+            await this.zeroEx.token.setProxyAllowanceAsync(
+                this.zrxTokenAddress, makerAddress, oldMakerFeeAllowance.plus(makerFee),
+            );
         }
         if (!takerFee.isZero()) {
             await this.zeroEx.token.transferAsync(this.zrxTokenAddress, this.coinbase, takerAddress, takerFee);
-            await this.zeroEx.token.setProxyAllowanceAsync(this.zrxTokenAddress, takerAddress, takerFee);
+            const oldTakerFeeAllowance =
+                await this.zeroEx.token.getProxyAllowanceAsync(this.zrxTokenAddress, takerAddress);
+            await this.zeroEx.token.setProxyAllowanceAsync(
+                this.zrxTokenAddress, takerAddress, oldTakerFeeAllowance.plus(takerFee),
+            );
         }
 
         const signedOrder = await orderFactory.createSignedOrderAsync(this.zeroEx,