safe-tools: Light edits to fix compatibility issues

packages/contracts-bedrock/test/safe-tools/CompatibilityFallbackHandler_1_3_0.sol

@@ -6,7 +6,7 @@ import "safe-contracts/interfaces/ERC721TokenReceiver.sol";
 import "safe-contracts/interfaces/ERC777TokensRecipient.sol";
 import "safe-contracts/interfaces/IERC165.sol";
 import "safe-contracts/interfaces/ISignatureValidator.sol";
-import "safe-contracts/GnosisSafe.sol";
+import { Safe as GnosisSafe } from "safe-contracts/Safe.sol";
 
 /// @dev NOTE: removed VERSION and NAME due to inheritance conflicts
 contract DefaultCallbackHandler is ERC1155TokenReceiver, ERC777TokensRecipient, ERC721TokenReceiver, IERC165 {

packages/contracts-bedrock/test/safe-tools/SafeTestTools.sol

@@ -2,12 +2,12 @@
 pragma solidity >=0.7.0 <0.9.0;
 
 import "forge-std/Test.sol";
-import "solady/utils/LibSort.sol";
-import "safe-contracts/GnosisSafe.sol";
-import "safe-contracts/proxies/GnosisSafeProxyFactory.sol";
-import "safe-contracts/examples/libraries/SignMessage.sol";
+import "scripts/libraries/LibSort.sol";
+import { ModuleManager, Safe as GnosisSafe } from "safe-contracts/Safe.sol";
+import { SafeProxyFactory as GnosisSafeProxyFactory } from "safe-contracts/proxies/SafeProxyFactory.sol";
+import { Enum } from "safe-contracts/common/Enum.sol";
+import { SignMessageLib } from "safe-contracts/libraries/SignMessageLib.sol";
 import "./CompatibilityFallbackHandler_1_3_0.sol";
-import "safe-contracts/examples/libraries/SignMessage.sol";
 
 address constant VM_ADDR = 0x7109709ECfa91a80626fF3989D68f67F5b1DD12D;
 bytes12 constant ADDR_MASK = 0xffffffffffffffffffffffff;
@@ -354,11 +354,7 @@ contract SafeTestTools {
             );
 
         DeployedSafe safe0 = DeployedSafe(
-            payable(
-                advancedParams.saltNonce != 0
-                    ? proxyFactory.createProxyWithNonce(address(singleton), initData, advancedParams.saltNonce)
-                    : proxyFactory.createProxy(address(singleton), initData)
-            )
+            payable(proxyFactory.createProxyWithNonce(address(singleton), initData, advancedParams.saltNonce))
         );
 
         SafeInstance memory instance0 = SafeInstance({