diff --git a/contracts/TokenDelegator.sol b/contracts/TokenDelegator.sol
index eed89f4..7618e91 100644
--- a/contracts/TokenDelegator.sol
+++ b/contracts/TokenDelegator.sol
@@ -23,18 +23,20 @@ contract TokenDelegator is TokenDelegatorStorage, TokenEvents {
             )
         );
 
+        implementation = implementation_;
+
         changeImplementationAfter = changeImplementationAfter_;
 
-        _setImplementation(implementation_);
+        emit NewImplementation(address(0), implementation);
     }
 
     /**
      * @notice Called by the admin to update the implementation of the delegator
      * @param implementation_ The address of the new implementation for delegation
      */
-    function _setImplementation(address implementation_) public isMaster {
+    function _setImplementation(address implementation_) external isMaster {
         require(implementation_ != address(0), "TokenDelegator::_setImplementation: invalid implementation address");
-        require(changeImplementationAfter >= block.timestamp, "TokenDelegator::_setImplementation: can change implementation changeImplementationAfter time only");
+        require(block.timestamp >=changeImplementationAfter, "TokenDelegator::_setImplementation: can change implementation changeImplementationAfter time only");
 
         address oldImplementation = implementation;
         implementation = implementation_;
diff --git a/hardhat.config.js b/hardhat.config.js
index 128ce1f..e973b1f 100644
--- a/hardhat.config.js
+++ b/hardhat.config.js
@@ -14,15 +14,15 @@ const ALCHEMY_ID = process.env.ALCHEMY_ID;
 module.exports = {
   defaultNetwork: "hardhat",
   solidity: "0.7.3",
-  // networks: {
-  //   hardhat: {
-  //     forking: {
-  //       url: `https://eth-mainnet.alchemyapi.io/v2/${ALCHEMY_ID}`,
-  //       blockNumber: 12070498,
-  //     },
-  //     blockGasLimit: 12000000,
-  //   },
-  // },
+  networks: {
+    hardhat: {
+      forking: {
+        url: `https://eth-mainnet.alchemyapi.io/v2/${ALCHEMY_ID}`,
+        blockNumber: 12070498,
+      },
+      blockGasLimit: 12000000,
+    },
+  },
   etherscan: {
     apiKey: process.env.ETHERSCAN
   }
diff --git a/test/token.test.js b/test/token.test.js
index 4cfa835..5c8c2a6 100644
--- a/test/token.test.js
+++ b/test/token.test.js
@@ -3,11 +3,17 @@ const { expect } = require("chai");
 const { ethers, network } = hre;
 
 describe("Token", function() {
-  let tokenDelegate, tokenDelegator, token, minter, account1, account2, account3, allowedAfter, ethereum
+  let tokenDelegate, tokenDelegator, token, masterAddress, minter, account0, account1, account2, account3, initialSupply, allowedAfter, ethereum
   before(async () => {
+    masterAddress = "0xb1DC62EC38E6E3857a887210C38418E4A17Da5B2"
+    await hre.network.provider.request({
+      method: "hardhat_impersonateAccount",
+      params: [ masterAddress ]
+    })
     accounts = await ethers.getSigners()
-    minter = accounts[0]
+    minter = ethers.provider.getSigner(masterAddress)
 
+    account0 = accounts[0]
     account1 = accounts[1]
     account2 = accounts[2]
     account3 = accounts[3]
@@ -19,8 +25,11 @@ describe("Token", function() {
 
     allowedAfter = 1622505601 // June 1 2021
 
+    initialSupply = ethers.utils.parseEther("1000000000")
+
     const TokenDelegator = await ethers.getContractFactory("TokenDelegator")
-    tokenDelegator = await TokenDelegator.deploy(minter.address, minter.address, tokenDelegate.address, allowedAfter, allowedAfter, false)
+    tokenDelegator = await TokenDelegator
+      .deploy(account0.address, tokenDelegate.address, initialSupply, allowedAfter, allowedAfter, false)
 
     await tokenDelegator.deployed()
 
@@ -33,20 +42,18 @@ describe("Token", function() {
   })
 
   it("Should match the deployed", async () => {
-    const minter_ = await token.minter()
     const totalSupply_ = await token.totalSupply()
     const transferPaused_ = await token.transferPaused()
     const name_ = await token.name()
     const symbol_ = await token.symbol()
-    expect(minter_).to.be.equal(minter.address)
-    expect(totalSupply_).to.be.equal(ethers.utils.parseEther("10000000"))
+    expect(totalSupply_).to.be.equal(initialSupply)
     expect(transferPaused_).to.be.equal(false)
     expect(name_).to.be.equal("<Token Name>")
     expect(symbol_).to.be.equal("<TKN>")
   })
 
   it("Should pause transfer", async () => {
-    await token.pauseTransfer()
+    await token.connect(minter).pauseTransfer()
     const transferPaused_ = await token.transferPaused()
     expect(transferPaused_).to.be.equal(true)
     await expect(token.transfer(account1.address, ethers.utils.parseEther("10000")))
@@ -54,7 +61,7 @@ describe("Token", function() {
   })
 
   it("Should unpause transfer", async () => {
-    await token.unpauseTransfer()
+    await token.connect(minter).unpauseTransfer()
     const transferPaused_ = await token.transferPaused()
     expect(transferPaused_).to.be.equal(false)
     await token.transfer(account3.address, ethers.utils.parseEther("10"))
@@ -63,13 +70,13 @@ describe("Token", function() {
   })
 
   it("Should change name", async () => {
-    await token.changeName("Awesome Token")
+    await token.connect(minter).changeName("Awesome Token")
     const name_ = await token.name()
     expect(name_).to.be.equal("Awesome Token")
   })
 
   it("Should change symbol", async () => {
-    await token.changeSymbol("AWT")
+    await token.connect(minter).changeSymbol("AWT")
     const name_ = await token.symbol()
     expect(name_).to.be.equal("AWT")
   })
@@ -84,9 +91,13 @@ describe("Token", function() {
     await ethereum.send("evm_setNextBlockTimestamp", [allowedAfter+100])
     await ethereum.send("evm_mine", [])
 
-    await token.mint(account2.address, ethers.utils.parseEther("1000"))
+    const mintAmount = ethers.utils.parseEther("1000")
+
+    await token.connect(minter).mint(account2.address, mintAmount)
+
+    const newTotalSupply = initialSupply.add(mintAmount)
 
     const totalSupply_ = await token.totalSupply()
-    expect(totalSupply_).to.be.equal(ethers.utils.parseEther("10001000"))
+    expect(totalSupply_).to.be.equal(newTotalSupply)
   })
 })
\ No newline at end of file