diff --git a/packages/protocol/lib/celo-foundry b/packages/protocol/lib/celo-foundry
index 26ebfdb505c..e835793925b 160000
--- a/packages/protocol/lib/celo-foundry
+++ b/packages/protocol/lib/celo-foundry
@@ -1 +1 @@
-Subproject commit 26ebfdb505ccdd48591992a2739a6e6486e73626
+Subproject commit e835793925bfaaa8ef7aa8d341a2256c29470731
diff --git a/packages/protocol/remappings.txt b/packages/protocol/remappings.txt
index ade04c498d7..8722ca0c8b0 100644
--- a/packages/protocol/remappings.txt
+++ b/packages/protocol/remappings.txt
@@ -1,3 +1,4 @@
 @celo-contracts=contracts/
+@celo-contracts-8=contracts-0.8/
 @test-sol=test-sol
 @lib=lib
\ No newline at end of file
diff --git a/packages/protocol/test-sol/common/GasPriceMinimum.t.sol b/packages/protocol/test-sol/common/GasPriceMinimum.t.sol
index 715be4886db..ec3c67f6526 100644
--- a/packages/protocol/test-sol/common/GasPriceMinimum.t.sol
+++ b/packages/protocol/test-sol/common/GasPriceMinimum.t.sol
@@ -3,12 +3,12 @@ pragma solidity >=0.8.7 <0.8.20;
 
 import "celo-foundry-8/Test.sol";
 
-import "../../contracts/common/FixidityLib.sol";
+import "@celo-contracts/common/FixidityLib.sol";
 
-import "../../contracts/common/interfaces/IRegistry.sol";
+import "@celo-contracts/common/interfaces/IRegistry.sol";
 
 // Contract to test
-import "../../contracts-0.8/common/GasPriceMinimum.sol";
+import "@celo-contracts-8/common/GasPriceMinimum.sol";
 
 contract GasPriceMinimumTest is Test {
   using FixidityLib for FixidityLib.Fraction;
@@ -239,7 +239,7 @@ contract GasPriceMinimumGetUpdatedGasPriceMinimum is GasPriceMinimumTest {
     assertEq(gasPriceMinimum.getUpdatedGasPriceMinimum(0, 1), expectedUpdatedGasPriceMinimum);
   }
 
-  function test_shouldReturnAnUpdatedGasPriceMinimumThatMatchesATypescriptImplementation_WhenTheFullnessOfTheBlockIsRandom()
+  function test_shouldReturnAnUpdatedGasPriceMinimumThatMatchesARandomNumber_WhenTheFullnessOfTheBlockIsRandom()
     public
   {
     uint256 numIterations = 100;