diff --git a/.gitea/workflows/smart-contract-tests.yml b/.gitea/workflows/smart-contract-tests.yml
index b45afbf8..4ebc2239 100644
--- a/.gitea/workflows/smart-contract-tests.yml
+++ b/.gitea/workflows/smart-contract-tests.yml
@@ -134,9 +134,10 @@ jobs:
 
           echo "=== Running Foundry Tests ==="
           
-          # Install OpenZeppelin dependencies (v4.x for compatibility with existing imports)
-          forge install OpenZeppelin/openzeppelin-contracts@v4.9.6
-          echo "✅ OpenZeppelin dependencies installed"
+          # Install OpenZeppelin dependencies (v4.9.6 for compatibility with existing imports)
+          forge install OpenZeppelin/openzeppelin-contracts
+          cd lib/openzeppelin-contracts && git checkout v4.9.6 && cd ../..
+          echo "✅ OpenZeppelin dependencies installed (v4.9.6)"
           
           # Build contracts
           forge build
diff --git a/contracts/test/Phase4ModularContracts.test.js b/contracts/test/Phase4ModularContracts.test.js
index 05299e02..09ebfdd2 100644
--- a/contracts/test/Phase4ModularContracts.test.js
+++ b/contracts/test/Phase4ModularContracts.test.js
@@ -72,11 +72,7 @@ describe("Phase 4 Modular Smart Contracts", function () {
       ethers.keccak256(ethers.toUtf8Bytes("RewardDistributor")),
       await rewardDistributor.getAddress()
     );
-    // PerformanceAggregator registers itself during initialize()
-    await contractRegistry.registerContract(
-      ethers.keccak256(ethers.toUtf8Bytes("StakingPoolFactory")),
-      await stakingPoolFactory.getAddress()
-    );
+    // StakingPoolFactory and PerformanceAggregator register themselves during initialize()
     await contractRegistry.registerContract(
       ethers.keccak256(ethers.toUtf8Bytes("DAOGovernanceEnhanced")),
       await daoGovernanceEnhanced.getAddress()