Fix test conttracts

contracts/staking/contracts/test/TestCumulativeRewardTracking.sol

@@ -37,7 +37,6 @@ contract TestCumulativeRewardTracking is
         public
         TestStaking(
             wethAddress,
-            address(0),
             zrxVaultAddress
         )
     {}

contracts/staking/contracts/test/TestProtocolFees.sol

@@ -19,7 +19,6 @@
 pragma solidity ^0.5.9;
 pragma experimental ABIEncoderV2;
 
-import "@0x/contracts-asset-proxy/contracts/src/interfaces/IAssetProxy.sol";
 import "../src/interfaces/IStructs.sol";
 import "./TestStakingNoWETH.sol";
 
@@ -34,7 +33,6 @@ contract TestProtocolFees is
     }
 
     event ERC20ProxyTransferFrom(
-        bytes assetData,
         address from,
         address to,
         uint256 amount
@@ -81,14 +79,15 @@ contract TestProtocolFees is
 
     /// @dev The ERC20Proxy `transferFrom()` function.
     function transferFrom(
-        bytes calldata assetData,
         address from,
         address to,
         uint256 amount
     )
         external
+        returns (bool)
     {
-        emit ERC20ProxyTransferFrom(assetData, from, to, amount);
+        emit ERC20ProxyTransferFrom(from, to, amount);
+        return true;
     }
 
     /// @dev Overridden to use test pools.
@@ -127,12 +126,11 @@ contract TestProtocolFees is
         });
     }
 
-    function getWethAssetProxy()
+    function getWethContract()
         public
         view
-        returns (IAssetProxy wethAssetProxy)
+        returns (IEtherToken wethContract)
     {
-        wethAssetProxy = IAssetProxy(address(this));
-        return wethAssetProxy;
+        return IEtherToken(address(this));
     }
 }

contracts/staking/contracts/test/TestStaking.sol

@@ -28,18 +28,15 @@ contract TestStaking is
     Staking
 {
     address public testWethAddress;
-    address public testWethAssetProxyAddress;
     address public testZrxVaultAddress;
 
     constructor(
         address wethAddress,
-        address wethAssetProxyAddress,
         address zrxVaultAddress
     )
         public
     {
         testWethAddress = wethAddress;
-        testWethAssetProxyAddress = wethAssetProxyAddress;
         testZrxVaultAddress = zrxVaultAddress;
     }
 
@@ -56,28 +53,6 @@ contract TestStaking is
         return IEtherToken(wethAddress);
     }
 
-    function getWethAssetData()
-        public
-        view
-        returns (bytes memory)
-    {
-        address wethAddress = TestStaking(address(uint160(stakingContract))).testWethAddress();
-        return abi.encodeWithSelector(
-            IAssetData(address(0)).ERC20Token.selector,
-            wethAddress
-        );
-    }
-
-    function getWethAssetProxy()
-        public
-        view
-        returns (IAssetProxy wethAssetProxy)
-    {
-        address wethAssetProxyAddress = TestStaking(address(uint160(stakingContract))).testWethAssetProxyAddress();
-        wethAssetProxy = IAssetProxy(wethAssetProxyAddress);
-        return wethAssetProxy;
-    }
-
     function getZrxVault()
         public
         view

contracts/staking/contracts/test/TestStorageLayoutAndConstants.sol

@@ -43,16 +43,8 @@ contract TestStorageLayoutAndConstants is
         view
     {
         require(
-            getWethAssetData().equals(abi.encodeWithSelector(
-                IAssetData(address(0)).ERC20Token.selector,
-                getWethContract()
-            )),
-            "INVALID_WETH_ASSET_DATA"
-        );
-
-        require(
-            address(getWethAssetProxy()) != address(0),
-            "WETH_ASSET_PROXY_MUST_BE_SET"
+            address(getWethContract()) != address(0),
+            "WETH_MUST_BE_SET"
         );
 
         require(