diff --git a/.gitmodules b/.gitmodules
index 72d8123..6e9767e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "lib/nexus"]
 	path = lib/nexus
-	url = https://github.com/lib/nexus
+	url = https://github.com/bcnmy/nexus
 	branch = dev
 [submodule "lib/forge-std"]
 	path = lib/forge-std
diff --git a/test/base/TestBase.sol b/test/base/TestBase.sol
index b21cfb8..95ed18b 100644
--- a/test/base/TestBase.sol
+++ b/test/base/TestBase.sol
@@ -5,14 +5,12 @@ import { Test } from "forge-std/src/Test.sol";
 import { Vm } from "forge-std/src/Vm.sol";
 
 import "@solady/src/utils/ECDSA.sol";
-import { TestHelper } from "@nexus/test/foundry/utils/TestHelper.t.sol";
+import { TestHelper, IEntryPoint, EntryPoint } from "@nexus/test/foundry/utils/TestHelper.t.sol";
 
-import { EntryPoint } from "@account-abstraction/contracts/core/EntryPoint.sol";
-import { IEntryPoint } from "@account-abstraction/contracts/interfaces/IEntryPoint.sol";
 import { IAccount } from "@account-abstraction/contracts/interfaces/IAccount.sol";
 import { Exec } from "@account-abstraction/contracts/utils/Exec.sol";
 import { IPaymaster } from "@account-abstraction/contracts/interfaces/IPaymaster.sol";
-import { PackedUserOperation } from "@account-abstraction/contracts/interfaces/PackedUserOperation.sol";
+import { PackedUserOperation } from "@nexus/contracts/Nexus.sol";
 
 import { Nexus } from "@nexus/contracts/Nexus.sol";
 import { CheatCodes } from "@nexus/test/foundry/utils/CheatCodes.sol";
diff --git a/test/unit/concrete/TestSponsorshipPaymaster.t.sol b/test/unit/concrete/TestSponsorshipPaymaster.t.sol
index 5193952..ffa5c90 100644
--- a/test/unit/concrete/TestSponsorshipPaymaster.t.sol
+++ b/test/unit/concrete/TestSponsorshipPaymaster.t.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.26;
 import { TestBase } from "../../base/TestBase.sol";
 import { IBiconomySponsorshipPaymaster } from "../../../contracts/interfaces/IBiconomySponsorshipPaymaster.sol";
 import { BiconomySponsorshipPaymaster } from "../../../contracts/sponsorship/BiconomySponsorshipPaymaster.sol";
-import { PackedUserOperation } from "@account-abstraction/contracts/core/UserOperationLib.sol";
+import { PackedUserOperation } from "@nexus/contracts/Nexus.sol";
 import { MockToken } from "@nexus/contracts/mocks/MockToken.sol";
 
 contract TestSponsorshipPaymasterWithDynamicAdjustment is TestBase {
diff --git a/test/unit/fuzz/TestFuzz_TestSponsorshipPaymaster.t.sol b/test/unit/fuzz/TestFuzz_TestSponsorshipPaymaster.t.sol
index 983f610..7b871ed 100644
--- a/test/unit/fuzz/TestFuzz_TestSponsorshipPaymaster.t.sol
+++ b/test/unit/fuzz/TestFuzz_TestSponsorshipPaymaster.t.sol
@@ -5,7 +5,7 @@ import { TestBase } from "../../base/TestBase.sol";
 import { IBiconomySponsorshipPaymaster } from "../../../contracts/interfaces/IBiconomySponsorshipPaymaster.sol";
 import { BiconomySponsorshipPaymaster } from "../../../contracts/sponsorship/BiconomySponsorshipPaymaster.sol";
 import { MockToken } from "@nexus/contracts/mocks/MockToken.sol";
-import { PackedUserOperation } from "@account-abstraction/contracts/interfaces/PackedUserOperation.sol";
+import { PackedUserOperation } from "@nexus/contracts/Nexus.sol";
 
 contract TestFuzz_SponsorshipPaymasterWithDynamicAdjustment is TestBase {
     BiconomySponsorshipPaymaster public bicoPaymaster;