diff --git a/package.json b/package.json
index ae3a0c5b..20056f98 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "test:watch": "jest --watch",
     "test:cov": "jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
-    "test:e2e": "jest --config ./test/jest-e2e.json",
+    "test:e2e": "jest --detectOpenHandles --forceExit  --config ./test/jest-e2e.json",
     "typechain": "typechain --target=ethers-v5 --out-dir ./src/generated ./src/abi/*.json",
     "postinstall": "yarn typechain",
     "docker:build": "docker build -t $npm_package_config_dockerorg/$npm_package_name:$npm_package_version .",
diff --git a/src/guardian/guardian-metrics/guardian-metrics.service.ts b/src/guardian/guardian-metrics/guardian-metrics.service.ts
index c34b5034..0d000e97 100644
--- a/src/guardian/guardian-metrics/guardian-metrics.service.ts
+++ b/src/guardian/guardian-metrics/guardian-metrics.service.ts
@@ -101,7 +101,7 @@ export class GuardianMetricsService {
 
     const operatorsKeysTotal = unusedKeys.length;
     this.operatorsKeysCounter.set(
-      { type: 'total', stakingModuleId },
+      { type: 'unused', stakingModuleId },
       operatorsKeysTotal,
     );
   }
diff --git a/src/guardian/staking-module-guard/staking-module-guard.spec.ts b/src/guardian/staking-module-guard/staking-module-guard.spec.ts
index 9bfc0315..4f45e7f1 100644
--- a/src/guardian/staking-module-guard/staking-module-guard.spec.ts
+++ b/src/guardian/staking-module-guard/staking-module-guard.spec.ts
@@ -155,7 +155,7 @@ describe('GuardianService', () => {
       srModuleId: 1,
     };
 
-    it('should call handleKeysIntersections if next keys are found in the deposit contract', async () => {
+    it('should call handleKeysIntersections if unused keys are found in the deposit contract', async () => {
       const depositedKey = depositedPubKeys[0];
       const unusedKeys = [depositedKey];
       const events = currentBlockData.depositedEvents.events.map(
@@ -194,7 +194,7 @@ describe('GuardianService', () => {
       expect(mockGetWithdrawalCredentials).toBeCalledTimes(1);
     });
 
-    it('should call handleCorrectKeys if Lido next keys are not found in the deposit contract', async () => {
+    it('should call handleCorrectKeys if Lido unused keys are not found in the deposit contract', async () => {
       const notDepositedKey = '0x2345';
       const unusedKeys = [notDepositedKey];
       const blockData = { ...currentBlockData, unusedKeys };
diff --git a/src/messages/messages.constants.ts b/src/messages/messages.constants.ts
index 31c584d9..8c2188d6 100644
--- a/src/messages/messages.constants.ts
+++ b/src/messages/messages.constants.ts
@@ -5,7 +5,7 @@ export const MESSAGE_TOPIC_PREFIX_BY_NETWORK: {
 } = {
   [CHAINS.Mainnet]: 'mainnet',
   [CHAINS.Goerli]: 'goerli',
-  [CHAINS.Zhejiang]: 'testnet',
+  [CHAINS.Zhejiang]: 'zhejiang',
 };
 
 export const getMessageTopicPrefix = (chainId: CHAINS): string => {