fix tests

test/drafts/TokenVesting.test.js

@@ -3,8 +3,8 @@ const { ZERO_ADDRESS } = constants;
 
 const { expect } = require('chai');
 
-const ERC20Mintable = artifacts.require('ERC20Mintable');
-const TokenVesting = artifacts.require('TokenVesting');
+const ERC20Mintable = artifacts.require('ERC20MintableMock');
+const TokenVesting = artifacts.require('TokenVestingMock');
 
 contract('TokenVesting', function ([_, owner, beneficiary]) {
   const amount = new BN('1000');

test/examples/SimpleToken.test.js

@@ -3,7 +3,7 @@ const { ZERO_ADDRESS } = constants;
 
 const { expect } = require('chai');
 
-const SimpleToken = artifacts.require('SimpleToken');
+const SimpleToken = artifacts.require('SimpleTokenMock');
 
 contract('SimpleToken', function ([_, creator]) {
   beforeEach(async function () {

test/ownership/Ownable.test.js

-const { shouldFail } = require('openzeppelin-test-helpers');
+const { expectRevert } = require('openzeppelin-test-helpers');
 const { shouldBehaveLikeOwnable } = require('./Ownable.behavior');
 
 const Ownable = artifacts.require('OwnableMock');
@@ -9,7 +9,7 @@ contract('Ownable', function ([_, owner, anyone, ...otherAccounts]) {
   });
 
   it('cannot be reinitialized', async function () {
-    await shouldFail.reverting(this.ownable.initialize(anyone));
+    await expectRevert.unspecified(this.ownable.initialize(anyone));
   });
 
   shouldBehaveLikeOwnable(owner, otherAccounts);

test/payment/PaymentSplitter.test.js

@@ -3,7 +3,7 @@ const { ZERO_ADDRESS } = constants;
 
 const { expect } = require('chai');
 
-const PaymentSplitter = artifacts.require('PaymentSplitter');
+const PaymentSplitter = artifacts.require('PaymentSplitterMock');
 
 contract('PaymentSplitter', function ([_, owner, payee1, payee2, payee3, nonpayee1, payer1]) {
   const amount = ether('1');

test/payment/escrow/RefundEscrow.test.js

@@ -3,7 +3,7 @@ const { ZERO_ADDRESS } = constants;
 
 const { expect } = require('chai');
 
-const RefundEscrow = artifacts.require('RefundEscrow');
+const RefundEscrow = artifacts.require('RefundEscrowMock');
 
 contract('RefundEscrow', function ([_, primary, beneficiary, refundee1, refundee2]) {
   const amount = ether('54');

test/token/ERC20/StandaloneERC20.test.js

 const { shouldBehaveLikeERC20Mintable } = require('./behaviors/ERC20Mintable.behavior');
 
-const { shouldFail, BN } = require('openzeppelin-test-helpers');
+const { expectRevert, BN } = require('openzeppelin-test-helpers');
 
 const StandaloneERC20 = artifacts.require('StandaloneERC20');
 
@@ -36,7 +36,7 @@ contract('StandaloneERC20', function ([
 
   describe('with all arguments', function () {
     it('reverts if initial balance is zero', async function () {
-      await shouldFail.reverting(
+      await expectRevert.unspecified(
         initializeFull(this.token, name, symbol, decimals, 0, ZERO_ADDRESS, minters, pausers, deployer)
       );
     });