diff --git a/test/mocks/BadMockEIP1271Implementer.sol b/test/mocks/BadMockEIP1271Implementer.sol
deleted file mode 100644
index 9091389..0000000
--- a/test/mocks/BadMockEIP1271Implementer.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.15;
-
-import {IERC1271} from '@openzeppelin/contracts/interfaces/IERC1271.sol';
-
-/**
- * @dev This is a mock contract that always returns the wrong value upon being checked with EIP-1271.
- */
-contract BadMockEIP1271Implementer is IERC1271 {
-    function testBadMockEIP1271Implementer() public {
-        // Prevents being counted in Foundry Coverage
-    }
-
-    function isValidSignature(
-        bytes32 /* _hash */,
-        bytes memory /* _signature */
-    ) external pure override returns (bytes4) {
-        return bytes4(0xFFFFFFFF);
-    }
-}
diff --git a/test/mocks/MockEIP1271Implementer.sol b/test/mocks/MockEIP1271Implementer.sol
deleted file mode 100644
index 6b331b8..0000000
--- a/test/mocks/MockEIP1271Implementer.sol
+++ /dev/null
@@ -1,41 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.15;
-
-import {IERC1271} from '@openzeppelin/contracts/interfaces/IERC1271.sol';
-
-/**
- * @dev This is a mock contract that validates an EIP1271 signature against its deployer.
- */
-contract MockEIP1271Implementer is IERC1271 {
-    function testMockEIP1271Implementer() public {
-        // Prevents being counted in Foundry Coverage
-    }
-
-    // bytes4(keccak256("isValidSignature(bytes32,bytes)")
-    bytes4 internal constant MAGIC_VALUE = 0x1626ba7e;
-
-    address public immutable OWNER;
-
-    constructor() {
-        OWNER = msg.sender;
-    }
-
-    function isValidSignature(bytes32 _hash, bytes memory _signature) external view override returns (bytes4) {
-        require(_signature.length == 65, 'Invalid signature length');
-        bytes32 r;
-        bytes32 s;
-        uint8 v;
-
-        assembly {
-            r := mload(add(_signature, 32))
-            s := mload(add(_signature, 64))
-            v := shr(248, mload(add(_signature, 96)))
-        }
-
-        // (bytes32 r, bytes32 s, uint8 v) = abi.decode(_signature, (bytes32, bytes32, uint8));
-        address signer = ecrecover(keccak256(abi.encodePacked('\x19Ethereum Signed Message:\n32', _hash)), v, r, s);
-        require(signer != address(0), 'Invalid recovery');
-        return signer == OWNER ? MAGIC_VALUE : bytes4(0xFFFFFFFF);
-    }
-}
diff --git a/test/modules/follow/RevertFollowModule.test.sol b/test/modules/follow/RevertFollowModule.t.sol
similarity index 100%
rename from test/modules/follow/RevertFollowModule.test.sol
rename to test/modules/follow/RevertFollowModule.t.sol
diff --git a/test/modules/reference/FollowerOnlyReferenceModule.test.sol b/test/modules/reference/FollowerOnlyReferenceModule.t.sol
similarity index 100%
rename from test/modules/reference/FollowerOnlyReferenceModule.test.sol
rename to test/modules/reference/FollowerOnlyReferenceModule.t.sol
diff --git a/test/modules/reference/TokenGatedReferenceModule.test.sol b/test/modules/reference/TokenGatedReferenceModule.t.sol
similarity index 100%
rename from test/modules/reference/TokenGatedReferenceModule.test.sol
rename to test/modules/reference/TokenGatedReferenceModule.t.sol