diff --git a/foundry/src/executors/EkuboExecutor.sol b/foundry/src/executors/EkuboExecutor.sol
index 66e508f..d4175a3 100644
--- a/foundry/src/executors/EkuboExecutor.sol
+++ b/foundry/src/executors/EkuboExecutor.sol
@@ -25,8 +25,8 @@ contract EkuboExecutor is IExecutor, ICallback, ILocker, IPayer {
     uint256 constant POOL_DATA_OFFSET = 56;
     uint256 constant HOP_BYTE_LEN = 52;
 
-    constructor(ICore _core) {
-        core = _core;
+    constructor(address _core) {
+        core = ICore(_core);
     }
 
     function swap(uint256 amountIn, bytes calldata data)
diff --git a/foundry/test/TychoRouter.t.sol b/foundry/test/TychoRouter.t.sol
index 128c97a..38ae918 100644
--- a/foundry/test/TychoRouter.t.sol
+++ b/foundry/test/TychoRouter.t.sol
@@ -1029,6 +1029,9 @@ contract TychoRouterTest is TychoRouterTestSetup {
     }
 
     function testEkuboIntegration() public {
+        vm.skip(true);
+        // Test needs to be run on block 22082754 or later
+
         deal(ALICE, 1 ether);
         uint256 balancerBefore = IERC20(USDC_ADDR).balanceOf(ALICE);
 
diff --git a/foundry/test/TychoRouterTestSetup.sol b/foundry/test/TychoRouterTestSetup.sol
index e1e62e9..f53b822 100644
--- a/foundry/test/TychoRouterTestSetup.sol
+++ b/foundry/test/TychoRouterTestSetup.sol
@@ -54,7 +54,7 @@ contract TychoRouterTestSetup is Test, Constants {
         bytes32 initCodeV3 = USV3_POOL_CODE_INIT_HASH;
         bytes32 initCodePancakeV3 = PANCAKEV3_POOL_CODE_INIT_HASH;
         address poolManagerAddress = 0x000000000004444c5dc75cB358380D2e3dE08A90;
-        ICore ekuboCore = ICore(0xe0e0e08A6A4b9Dc7bD67BCB7aadE5cF48157d444);
+        address ekuboCore = 0xe0e0e08A6A4b9Dc7bD67BCB7aadE5cF48157d444;
 
         IPoolManager poolManager = IPoolManager(poolManagerAddress);
         tychoRouter = new TychoRouterExposed(PERMIT2_ADDRESS, WETH_ADDR);