Add updated contracts, reorganize contract file structure

2 files changed, 4 insertions, 4 deletions

diff --git a/packages/contracts/test/ts/erc20Token.ts b/packages/contracts/test/ts/erc20Token.ts
index e2282cbf3..9aa93180b 100644
--- a/packages/contracts/test/ts/erc20Token.ts
+++ b/packages/contracts/test/ts/erc20Token.ts
@@ -9,7 +9,7 @@ import {ContractInstance} from '../../util/types';
 
 import {chaiSetup} from './utils/chai_setup';
 
-const {DummyToken} = new Artifacts(artifacts);
+const {DummyTokenV2} = new Artifacts(artifacts);
 const web3: Web3 = (global as any).web3;
 chaiSetup.configure();
 const expect = chai.expect;
@@ -24,7 +24,7 @@ contract('ERC20Token', (accounts: string[]) => {
     let token: ContractInstance;
 
     beforeEach(async () => {
-        token = await DummyToken.new({from: owner});
+        token = await DummyTokenV2.new({from: owner});
         await token.mint(MAX_MINT_VALUE, {from: owner});
         tokenAddress = token.address;
     });
@@ -33,7 +33,7 @@ contract('ERC20Token', (accounts: string[]) => {
         it('should throw if owner has insufficient balance', async () => {
             const ownerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);
             const amountToTransfer = ownerBalance.plus(1);
-            return expect(token.transfer.call(owner, spender, amountToTransfer, {from: spender}))
+            return expect(token.transfer.call(spender, amountToTransfer, {from: owner}))
                 .to.be.rejectedWith(constants.REVERT);
         });
 
diff --git a/packages/contracts/test/ts/exchange/core.ts b/packages/contracts/test/ts/exchange/core.ts
index e4aa74c32..7f632c6e6 100644
--- a/packages/contracts/test/ts/exchange/core.ts
+++ b/packages/contracts/test/ts/exchange/core.ts
@@ -610,7 +610,7 @@ contract('Exchange', (accounts: string[]) => {
             });
 
             return expect(exWrapper.fillOrderAsync(order, taker, {shouldThrowOnInsufficientBalanceOrAllowance: false}))
-                .to.be.rejectedWith(constants.INVALID_OPCODE);
+                .to.be.rejectedWith(constants.REVERT);
         });
 
         it('should not change balances if an order is expired', async () => {