diff --git a/monkey/monkey_island/cc/resources/telemetry.py b/monkey/monkey_island/cc/resources/telemetry.py
index e07207707..2f674f7bf 100644
--- a/monkey/monkey_island/cc/resources/telemetry.py
+++ b/monkey/monkey_island/cc/resources/telemetry.py
@@ -9,7 +9,7 @@ from flask import request
 from monkey_island.cc.auth import jwt_required
 from monkey_island.cc.database import mongo
 from monkey_island.cc.services.node import NodeService
-from monkey_island.cc.services.telemetry.processing.hooks import process_telemetry
+from monkey_island.cc.services.telemetry.processing.processing import process_telemetry
 from monkey_island.cc.models.monkey import Monkey
 
 __author__ = 'Barak'
diff --git a/monkey/monkey_island/cc/services/reporting/zero_trust_service.py b/monkey/monkey_island/cc/services/reporting/zero_trust_service.py
index e3151dd7a..8039d6e16 100644
--- a/monkey/monkey_island/cc/services/reporting/zero_trust_service.py
+++ b/monkey/monkey_island/cc/services/reporting/zero_trust_service.py
@@ -109,6 +109,7 @@ class ZeroTrustService(object):
         test_info = TESTS_MAP[finding.test]
         enriched_finding = {
             "test": test_info[FINDING_EXPLANATION_BY_STATUS_KEY][finding.status],
+            "test_key": finding.test,
             "pillars": test_info[PILLARS_KEY],
             "status": finding.status,
             "events": ZeroTrustService.__get_events_as_dict(finding.events)
diff --git a/monkey/monkey_island/cc/services/telemetry/processing/hooks.py b/monkey/monkey_island/cc/services/telemetry/processing/processing.py
similarity index 100%
rename from monkey/monkey_island/cc/services/telemetry/processing/hooks.py
rename to monkey/monkey_island/cc/services/telemetry/processing/processing.py
diff --git a/monkey/monkey_island/cc/services/telemetry/zero_trust_tests/antivirus_existence.py b/monkey/monkey_island/cc/services/telemetry/zero_trust_tests/antivirus_existence.py
index c93d63b72..c86838476 100644
--- a/monkey/monkey_island/cc/services/telemetry/zero_trust_tests/antivirus_existence.py
+++ b/monkey/monkey_island/cc/services/telemetry/zero_trust_tests/antivirus_existence.py
@@ -5,76 +5,7 @@ from common.data.zero_trust_consts import EVENT_TYPE_MONKEY_LOCAL, EVENT_TYPE_IS
 from monkey_island.cc.models import Monkey
 from monkey_island.cc.models.zero_trust.event import Event
 from monkey_island.cc.models.zero_trust.finding import Finding
-
-ANTI_VIRUS_KNOWN_PROCESS_NAMES = [
-    u"AvastSvc.exe",
-    u"AvastUI.exe",
-    u"avcenter.exe",
-    u"avconfig.exe",
-    u"avgcsrvx.exe",
-    u"avgidsagent.exe",
-    u"avgnt.exe",
-    u"avgrsx.exe",
-    u"avguard.exe",
-    u"avgui.exe",
-    u"avgwdsvc.exe",
-    u"avp.exe",
-    u"avscan.exe",
-    u"bdagent.exe",
-    u"ccuac.exe",
-    u"egui.exe",
-    u"hijackthis.exe",
-    u"instup.exe",
-    u"keyscrambler.exe",
-    u"mbam.exe",
-    u"mbamgui.exe",
-    u"mbampt.exe",
-    u"mbamscheduler.exe",
-    u"mbamservice.exe",
-    u"MpCmdRun.exe",
-    u"MSASCui.exe",
-    u"MsMpEng.exe",
-    u"rstrui.exe",
-    u"spybotsd.exe",
-    u"zlclient.exe",
-    u"SymCorpUI.exe",
-    u"ccSvcHst.exe",
-    u"ccApp.exe",
-    u"LUALL.exe",
-    u"SMC.exe",
-    u"SMCgui.exe",
-    u"Rtvscan.exe",
-    u"LuComServer.exe",
-    u"ProtectionUtilSurrogate.exe",
-    u"ClientRemote.exe",
-    u"SemSvc.exe",
-    u"SemLaunchSvc.exe",
-    u"sesmcontinst.exe",
-    u"LuCatalog.exe",
-    u"LUALL.exe",
-    u"LuCallbackProxy.exe",
-    u"LuComServer_3_3.exe",
-    u"httpd.exe",
-    u"dbisqlc.exe",
-    u"dbsrv16.exe",
-    u"semapisrv.exe",
-    u"snac64.exe",
-    u"AutoExcl.exe",
-    u"DoScan.exe",
-    u"nlnhook.exe",
-    u"SavUI.exe",
-    u"SepLiveUpdate.exe",
-    u"Smc.exe",
-    u"SmcGui.exe",
-    u"SymCorpUI.exe",
-    u"symerr.exe",
-    u"ccSvcHst.exe",
-    u"DevViewer.exe",
-    u"DWHWizrd.exe",
-    u"RtvStart.exe",
-    u"roru.exe",
-    u"WSCSAvNotifier"
-]
+from monkey_island.cc.services.telemetry.zero_trust_tests.known_anti_viruses import ANTI_VIRUS_KNOWN_PROCESS_NAMES
 
 
 def test_antivirus_existence(telemetry_json):
diff --git a/monkey/monkey_island/cc/services/telemetry/zero_trust_tests/known_anti_viruses.py b/monkey/monkey_island/cc/services/telemetry/zero_trust_tests/known_anti_viruses.py
new file mode 100644
index 000000000..e10792d0c
--- /dev/null
+++ b/monkey/monkey_island/cc/services/telemetry/zero_trust_tests/known_anti_viruses.py
@@ -0,0 +1,69 @@
+ANTI_VIRUS_KNOWN_PROCESS_NAMES = [
+    u"AvastSvc.exe",
+    u"AvastUI.exe",
+    u"avcenter.exe",
+    u"avconfig.exe",
+    u"avgcsrvx.exe",
+    u"avgidsagent.exe",
+    u"avgnt.exe",
+    u"avgrsx.exe",
+    u"avguard.exe",
+    u"avgui.exe",
+    u"avgwdsvc.exe",
+    u"avp.exe",
+    u"avscan.exe",
+    u"bdagent.exe",
+    u"ccuac.exe",
+    u"egui.exe",
+    u"hijackthis.exe",
+    u"instup.exe",
+    u"keyscrambler.exe",
+    u"mbam.exe",
+    u"mbamgui.exe",
+    u"mbampt.exe",
+    u"mbamscheduler.exe",
+    u"mbamservice.exe",
+    u"MpCmdRun.exe",
+    u"MSASCui.exe",
+    u"MsMpEng.exe",
+    u"rstrui.exe",
+    u"spybotsd.exe",
+    u"zlclient.exe",
+    u"SymCorpUI.exe",
+    u"ccSvcHst.exe",
+    u"ccApp.exe",
+    u"LUALL.exe",
+    u"SMC.exe",
+    u"SMCgui.exe",
+    u"Rtvscan.exe",
+    u"LuComServer.exe",
+    u"ProtectionUtilSurrogate.exe",
+    u"ClientRemote.exe",
+    u"SemSvc.exe",
+    u"SemLaunchSvc.exe",
+    u"sesmcontinst.exe",
+    u"LuCatalog.exe",
+    u"LUALL.exe",
+    u"LuCallbackProxy.exe",
+    u"LuComServer_3_3.exe",
+    u"httpd.exe",
+    u"dbisqlc.exe",
+    u"dbsrv16.exe",
+    u"semapisrv.exe",
+    u"snac64.exe",
+    u"AutoExcl.exe",
+    u"DoScan.exe",
+    u"nlnhook.exe",
+    u"SavUI.exe",
+    u"SepLiveUpdate.exe",
+    u"Smc.exe",
+    u"SmcGui.exe",
+    u"SymCorpUI.exe",
+    u"symerr.exe",
+    u"ccSvcHst.exe",
+    u"DevViewer.exe",
+    u"DWHWizrd.exe",
+    u"RtvStart.exe",
+    u"roru.exe",
+    u"WSCSAvNotifier"
+]
diff --git a/monkey/monkey_island/cc/ui/src/components/pages/ZeroTrustReportPage.js b/monkey/monkey_island/cc/ui/src/components/pages/ZeroTrustReportPage.js
index f68321023..2fe43c42e 100644
--- a/monkey/monkey_island/cc/ui/src/components/pages/ZeroTrustReportPage.js
+++ b/monkey/monkey_island/cc/ui/src/components/pages/ZeroTrustReportPage.js
@@ -4,7 +4,7 @@ import AuthComponent from '../AuthComponent';
 import ReportHeader, {ReportTypes} from "../report-components/common/ReportHeader";
 import PillarsOverview from "../report-components/zerotrust/PillarOverview";
 import FindingsTable from "../report-components/zerotrust/FindingsTable";
-import {SinglePillarDirectivesStatus} from "../report-components/zerotrust/SinglePillarDirectivesStatus";
+import SinglePillarDirectivesStatus from "../report-components/zerotrust/SinglePillarDirectivesStatus";
 import MonkeysStillAliveWarning from "../report-components/common/MonkeysStillAliveWarning";
 import ReportLoader from "../report-components/common/ReportLoader";
 import MustRunMonkeyWarning from "../report-components/common/MustRunMonkeyWarning";
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/FindingsTable.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/FindingsTable.js
index 3838bd245..18160846a 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/FindingsTable.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/FindingsTable.js
@@ -22,7 +22,7 @@ const columns = [
       },
       { Header: 'Events', id:"events",
         accessor: x => {
-          return <EventsAndButtonComponent events={x.events} exportFilename={"Events_" + x.test}/>;
+          return <EventsAndButtonComponent events={x.events} exportFilename={"Events_" + x.test_key}/>;
         }
       }
     ]
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/SinglePillarDirectivesStatus.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/SinglePillarDirectivesStatus.js
index b8ded2d5a..47f477dfd 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/SinglePillarDirectivesStatus.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/SinglePillarDirectivesStatus.js
@@ -4,7 +4,7 @@ import DirectivesStatusTable from "./DirectivesStatusTable";
 import React, {Fragment} from "react";
 import * as PropTypes from "prop-types";
 
-export class SinglePillarDirectivesStatus extends AuthComponent {
+export default class SinglePillarDirectivesStatus extends AuthComponent {
   render() {
     if (this.props.directivesStatus.length === 0) {
       return null;
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/StatusesToPillarsSummary.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/StatusesToPillarsSummary.js
index 486a59d9f..8cdf12af5 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/StatusesToPillarsSummary.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/StatusesToPillarsSummary.js
@@ -32,5 +32,5 @@ export default class StatusesToPillarsSummary extends Component {
 }
 
 StatusesToPillarsSummary.propTypes = {
-  statusesToPillars: PropTypes.array
+  statusesToPillars: PropTypes.object
 };