diff --git a/test/Base.t.sol b/test/Base.t.sol
index 35448c25..66f34a57 100644
--- a/test/Base.t.sol
+++ b/test/Base.t.sol
@@ -6,7 +6,6 @@ import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import { SafeCast } from "@openzeppelin/contracts/utils/math/SafeCast.sol";
 
 import { SablierV2OpenEnded } from "src/SablierV2OpenEnded.sol";
-import { OpenEnded } from "src/types/DataTypes.sol";
 
 import { ERC20Mock } from "./mocks/ERC20Mock.sol";
 import { ERC20MissingReturn } from "./mocks/ERC20MissingReturn.sol";
diff --git a/test/integration/Integration.t.sol b/test/integration/Integration.t.sol
index 3d13c357..a65f4e2a 100644
--- a/test/integration/Integration.t.sol
+++ b/test/integration/Integration.t.sol
@@ -47,7 +47,7 @@ abstract contract Integration_Test is Base_Test {
         assertEq(returnData, abi.encodeWithSelector(Errors.DelegateCall.selector), "delegatecall return data");
     }
 
-    uint256 nullStreamId = 420;
+    uint256 internal nullStreamId = 420;
 
     function _test_RevertGiven_Null() internal {
         vm.expectRevert(abi.encodeWithSelector(Errors.SablierV2OpenEnded_Null.selector, nullStreamId));
diff --git a/test/integration/adjust-rate-per-second/adjustRatePerSecond.t.sol b/test/integration/adjust-rate-per-second/adjustRatePerSecond.t.sol
index a5a67946..561428f4 100644
--- a/test/integration/adjust-rate-per-second/adjustRatePerSecond.t.sol
+++ b/test/integration/adjust-rate-per-second/adjustRatePerSecond.t.sol
@@ -5,7 +5,6 @@ import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 import { ISablierV2OpenEnded } from "src/interfaces/ISablierV2OpenEnded.sol";
 import { Errors } from "src/libraries/Errors.sol";
-import { OpenEnded } from "src/types/DataTypes.sol";
 
 import { Integration_Test } from "../Integration.t.sol";
 
diff --git a/test/integration/cancel/cancel.t.sol b/test/integration/cancel/cancel.t.sol
index 1f6f911d..3457e0f3 100644
--- a/test/integration/cancel/cancel.t.sol
+++ b/test/integration/cancel/cancel.t.sol
@@ -5,7 +5,6 @@ import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 import { ISablierV2OpenEnded } from "src/interfaces/ISablierV2OpenEnded.sol";
 import { Errors } from "src/libraries/Errors.sol";
-import { OpenEnded } from "src/types/DataTypes.sol";
 
 import { Integration_Test } from "../Integration.t.sol";
 
diff --git a/test/integration/deposit/deposit.t.sol b/test/integration/deposit/deposit.t.sol
index e92ff504..8aca0fee 100644
--- a/test/integration/deposit/deposit.t.sol
+++ b/test/integration/deposit/deposit.t.sol
@@ -5,7 +5,6 @@ import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 import { ISablierV2OpenEnded } from "src/interfaces/ISablierV2OpenEnded.sol";
 import { Errors } from "src/libraries/Errors.sol";
-import { OpenEnded } from "src/types/DataTypes.sol";
 
 import { Integration_Test } from "../Integration.t.sol";
 
diff --git a/test/integration/refund-from-stream/refundFromStream.t.sol b/test/integration/refund-from-stream/refundFromStream.t.sol
index 27e4facf..5cbba4fd 100644
--- a/test/integration/refund-from-stream/refundFromStream.t.sol
+++ b/test/integration/refund-from-stream/refundFromStream.t.sol
@@ -5,7 +5,6 @@ import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 import { ISablierV2OpenEnded } from "src/interfaces/ISablierV2OpenEnded.sol";
 import { Errors } from "src/libraries/Errors.sol";
-import { OpenEnded } from "src/types/DataTypes.sol";
 
 import { Integration_Test } from "../Integration.t.sol";
 
diff --git a/test/integration/restart-stream/restartStream.t.sol b/test/integration/restart-stream/restartStream.t.sol
index b328786e..1a52f100 100644
--- a/test/integration/restart-stream/restartStream.t.sol
+++ b/test/integration/restart-stream/restartStream.t.sol
@@ -3,7 +3,6 @@ pragma solidity >=0.8.22;
 
 import { ISablierV2OpenEnded } from "src/interfaces/ISablierV2OpenEnded.sol";
 import { Errors } from "src/libraries/Errors.sol";
-import { OpenEnded } from "src/types/DataTypes.sol";
 
 import { Integration_Test } from "../Integration.t.sol";
 
diff --git a/test/integration/withdraw/withdraw.t.sol b/test/integration/withdraw/withdraw.t.sol
index 75d0ba54..d3aae1e3 100644
--- a/test/integration/withdraw/withdraw.t.sol
+++ b/test/integration/withdraw/withdraw.t.sol
@@ -5,7 +5,6 @@ import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 import { ISablierV2OpenEnded } from "src/interfaces/ISablierV2OpenEnded.sol";
 import { Errors } from "src/libraries/Errors.sol";
-import { OpenEnded } from "src/types/DataTypes.sol";
 
 import { Integration_Test } from "../Integration.t.sol";
 
diff --git a/test/invariant/handlers/BaseHandler.sol b/test/invariant/handlers/BaseHandler.sol
index 11b760e8..86df63be 100644
--- a/test/invariant/handlers/BaseHandler.sol
+++ b/test/invariant/handlers/BaseHandler.sol
@@ -41,7 +41,7 @@ abstract contract BaseHandler is StdCheats, StdUtils {
     TimestampStore public timestampStore;
 
     /// @dev An instance of the Foundry VM, which contains cheatcodes for testing.
-    Vm internal constant vm = Vm(VM_ADDRESS);
+    Vm internal vm = Vm(VM_ADDRESS);
 
     /*//////////////////////////////////////////////////////////////////////////
                                     CONSTRUCTOR
diff --git a/test/invariant/handlers/OpenEndedCreateHandler.sol b/test/invariant/handlers/OpenEndedCreateHandler.sol
index a4dcab45..14526bca 100644
--- a/test/invariant/handlers/OpenEndedCreateHandler.sol
+++ b/test/invariant/handlers/OpenEndedCreateHandler.sol
@@ -4,7 +4,6 @@ pragma solidity >=0.8.22 <0.9.0;
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 import { ISablierV2OpenEnded } from "src/interfaces/ISablierV2OpenEnded.sol";
-import { OpenEnded } from "src/types/DataTypes.sol";
 
 import { OpenEndedStore } from "../stores/OpenEndedStore.sol";
 import { TimestampStore } from "../stores/TimestampStore.sol";