diff --git a/packages/contracts/deploy/20_new_version/23_publish.ts b/packages/contracts/deploy/20_new_version/23_publish.ts
index b784f1a0..7701df98 100644
--- a/packages/contracts/deploy/20_new_version/23_publish.ts
+++ b/packages/contracts/deploy/20_new_version/23_publish.ts
@@ -141,7 +141,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     )
   ) {
     const placeholderSetup = getLatestContractAddress('PlaceholderSetup', hre);
-    if (placeholderSetup == '') {
+    if (placeholderSetup == '' && !isLocal(hre)) {
       throw new Error(
         'Aborting. Placeholder setup not present in this network'
       );
diff --git a/packages/contracts/test/10_unit-testing/11_plugin.ts b/packages/contracts/test/10_unit-testing/11_plugin.ts
index 4dfb2ff3..df716aaf 100644
--- a/packages/contracts/test/10_unit-testing/11_plugin.ts
+++ b/packages/contracts/test/10_unit-testing/11_plugin.ts
@@ -3,17 +3,15 @@ import {PLUGIN_CONTRACT_NAME} from '../../plugin-settings';
 import {
   Admin,
   Admin__factory,
-  AdminZkSync__factory,
   CustomExecutorMock__factory,
   IERC165Upgradeable__factory,
   IMembership__factory,
   IPlugin__factory,
   IProposal__factory,
   IProtocolVersion__factory,
-  ProxyFactory__factory,
 } from '../../typechain';
 import {ProposalCreatedEvent} from '../../typechain/src/Admin';
-import {isZkSync, ZK_SYNC_NETWORKS} from '../../utils/zkSync';
+import {isZkSync} from '../../utils/zkSync';
 import {
   ADMIN_INTERFACE,
   EXECUTE_PROPOSAL_PERMISSION_ID,
diff --git a/packages/contracts/test/10_unit-testing/12_plugin-setup.ts b/packages/contracts/test/10_unit-testing/12_plugin-setup.ts
index da8ee9b3..086a2802 100644
--- a/packages/contracts/test/10_unit-testing/12_plugin-setup.ts
+++ b/packages/contracts/test/10_unit-testing/12_plugin-setup.ts
@@ -1,7 +1,7 @@
 import {createDaoProxy} from '../20_integration-testing/test-helpers';
 import {PLUGIN_SETUP_CONTRACT_NAME} from '../../plugin-settings';
 import buildMetadata from '../../src/build-metadata.json';
-import {AdminSetup, Admin__factory, AdminSetup__factory} from '../../typechain';
+import {AdminSetup, Admin__factory} from '../../typechain';
 import {isZkSync} from '../../utils/zkSync';
 import {
   ADMIN_INTERFACE,
diff --git a/packages/contracts/test/test-utils/wrapper/index.ts b/packages/contracts/test/test-utils/wrapper/index.ts
index b345150b..bae23c9a 100644
--- a/packages/contracts/test/test-utils/wrapper/index.ts
+++ b/packages/contracts/test/test-utils/wrapper/index.ts
@@ -1,4 +1,4 @@
-import {ProxyCreatedEvent} from '../../../typechain/ProxyFactory';
+import {ProxyCreatedEvent} from '../../../typechain/@aragon/osx-commons-contracts/src/utils/deployment/ProxyFactory';
 import {HardhatClass} from './hardhat';
 import {ZkSync} from './zksync';
 import {findEvent} from '@aragon/osx-commons-sdk';