diff --git a/clihandler/initcli.go b/clihandler/initcli.go
index 1cd2b905..f2b26627 100644
--- a/clihandler/initcli.go
+++ b/clihandler/initcli.go
@@ -36,7 +36,7 @@ func getInterfaces(scanInfo *cautils.ScanInfo) componentInterfaces {
 		k8sinterface.ConnectedToCluster = false
 		clusterConfig = cautils.NewEmptyConfig()
 
-		// load fom file
+		// load from file
 		resourceHandler = resourcehandler.NewFileResourceHandler(scanInfo.InputPatterns)
 
 		// set mock report (do not send report)
@@ -90,6 +90,7 @@ func setPolicyGetter(scanInfo *cautils.ScanInfo, customerGUID string) {
 }
 
 func ScanCliSetup(scanInfo *cautils.ScanInfo) error {
+	cautils.ScanStartDisplay()
 
 	interfaces := getInterfaces(scanInfo)
 
@@ -138,7 +139,6 @@ func ScanCliSetup(scanInfo *cautils.ScanInfo) error {
 }
 
 func Scan(policyHandler *policyhandler.PolicyHandler, scanInfo *cautils.ScanInfo) error {
-	cautils.ScanStartDisplay()
 	policyNotification := &reporthandling.PolicyNotification{
 		NotificationType: reporthandling.TypeExecPostureScan,
 		Rules:            scanInfo.PolicyIdentifier,
diff --git a/resourcehandler/filesloader.go b/resourcehandler/filesloader.go
index eefb7240..2a268ea5 100644
--- a/resourcehandler/filesloader.go
+++ b/resourcehandler/filesloader.go
@@ -37,6 +37,7 @@ type FileResourceHandler struct {
 }
 
 func NewFileResourceHandler(inputPatterns []string) *FileResourceHandler {
+	k8sinterface.InitializeMapResourcesMock() // initialize the resource map
 	return &FileResourceHandler{
 		inputPatterns: inputPatterns,
 	}
diff --git a/resourcehandler/k8sresources.go b/resourcehandler/k8sresources.go
index dbc27220..7f948ab2 100644
--- a/resourcehandler/k8sresources.go
+++ b/resourcehandler/k8sresources.go
@@ -52,7 +52,7 @@ func (k8sHandler *K8sResourceHandler) GetResources(frameworks []reporthandling.F
 }
 
 func (k8sHandler *K8sResourceHandler) GetClusterAPIServerInfo() *version.Info {
-	clusterAPIServerInfo, err := k8sHandler.k8s.KubernetesClient.Discovery().ServerVersion()
+	clusterAPIServerInfo, err := k8sHandler.k8s.DiscoveryClient.ServerVersion()
 	if err != nil {
 		cautils.ErrorDisplay(fmt.Sprintf("Failed to discover API server information: %v", err))
 		return nil