diff --git a/hardhat.config.js b/hardhat.config.js
index aa8ac303..97e15209 100644
--- a/hardhat.config.js
+++ b/hardhat.config.js
@@ -40,7 +40,7 @@ const itsCompilerSettings = {
         evmVersion: process.env.EVM_VERSION || 'london',
         optimizer: {
             ...optimizerSettings,
-            runs: 1000, // Reduce runs to keep bytecode size under limit
+            runs: 100, // Reduce runs to keep bytecode size under limit
         },
     },
 };
diff --git a/test/InterchainTokenService.js b/test/InterchainTokenService.js
index d8bbc8bc..88438162 100644
--- a/test/InterchainTokenService.js
+++ b/test/InterchainTokenService.js
@@ -222,7 +222,7 @@ describe('Interchain Token Service', () => {
         ]);
 
         interchainTokenFactoryAddress = await getCreate3Address(create3Deployer.address, wallet, factoryDeploymentKey);
-        /*serviceTest = await deployContract(wallet, 'TestInterchainTokenService', [
+        serviceTest = await deployContract(wallet, 'TestInterchainTokenService', [
             tokenManagerDeployer.address,
             interchainTokenDeployer.address,
             gateway.address,
@@ -231,7 +231,7 @@ describe('Interchain Token Service', () => {
             chainName,
             tokenManager.address,
             tokenHandler.address,
-        ]);*/
+        ]);
     });
 
     describe('Interchain Token Service Deployment', () => {
@@ -249,7 +249,7 @@ describe('Interchain Token Service', () => {
             );
         });
 
-        it.skip('Should test setup revert cases', async () => {
+        it('Should test setup revert cases', async () => {
             const operator = wallet.address;
             const trustedChainNames = ['ChainA', 'ChainB'];
             const trustedAddresses = [wallet.address, wallet.address];