From 8ce1af7745e130867a84687ac351a5ce65fd1e42 Mon Sep 17 00:00:00 2001
From: DrIOS <58635327+DrIOSX@users.noreply.github.com>
Date: Fri, 28 Jun 2024 17:31:26 -0500
Subject: [PATCH 01/24] fix: paramters for export table

---
 source/Public/Export-M365SecurityAuditTable.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/Public/Export-M365SecurityAuditTable.ps1 b/source/Public/Export-M365SecurityAuditTable.ps1
index bb3d3b3..29bd75c 100644
--- a/source/Public/Export-M365SecurityAuditTable.ps1
+++ b/source/Public/Export-M365SecurityAuditTable.ps1
@@ -69,8 +69,8 @@ function Export-M365SecurityAuditTable {
         [Parameter(Mandatory = $true, ParameterSetName = "ExportAllResultsFromCsv")]
         [string]$ExportPath,
 
-        [Parameter(Mandatory = $false, ParameterSetName = "ExportAllResultsFromAuditResults")]
-        [Parameter(Mandatory = $false, ParameterSetName = "ExportAllResultsFromCsv")]
+        [Parameter(Mandatory = $true, ParameterSetName = "ExportAllResultsFromAuditResults")]
+        [Parameter(Mandatory = $true, ParameterSetName = "ExportAllResultsFromCsv")]
         [switch]$ExportOriginalTests,
 
         [Parameter(Mandatory = $false, ParameterSetName = "ExportAllResultsFromAuditResults")]

From c652b3c88674f058a4f86a3818450759a40d8ea8 Mon Sep 17 00:00:00 2001
From: DrIOS <58635327+DrIOSX@users.noreply.github.com>
Date: Fri, 28 Jun 2024 17:32:11 -0500
Subject: [PATCH 02/24] fix: 1.2.2 simplified output and added object comment

---
 source/Private/Get-CISExoOutput.ps1            | 6 +++++-
 source/tests/Test-BlockSharedMailboxSignIn.ps1 | 7 +++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/source/Private/Get-CISExoOutput.ps1 b/source/Private/Get-CISExoOutput.ps1
index 9f95f1e..59bae99 100644
--- a/source/Private/Get-CISExoOutput.ps1
+++ b/source/Private/Get-CISExoOutput.ps1
@@ -52,7 +52,11 @@ function Get-CISExoOutput {
                 # Test-BlockSharedMailboxSignIn.ps1
                 $MBX = Get-EXOMailbox -RecipientTypeDetails SharedMailbox
                 # [object[]]
-                return $MBX
+                # Example output:
+                # 123e4567-e89b-12d3-a456-426614174000
+                # 987e6543-21ba-12d3-a456-426614174000
+                # abcddcba-98fe-76dc-a456-426614174000
+                return $MBX.ExternalDirectoryObjectId
             }
             '1.3.3' {
                 # Test-ExternalSharingCalendars.ps1
diff --git a/source/tests/Test-BlockSharedMailboxSignIn.ps1 b/source/tests/Test-BlockSharedMailboxSignIn.ps1
index 974e8f4..8d30fd1 100644
--- a/source/tests/Test-BlockSharedMailboxSignIn.ps1
+++ b/source/tests/Test-BlockSharedMailboxSignIn.ps1
@@ -30,8 +30,7 @@ function Test-BlockSharedMailboxSignIn {
     process {
         try {
             # Step: Retrieve shared mailbox details
-            $MBX = Get-CISExoOutput -Rec $recnum
-            $objectids = $MBX.ExternalDirectoryObjectId
+            $objectids = Get-CISExoOutput -Rec $recnum
             $users = Get-CISAadOutput -Rec $recnum
             # Step: Retrieve details of shared mailboxes from Azure AD (Condition B: Pass/Fail)
             $sharedMailboxDetails = $users | Where-Object {$_.objectid -in $objectids}
@@ -42,7 +41,7 @@ function Test-BlockSharedMailboxSignIn {
 
             # Step: Determine failure reasons based on enabled mailboxes (Condition A & B: Fail)
             $failureReasons = if (-not $allBlocked) {
-                "Some mailboxes have sign-in enabled: $($enabledMailboxes -join ', ')"
+                "Some mailboxes have sign-in enabled (AccountEnabled:True):`n$($enabledMailboxes -join ', ')"
             }
             else {
                 "N/A"
@@ -53,7 +52,7 @@ function Test-BlockSharedMailboxSignIn {
                 "All shared mailboxes have sign-in blocked."
             }
             else {
-                "Enabled Mailboxes: $($enabledMailboxes -join ', ')"
+                "AccountEnabled set to True Mailboxes: $($enabledMailboxes -join ', ')"
             }
 
             # Step: Create and populate the CISAuditResult object

From b0486c3f23fa2d0cffbec769faa34c043d595384 Mon Sep 17 00:00:00 2001
From: DrIOS <58635327+DrIOSX@users.noreply.github.com>
Date: Fri, 28 Jun 2024 18:33:27 -0500
Subject: [PATCH 03/24] fix: 1.3.3 simplified output and added object comment

---
 source/Private/Get-CISExoOutput.ps1           | 27 ++++++++++++
 .../tests/Test-ExternalSharingCalendars.ps1   | 43 ++++++++++++++++---
 2 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/source/Private/Get-CISExoOutput.ps1 b/source/Private/Get-CISExoOutput.ps1
index 59bae99..ff07d3d 100644
--- a/source/Private/Get-CISExoOutput.ps1
+++ b/source/Private/Get-CISExoOutput.ps1
@@ -65,6 +65,33 @@ function Get-CISExoOutput {
                 # [psobject[]]
                 return $sharingPolicies
             }
+            '1.3.3b' {
+                $mailboxes = Get-Mailbox -ResultSize Unlimited
+                $results = foreach ($mailbox in $mailboxes) {
+                    # Get the name of the default calendar folder (depends on the mailbox's language)
+                    $calendarFolder = [string](Get-ExoMailboxFolderStatistics $mailbox.PrimarySmtpAddress -FolderScope Calendar | Where-Object {$_.FolderType -eq 'Calendar'}).Name
+                    Write-Verbose "Calendar folder for $($mailbox.PrimarySmtpAddress): $calendarFolder"
+                    # Get users calendar folder settings for their default Calendar folder
+                    # calendar has the format identity:\<calendar folder name>
+                    $calendar = Get-MailboxCalendarFolder -Identity "$($mailbox.PrimarySmtpAddress):\$calendarFolder"
+                    #Write-Host "Calendar object for $($mailbox.PrimarySmtpAddress): $calendar"
+                    Write-Verbose "Calendar publishing enabled: $($calendar.PublishEnabled)"
+                    # Check if calendar publishing is enabled and create a custom object
+                    if ($calendar.PublishEnabled) {
+                        [PSCustomObject]@{
+                            PrimarySmtpAddress = $mailbox.PrimarySmtpAddress
+                            CalendarFolder = $calendarFolder
+                            PublishEnabled = $calendar.PublishEnabled
+                            PublishedCalendarUrl = $calendar.PublishedCalendarUrl
+                        }
+                    }
+                }
+                $calendarDetails = @()
+                foreach ($calendar in $results) {
+                    $calendarDetails += "Calendar: $($calendar.PrimarySmtpAddress); URL: $($calendar.PublishedCalendarUrl)"
+                }
+                return $calendarDetails
+            }
             '1.3.6' {
                 # Test-CustomerLockbox.ps1
                 # Step: Retrieve the organization configuration (Condition C: Pass/Fail)
diff --git a/source/tests/Test-ExternalSharingCalendars.ps1 b/source/tests/Test-ExternalSharingCalendars.ps1
index ba0d8a3..05f0aae 100644
--- a/source/tests/Test-ExternalSharingCalendars.ps1
+++ b/source/tests/Test-ExternalSharingCalendars.ps1
@@ -12,7 +12,7 @@ function Test-ExternalSharingCalendars {
 
         # Initialization code, if needed
         $recnum = "1.3.3"
-
+        Write-Verbose "Running Test-ExternalSharingCalendars Rec#: $recnum"
         # Conditions for 1.3.3 (L2) Ensure 'External sharing' of calendars is not available (Automated)
         #
         # Validate test for a pass:
@@ -31,8 +31,16 @@ function Test-ExternalSharingCalendars {
     process {
         try {
             # Step: Retrieve sharing policies related to calendar sharing
+            # $sharingPolicies Mock Object
+            <#
+                $mockPolicy = [PSCustomObject]@{
+                    Name = "Default Sharing Policy"
+                    Domains = @("Anonymous:CalendarSharingFreeBusySimple")
+                    Enabled = $true
+                    Default = $true
+                }
+            #>
             $sharingPolicies = Get-CISExoOutput -Rec $recnum
-
             # Step (Condition A & B: Pass/Fail): Check if calendar sharing is disabled in all applicable policies
             $isExternalSharingDisabled = $true
             $sharingPolicyDetails = @()
@@ -42,21 +50,42 @@ function Test-ExternalSharingCalendars {
                     $sharingPolicyDetails += "$($policy.Name): Enabled"
                 }
             }
-
-            # Step: Prepare failure reasons and details based on compliance (Condition A & B: Fail)
+            # Retrieve calendars with publishing enabled (from 1.3.3b)
+            # $calendarDetails Mock Object
+            <#
+                $mailboxDetails = @(
+                    [PSCustomObject]@{
+                        Calendar = "user1@example.com"
+                        URL = "https://example.com/calendar/user1"
+                    },
+                    [PSCustomObject]@{
+                        Calendar = "user2@example.com"
+                        URL = "https://example.com/calendar/user2"
+                    },
+                    [PSCustomObject]@{
+                        Calendar = "user3@example.com"
+                        URL = "https://example.com/calendar/user3"
+                    }
+                )
+            #>
+            $calendarDetails = Get-CISExoOutput -Rec "$("$recnum" + "b")"
+            # Build the failure reason string
             $failureReasons = if (-not $isExternalSharingDisabled) {
-                "Calendar sharing with external users is enabled in one or more policies."
+                $baseMessage = "Calendar sharing with external users is enabled in one or more policies."
+                if ($calendarDetails.Count -gt 0) {
+                    $baseMessage += "`nPrior to remediating, check the following mailboxes that have calendar publishing enabled: `n$($calendarDetails -join '`n')"
+                }
+                $baseMessage
             }
             else {
                 "N/A"
             }
-
             # Step: Prepare details for the audit result (Condition A & B: Pass/Fail)
             $details = if ($isExternalSharingDisabled) {
                 "Calendar sharing with external users is disabled."
             }
             else {
-                "Enabled Sharing Policies: $($sharingPolicyDetails -join ', ')"
+                "Enabled Sharing Policies:`n$($sharingPolicyDetails -join ', ')"
             }
 
             # Step: Create and populate the CISAuditResult object

From 5d0839430ad4e68883385372e1be3ec86d5af2cb Mon Sep 17 00:00:00 2001
From: DrIOS <58635327+DrIOSX@users.noreply.github.com>
Date: Fri, 28 Jun 2024 19:14:28 -0500
Subject: [PATCH 04/24] fix: 1.2.2 simplified output and added object comment

---
 .../tests/Test-BlockSharedMailboxSignIn.ps1   | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/source/tests/Test-BlockSharedMailboxSignIn.ps1 b/source/tests/Test-BlockSharedMailboxSignIn.ps1
index 8d30fd1..2e6166e 100644
--- a/source/tests/Test-BlockSharedMailboxSignIn.ps1
+++ b/source/tests/Test-BlockSharedMailboxSignIn.ps1
@@ -11,7 +11,7 @@ function Test-BlockSharedMailboxSignIn {
 
         # Initialization code, if needed
         $recnum = "1.2.2"
-
+        Write-Verbose "Running Test-BlockSharedMailboxSignIn for $recnum..."
         # Conditions for 1.2.2 (L1) Ensure sign-in to shared mailboxes is blocked
         #
         # Validate test for a pass:
@@ -30,7 +30,36 @@ function Test-BlockSharedMailboxSignIn {
     process {
         try {
             # Step: Retrieve shared mailbox details
+            # $objectids Mock Object
+            <#
+                $objectids = @(
+                    "123e4567-e89b-12d3-a456-426614174000",
+                    "987e6543-21ba-12d3-a456-426614174000",
+                    "abcddcba-98fe-76dc-a456-426614174000"
+                )
+            #>
             $objectids = Get-CISExoOutput -Rec $recnum
+            # Step: Retrieve user details from Azure AD
+            # $users Mock Object
+            <#
+                $accountDetails = @(
+                    [PSCustomObject]@{
+                        ObjectId = "123e4567-e89b-12d3-a456-426614174000"
+                        DisplayName = "SMBuser1"
+                        AccountEnabled = $true
+                    },
+                    [PSCustomObject]@{
+                        ObjectId = "987e6543-21ba-12d3-a456-426614174000"
+                        DisplayName = "SMBuser2"
+                        AccountEnabled = $true
+                    },
+                    [PSCustomObject]@{
+                        ObjectId = "abcddcba-98fe-76dc-a456-426614174000"
+                        DisplayName = "SMBuser3"
+                        AccountEnabled = $true
+                    }
+                )
+            #>
             $users = Get-CISAadOutput -Rec $recnum
             # Step: Retrieve details of shared mailboxes from Azure AD (Condition B: Pass/Fail)
             $sharedMailboxDetails = $users | Where-Object {$_.objectid -in $objectids}

From 0daa4c7f6b45bd0467d586228dea1737845ee5b8 Mon Sep 17 00:00:00 2001
From: DrIOS <58635327+DrIOSX@users.noreply.github.com>
Date: Fri, 28 Jun 2024 19:14:44 -0500
Subject: [PATCH 05/24] fix: 1.3.3 simplified output and added object comment

---
 source/Private/Get-CISExoOutput.ps1           | 66 ++++++++++++++++---
 .../tests/Test-ExternalSharingCalendars.ps1   | 16 ++---
 2 files changed, 65 insertions(+), 17 deletions(-)

diff --git a/source/Private/Get-CISExoOutput.ps1 b/source/Private/Get-CISExoOutput.ps1
index ff07d3d..b636804 100644
--- a/source/Private/Get-CISExoOutput.ps1
+++ b/source/Private/Get-CISExoOutput.ps1
@@ -52,24 +52,72 @@ function Get-CISExoOutput {
                 # Test-BlockSharedMailboxSignIn.ps1
                 $MBX = Get-EXOMailbox -RecipientTypeDetails SharedMailbox
                 # [object[]]
-                # Example output:
-                # 123e4567-e89b-12d3-a456-426614174000
-                # 987e6543-21ba-12d3-a456-426614174000
-                # abcddcba-98fe-76dc-a456-426614174000
+                # $MBX example output:
+                <#
+                    $MBX = @(
+                        [PSCustomObject]@{
+                            UserPrincipalName = "SMBuser1@domain.com"
+                            ExternalDirectoryObjectId = "123e4567-e89b-12d3-a456-426614174000"
+                        },
+                        [PSCustomObject]@{
+                            UserPrincipalName = "SMBuser2@domain.com"
+                            ExternalDirectoryObjectId = "987e6543-21ba-12d3-a456-426614174000"
+                        },
+                        [PSCustomObject]@{
+                            UserPrincipalName = "SMBuser3@domain.com"
+                            ExternalDirectoryObjectId = "abcddcba-98fe-76dc-a456-426614174000"
+                        }
+                    )
+                #>
                 return $MBX.ExternalDirectoryObjectId
             }
             '1.3.3' {
                 # Test-ExternalSharingCalendars.ps1
                 # Step: Retrieve sharing policies related to calendar sharing
+                # $sharingPolicies Mock Object
+                <#
+                    $sharingPolicies = [PSCustomObject]@{
+                        Name = "Default Sharing Policy"
+                        Domains = @("Anonymous:CalendarSharingFreeBusySimple")
+                        Enabled = $true
+                        Default = $true
+                    }
+                #>
                 $sharingPolicies = Get-SharingPolicy | Where-Object { $_.Domains -like '*CalendarSharing*' }
                 # [psobject[]]
                 return $sharingPolicies
             }
             '1.3.3b' {
                 $mailboxes = Get-Mailbox -ResultSize Unlimited
+                <#
+                    $mailboxes = @(
+                        [PSCustomObject]@{
+                            UserPrincipalName = "SMBuser1@domain.com"
+                            ExternalDirectoryObjectId = "123e4567-e89b-12d3-a456-426614174000"
+                            PrimarySmtpAddress = "SMBuser1@domain.com"
+                            PublishEnabled       = $False
+                            PublishedCalendarUrl = "https://example.com/calendar/smbuser1"
+                        },
+                        [PSCustomObject]@{
+                            UserPrincipalName = "SMBuser2@domain.com"
+                            ExternalDirectoryObjectId = "987e6543-21ba-12d3-a456-426614174000"
+                            PrimarySmtpAddress = "SMBuser2@domain.com"
+                            PublishEnabled       = $False
+                            PublishedCalendarUrl = "https://example.com/calendar/smbuser2"
+                        },
+                        [PSCustomObject]@{
+                            UserPrincipalName = "SMBuser3@domain.com"
+                            ExternalDirectoryObjectId = "abcddcba-98fe-76dc-a456-426614174000"
+                            PrimarySmtpAddress = "SMBuser3@domain.com"
+                            PublishEnabled       = $False
+                            PublishedCalendarUrl = "https://example.com/calendar/smbuser3"
+                        }
+                    )
+                #>
                 $results = foreach ($mailbox in $mailboxes) {
                     # Get the name of the default calendar folder (depends on the mailbox's language)
-                    $calendarFolder = [string](Get-ExoMailboxFolderStatistics $mailbox.PrimarySmtpAddress -FolderScope Calendar | Where-Object {$_.FolderType -eq 'Calendar'}).Name
+                    # Return single string Ex: return "Calendar" x 3 in array
+                    $calendarFolder = [string](Get-EXOMailboxFolderStatistics $mailbox.PrimarySmtpAddress -Folderscope Calendar | Where-Object { $_.FolderType -eq 'Calendar' }).Name
                     Write-Verbose "Calendar folder for $($mailbox.PrimarySmtpAddress): $calendarFolder"
                     # Get users calendar folder settings for their default Calendar folder
                     # calendar has the format identity:\<calendar folder name>
@@ -79,9 +127,9 @@ function Get-CISExoOutput {
                     # Check if calendar publishing is enabled and create a custom object
                     if ($calendar.PublishEnabled) {
                         [PSCustomObject]@{
-                            PrimarySmtpAddress = $mailbox.PrimarySmtpAddress
-                            CalendarFolder = $calendarFolder
-                            PublishEnabled = $calendar.PublishEnabled
+                            PrimarySmtpAddress   = $mailbox.PrimarySmtpAddress
+                            CalendarFolder       = $calendarFolder
+                            PublishEnabled       = $calendar.PublishEnabled
                             PublishedCalendarUrl = $calendar.PublishedCalendarUrl
                         }
                     }
@@ -315,7 +363,7 @@ function Get-CISExoOutput {
                 # Retrieve the necessary settings for Teams and Exchange Online
                 # Condition B: Verify that 'Monitor reported messages in Microsoft Teams' is checked in the Microsoft 365 Defender portal.
                 # Condition C: Ensure the 'Send reported messages to' setting in the Microsoft 365 Defender portal is set to 'My reporting mailbox only' with the correct report email addresses.
-                $ReportSubmissionPolicy = Get-ReportSubmissionPolicy | Select-Object -Property ReportJunkToCustomizedAddress, ReportNotJunkToCustomizedAddress, ReportPhishToCustomizedAddress,ReportJunkAddresses,ReportNotJunkAddresses,ReportPhishAddresses,ReportChatMessageEnabled,ReportChatMessageToCustomizedAddressEnabled
+                $ReportSubmissionPolicy = Get-ReportSubmissionPolicy | Select-Object -Property ReportJunkToCustomizedAddress, ReportNotJunkToCustomizedAddress, ReportPhishToCustomizedAddress, ReportJunkAddresses, ReportNotJunkAddresses, ReportPhishAddresses, ReportChatMessageEnabled, ReportChatMessageToCustomizedAddressEnabled
                 return $ReportSubmissionPolicy
             }
             default { throw "No match found for test: $Rec" }
diff --git a/source/tests/Test-ExternalSharingCalendars.ps1 b/source/tests/Test-ExternalSharingCalendars.ps1
index 05f0aae..3ac3ecf 100644
--- a/source/tests/Test-ExternalSharingCalendars.ps1
+++ b/source/tests/Test-ExternalSharingCalendars.ps1
@@ -33,7 +33,7 @@ function Test-ExternalSharingCalendars {
             # Step: Retrieve sharing policies related to calendar sharing
             # $sharingPolicies Mock Object
             <#
-                $mockPolicy = [PSCustomObject]@{
+                $sharingPolicies = [PSCustomObject]@{
                     Name = "Default Sharing Policy"
                     Domains = @("Anonymous:CalendarSharingFreeBusySimple")
                     Enabled = $true
@@ -53,18 +53,18 @@ function Test-ExternalSharingCalendars {
             # Retrieve calendars with publishing enabled (from 1.3.3b)
             # $calendarDetails Mock Object
             <#
-                $mailboxDetails = @(
+                $calendarDetails = @(
                     [PSCustomObject]@{
-                        Calendar = "user1@example.com"
-                        URL = "https://example.com/calendar/user1"
+                        Calendar = "SMBuser1@domain.com"
+                        URL = "https://example.com/calendar/smbuser1"
                     },
                     [PSCustomObject]@{
-                        Calendar = "user2@example.com"
-                        URL = "https://example.com/calendar/user2"
+                        Calendar = "SMBuser2@domain.com"
+                        URL = "https://example.com/calendar/smbuser2"
                     },
                     [PSCustomObject]@{
-                        Calendar = "user3@example.com"
-                        URL = "https://example.com/calendar/user3"
+                        Calendar = "SMBuser4@domain.com"
+                        URL = "https://example.com/calendar/smbuser3"
                     }
                 )
             #>

From 033c4c524764724a3ba4542210c3467339b266ea Mon Sep 17 00:00:00 2001
From: DrIOS <58635327+DrIOSX@users.noreply.github.com>
Date: Fri, 28 Jun 2024 19:22:09 -0500
Subject: [PATCH 06/24] fix: 1.3.6 simplified output and added object comment

---
 source/Private/Get-CISExoOutput.ps1   | 12 ++++++++++--
 source/tests/Test-CustomerLockbox.ps1 |  5 +++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/source/Private/Get-CISExoOutput.ps1 b/source/Private/Get-CISExoOutput.ps1
index b636804..b734fab 100644
--- a/source/Private/Get-CISExoOutput.ps1
+++ b/source/Private/Get-CISExoOutput.ps1
@@ -52,7 +52,7 @@ function Get-CISExoOutput {
                 # Test-BlockSharedMailboxSignIn.ps1
                 $MBX = Get-EXOMailbox -RecipientTypeDetails SharedMailbox
                 # [object[]]
-                # $MBX example output:
+                # $MBX mock object:
                 <#
                     $MBX = @(
                         [PSCustomObject]@{
@@ -88,7 +88,7 @@ function Get-CISExoOutput {
                 return $sharingPolicies
             }
             '1.3.3b' {
-                $mailboxes = Get-Mailbox -ResultSize Unlimited
+                # $mailboxes Mock Object
                 <#
                     $mailboxes = @(
                         [PSCustomObject]@{
@@ -114,6 +114,7 @@ function Get-CISExoOutput {
                         }
                     )
                 #>
+                $mailboxes = Get-Mailbox -ResultSize Unlimited
                 $results = foreach ($mailbox in $mailboxes) {
                     # Get the name of the default calendar folder (depends on the mailbox's language)
                     # Return single string Ex: return "Calendar" x 3 in array
@@ -143,6 +144,13 @@ function Get-CISExoOutput {
             '1.3.6' {
                 # Test-CustomerLockbox.ps1
                 # Step: Retrieve the organization configuration (Condition C: Pass/Fail)
+                # $orgConfig Mock Object:
+                <#
+                    # return $orgConfig
+                    $orgConfig = [PSCustomObject]@{
+                        CustomerLockBoxEnabled = $true
+                    }
+                #>
                 $orgConfig = Get-OrganizationConfig | Select-Object CustomerLockBoxEnabled
                 $customerLockboxEnabled = $orgConfig.CustomerLockBoxEnabled
                 # [bool]
diff --git a/source/tests/Test-CustomerLockbox.ps1 b/source/tests/Test-CustomerLockbox.ps1
index 9a003d9..d71cf5e 100644
--- a/source/tests/Test-CustomerLockbox.ps1
+++ b/source/tests/Test-CustomerLockbox.ps1
@@ -12,7 +12,7 @@ function Test-CustomerLockbox {
 
         # Initialization code, if needed
         $recnum = "1.3.6"
-
+        Write-Verbose "Running Test-CustomerLockbox for $recnum..."
         # Conditions for 1.3.6 (L2) Ensure the customer lockbox feature is enabled (Automated)
         #
         # Validate test for a pass:
@@ -33,8 +33,9 @@ function Test-CustomerLockbox {
     process {
         try {
             # Step: Retrieve the organization configuration (Condition C: Pass/Fail)
+            # $customerLockboxEnabled Mock Object
+            # $customerLockboxEnabled = $true
             $customerLockboxEnabled = Get-CISExoOutput -Rec $recnum
-
             # Step: Prepare failure reasons and details based on compliance (Condition A, B, & C: Fail)
             $failureReasons = if (-not $customerLockboxEnabled) {
                 "Customer lockbox feature is not enabled."

From 5ebb2a6e7d554f28c11805907ef4efa0901cc308 Mon Sep 17 00:00:00 2001
From: DrIOS <58635327+DrIOSX@users.noreply.github.com>
Date: Fri, 28 Jun 2024 19:38:26 -0500
Subject: [PATCH 07/24] fix: 1.3.3 simplified output and added object comment

---
 source/tests/Test-ExternalSharingCalendars.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/tests/Test-ExternalSharingCalendars.ps1 b/source/tests/Test-ExternalSharingCalendars.ps1
index 3ac3ecf..9cf01d9 100644
--- a/source/tests/Test-ExternalSharingCalendars.ps1
+++ b/source/tests/Test-ExternalSharingCalendars.ps1
@@ -12,7 +12,7 @@ function Test-ExternalSharingCalendars {
 
         # Initialization code, if needed
         $recnum = "1.3.3"
-        Write-Verbose "Running Test-ExternalSharingCalendars Rec#: $recnum"
+        Write-Verbose "Running Test-ExternalSharingCalendars for $recnum..."
         # Conditions for 1.3.3 (L2) Ensure 'External sharing' of calendars is not available (Automated)
         #
         # Validate test for a pass:

From 712077b8f11c815c97558d56a584a4cbf0dab7db Mon Sep 17 00:00:00 2001
From: DrIOS <58635327+DrIOSX@users.noreply.github.com>
Date: Fri, 28 Jun 2024 19:38:50 -0500
Subject: [PATCH 08/24] fix: 2.1.1 simplified output and added object comment

---
 source/Private/Get-CISExoOutput.ps1       | 31 ++++++++++++++++++++++-
 source/tests/Test-SafeLinksOfficeApps.ps1 |  4 +--
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/source/Private/Get-CISExoOutput.ps1 b/source/Private/Get-CISExoOutput.ps1
index b734fab..d3d34cc 100644
--- a/source/Private/Get-CISExoOutput.ps1
+++ b/source/Private/Get-CISExoOutput.ps1
@@ -161,12 +161,41 @@ function Get-CISExoOutput {
                 if (Get-Command Get-SafeLinksPolicy -ErrorAction SilentlyContinue) {
                     # 2.1.1 (L2) Ensure Safe Links for Office Applications is Enabled
                     # Retrieve all Safe Links policies
+                    # $policies Mock Object:
+                    <#
+                        $policies = @(
+                            [PSCustomObject]@{
+                                Name = "PolicyOne"
+                                EnableSafeLinksForEmail = $true
+                                EnableSafeLinksForTeams = $true
+                                EnableSafeLinksForOffice = $true
+                                TrackClicks = $true
+                                AllowClickThrough = $false
+                            },
+                            [PSCustomObject]@{
+                                Name = "PolicyTwo"
+                                EnableSafeLinksForEmail = $true
+                                EnableSafeLinksForTeams = $true
+                                EnableSafeLinksForOffice = $true
+                                TrackClicks = $true
+                                AllowClickThrough = $true
+                            },
+                            [PSCustomObject]@{
+                                Name = "PolicyThree"
+                                EnableSafeLinksForEmail = $true
+                                EnableSafeLinksForTeams = $true
+                                EnableSafeLinksForOffice = $true
+                                TrackClicks = $true
+                                AllowClickThrough = $false
+                            }
+                        )
+                    #>
                     $policies = Get-SafeLinksPolicy
                     # Initialize the details collection
                     $misconfiguredDetails = @()
                     foreach ($policy in $policies) {
                         # Get the detailed configuration of each policy
-                        $policyDetails = Get-SafeLinksPolicy -Identity $policy.Name
+                        $policyDetails = $policy #Get-SafeLinksPolicy -Identity $policy.Name
                         # Check each required property and record failures
                         # Condition A: Checking policy settings
                         $failures = @()
diff --git a/source/tests/Test-SafeLinksOfficeApps.ps1 b/source/tests/Test-SafeLinksOfficeApps.ps1
index da66d07..154a28d 100644
--- a/source/tests/Test-SafeLinksOfficeApps.ps1
+++ b/source/tests/Test-SafeLinksOfficeApps.ps1
@@ -11,7 +11,7 @@ function Test-SafeLinksOfficeApps {
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
         $recnum = "2.1.1"
-
+        Write-Verbose "Running Test-SafeLinksOfficeApps for $recnum..."
         <#
         Conditions for 2.1.1 (L2) Ensure Safe Links for Office Applications is Enabled
 
@@ -49,7 +49,7 @@ function Test-SafeLinksOfficeApps {
                 # Prepare the final result
                 # Condition B: Ensuring no misconfigurations
                 $result = $misconfiguredDetails.Count -eq 0
-                $details = if ($result) { "All Safe Links policies are correctly configured." } else { $misconfiguredDetails -join ' | ' }
+                $details = if ($result) { "All Safe Links policies are correctly configured." } else { $misconfiguredDetails -join '`n' }
                 $failureReasons = if ($result) { "N/A" } else { "The following Safe Links policies settings do not meet the recommended configuration: $($misconfiguredDetails -join ' | ')" }
 
                 # Create and populate the CISAuditResult object

From 73c1ecf30e0476fd51d46fa94a67909bf236420d Mon Sep 17 00:00:00 2001
From: DrIOS <58635327+DrIOSX@users.noreply.github.com>
Date: Fri, 28 Jun 2024 19:43:11 -0500
Subject: [PATCH 09/24] fix: 2.1.2 simplified output and added object comment

---
 source/Private/Get-CISExoOutput.ps1          |  6 ++++
 source/tests/Test-CommonAttachmentFilter.ps1 | 38 +++++++++-----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/source/Private/Get-CISExoOutput.ps1 b/source/Private/Get-CISExoOutput.ps1
index d3d34cc..08cc4f4 100644
--- a/source/Private/Get-CISExoOutput.ps1
+++ b/source/Private/Get-CISExoOutput.ps1
@@ -222,6 +222,12 @@ function Get-CISExoOutput {
                 # Condition A: The Common Attachment Types Filter is enabled in the Microsoft 365 Security & Compliance Center.
                 # Condition B: Using Exchange Online PowerShell, verify that the `EnableFileFilter` property of the default malware filter policy is set to `True`.
                 # Retrieve the attachment filter policy
+                # $attachmentFilter Mock Object
+                <#
+                    $attachmentFilter = [PSCustomObject]@{
+                        EnableFileFilter = $true
+                    }
+                #>
                 $attachmentFilter = Get-MalwareFilterPolicy -Identity Default | Select-Object EnableFileFilter
                 $result = $attachmentFilter.EnableFileFilter
                 # [bool]
diff --git a/source/tests/Test-CommonAttachmentFilter.ps1 b/source/tests/Test-CommonAttachmentFilter.ps1
index 7c29bcd..7a77945 100644
--- a/source/tests/Test-CommonAttachmentFilter.ps1
+++ b/source/tests/Test-CommonAttachmentFilter.ps1
@@ -8,38 +8,35 @@ function Test-CommonAttachmentFilter {
 
     begin {
         <#
-        Conditions for 2.1.2 (L1) Ensure the Common Attachment Types Filter is enabled
-
-        Validate test for a pass:
-        - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
-        - Specific conditions to check:
-          - Condition A: The Common Attachment Types Filter is enabled in the Microsoft 365 Security & Compliance Center.
-          - Condition B: Using Exchange Online PowerShell, verify that the `EnableFileFilter` property of the default malware filter policy is set to `True`.
-          - Condition C: Ensure that the setting is enabled in the highest priority policy listed if custom policies exist.
-
-        Validate test for a fail:
-        - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
-        - Specific conditions to check:
-          - Condition A: The Common Attachment Types Filter is not enabled in the Microsoft 365 Security & Compliance Center.
-          - Condition B: Using Exchange Online PowerShell, verify that the `EnableFileFilter` property of the default malware filter policy is set to `False`.
-          - Condition C: Ensure that the setting is not enabled in the highest priority policy listed if custom policies exist.
+            Conditions for 2.1.2 (L1) Ensure the Common Attachment Types Filter is enabled
+            Validate test for a pass:
+            - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
+            - Specific conditions to check:
+                - Condition A: The Common Attachment Types Filter is enabled in the Microsoft 365 Security & Compliance Center.
+                - Condition B: Using Exchange Online PowerShell, verify that the `EnableFileFilter` property of the default malware filter policy is set to `True`.
+                - Condition C: Ensure that the setting is enabled in the highest priority policy listed if custom policies exist.
+            Validate test for a fail:
+            - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
+            - Specific conditions to check:
+                - Condition A: The Common Attachment Types Filter is not enabled in the Microsoft 365 Security & Compliance Center.
+                - Condition B: Using Exchange Online PowerShell, verify that the `EnableFileFilter` property of the default malware filter policy is set to `False`.
+                - Condition C: Ensure that the setting is not enabled in the highest priority policy listed if custom policies exist.
         #>
-
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
         $recnum = "2.1.2"
+        Write-Verbose "Running Test-CommonAttachmentFilter for $recnum..."
     }
-
     process {
         try {
             # 2.1.2 (L1) Ensure the Common Attachment Types Filter is enabled
             # Condition A: The Common Attachment Types Filter is enabled in the Microsoft 365 Security & Compliance Center.
             # Condition B: Using Exchange Online PowerShell, verify that the `EnableFileFilter` property of the default malware filter policy is set to `True`.
-
             # Retrieve the attachment filter policy
+            # $result Mock Object
+            # $result = $true
             $result = Get-CISExoOutput -Rec $recnum
-
             # Prepare failure reasons and details based on compliance
             $failureReasons = if (-not $result) {
                 # Condition A: The Common Attachment Types Filter is not enabled in the Microsoft 365 Security & Compliance Center.
@@ -49,14 +46,12 @@ function Test-CommonAttachmentFilter {
             else {
                 "N/A"
             }
-
             $details = if ($result) {
                 "File Filter Enabled: True"
             }
             else {
                 "File Filter Enabled: False"
             }
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -72,7 +67,6 @@ function Test-CommonAttachmentFilter {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult

From c05ba5aebdc0b9ca6b230419859e9157e869051a Mon Sep 17 00:00:00 2001
From: DrIOS <58635327+DrIOSX@users.noreply.github.com>
Date: Fri, 28 Jun 2024 19:51:01 -0500
Subject: [PATCH 10/24] fix: 2.1.3 simplified output and added object comment

---
 source/Private/Get-CISExoOutput.ps1         | 15 +++++++++++++++
 source/tests/Test-NotifyMalwareInternal.ps1 | 18 +++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/source/Private/Get-CISExoOutput.ps1 b/source/Private/Get-CISExoOutput.ps1
index 08cc4f4..0f981db 100644
--- a/source/Private/Get-CISExoOutput.ps1
+++ b/source/Private/Get-CISExoOutput.ps1
@@ -237,6 +237,21 @@ function Get-CISExoOutput {
                 # Test-NotifyMalwareInternal.ps1
                 # 2.1.3 Ensure notifications for internal users sending malware is Enabled
                 # Retrieve all 'Custom' malware filter policies and check notification settings
+                # $malwareNotifications Mock Object
+                <#
+                    $malwareNotifications = @(
+                        [PSCustomObject]@{
+                            Identity = "Default"
+                            EnableInternalSenderAdminNotifications = $true
+                            RecommendedPolicyType = "Custom"
+                        },
+                        [PSCustomObject]@{
+                            Identity = "Anti-malware-Policy"
+                            EnableInternalSenderAdminNotifications = $true
+                            RecommendedPolicyType = "Custom"
+                        }
+                    )
+                #>
                 $malwareNotifications = Get-MalwareFilterPolicy | Where-Object { $_.RecommendedPolicyType -eq 'Custom' }
                 # [object[]]
                 return $malwareNotifications
diff --git a/source/tests/Test-NotifyMalwareInternal.ps1 b/source/tests/Test-NotifyMalwareInternal.ps1
index b87c381..380bcf5 100644
--- a/source/tests/Test-NotifyMalwareInternal.ps1
+++ b/source/tests/Test-NotifyMalwareInternal.ps1
@@ -27,6 +27,7 @@ function Test-NotifyMalwareInternal {
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
         $recnum = "2.1.3"
+        Write-Verbose "Running Test-NotifyMalwareInternal for $recnum..."
     }
 
     process {
@@ -34,6 +35,21 @@ function Test-NotifyMalwareInternal {
             # 2.1.3 Ensure notifications for internal users sending malware is Enabled
 
             # Retrieve all 'Custom' malware filter policies and check notification settings
+            # $malwareNotifications Mock Object
+            <#
+                $malwareNotifications = @(
+                    [PSCustomObject]@{
+                        Identity = "Default"
+                        EnableInternalSenderAdminNotifications = $true
+                        RecommendedPolicyType = "Custom"
+                    },
+                    [PSCustomObject]@{
+                        Identity = "Anti-malware-Policy"
+                        EnableInternalSenderAdminNotifications = $true
+                        RecommendedPolicyType = "Custom"
+                    }
+                )
+            #>
             $malwareNotifications = Get-CISExoOutput -Rec $recnum
 
             # Condition B: Using PowerShell, the `NotifyInternal` property in the anti-malware policy is set to `True` and includes at least one valid email address for notifications.
@@ -60,7 +76,7 @@ function Test-NotifyMalwareInternal {
                 "All custom malware policies have notifications enabled."
             }
             else {
-                "Misconfigured Policies: $($policiesToReport -join ', ')"
+                "Misconfigured Policies: $($policiesToReport -join '`n')"
             }
 
             # Create and populate the CISAuditResult object

From 37b6557221c8b1c98453f0b0480ffae5448750bc Mon Sep 17 00:00:00 2001
From: DrIOS <58635327+DrIOSX@users.noreply.github.com>
Date: Fri, 28 Jun 2024 20:53:50 -0500
Subject: [PATCH 11/24] fix: 2.1.4 simplified output and added object comment

---
 source/Private/Get-CISExoOutput.ps1         |  12 +++
 source/tests/Test-SafeAttachmentsPolicy.ps1 | 100 +++++++++-----------
 2 files changed, 57 insertions(+), 55 deletions(-)

diff --git a/source/Private/Get-CISExoOutput.ps1 b/source/Private/Get-CISExoOutput.ps1
index 0f981db..bc0de27 100644
--- a/source/Private/Get-CISExoOutput.ps1
+++ b/source/Private/Get-CISExoOutput.ps1
@@ -261,6 +261,18 @@ function Get-CISExoOutput {
                 if (Get-Command Get-SafeAttachmentPolicy -ErrorAction SilentlyContinue) {
                     # Retrieve all Safe Attachment policies where Enable is set to True
                     # Check if ErrorAction needed below
+                    # $safeAttachmentPolicies Mock Object:
+                    <#
+                        $safeAttachmentPolicies = @(
+                            [PSCustomObject]@{
+                                Policy        = "Strict Preset Security Policy"
+                                Action        = "Block"
+                                QuarantineTag = "AdminOnlyAccessPolicy"
+                                Redirect      = $false
+                                Enabled       = $true
+                            }
+                        )
+                    #>
                     $safeAttachmentPolicies = Get-SafeAttachmentPolicy -ErrorAction SilentlyContinue | Where-Object { $_.Enable -eq $true }
                     # [object[]]
                     return $safeAttachmentPolicies
diff --git a/source/tests/Test-SafeAttachmentsPolicy.ps1 b/source/tests/Test-SafeAttachmentsPolicy.ps1
index 6011aa8..2065728 100644
--- a/source/tests/Test-SafeAttachmentsPolicy.ps1
+++ b/source/tests/Test-SafeAttachmentsPolicy.ps1
@@ -5,73 +5,67 @@ function Test-SafeAttachmentsPolicy {
 
     begin {
         $recnum = "2.1.4"
-
+        Write-Verbose "Running Test-SafeAttachmentsPolicy for $recnum..."
         <#
-        Conditions for 2.1.4 (L2) Ensure Safe Attachments policy is enabled
+            Conditions for 2.1.4 (L2) Ensure Safe Attachments policy is enabled:
+            Validate test for a pass:
+                - Ensure the highest priority Safe Attachments policy is enabled.
+                - Check if the policy's action is set to 'Block'.
+                - Confirm the QuarantineTag is set to 'AdminOnlyAccessPolicy'.
+                - Verify that the Redirect setting is disabled.
 
-        Validate test for a pass:
-        - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
-        - Specific conditions to check:
-          - Condition A: The Safe Attachments policy is enabled in the Microsoft 365 Defender portal.
-          - Condition B: The policy covers all recipients within the organization.
-          - Condition C: The policy action is set to "Dynamic Delivery" or "Quarantine".
-          - Condition D: The policy is not disabled.
-
-        Validate test for a fail:
-        - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
-        - Specific conditions to check:
-          - Condition A: The Safe Attachments policy is not enabled in the Microsoft 365 Defender portal.
-          - Condition B: The policy does not cover all recipients within the organization.
-          - Condition C: The policy action is not set to "Dynamic Delivery" or "Quarantine".
-          - Condition D: The policy is disabled.
+            Validate test for a fail:
+                - If the highest priority Safe Attachments policy's action is not set to 'Block'.
+                - If the QuarantineTag is not set to 'AdminOnlyAccessPolicy'.
+                - If the Redirect setting is enabled.
+                - If no enabled Safe Attachments policies are found.
         #>
     }
-
     process {
+        # 2.1.4 (L2) Ensure Safe Attachments policy is enabled
+        # $safeAttachmentPolicies Mock Object
+        <#
+            $safeAttachmentPolicies = @(
+                [PSCustomObject]@{
+                    Policy        = "Strict Preset Security Policy"
+                    Action        = "Block"
+                    QuarantineTag = "AdminOnlyAccessPolicy"
+                    Redirect      = $false
+                    Enabled       = $true
+                }
+            )
+        #>
         $safeAttachmentPolicies = Get-CISExoOutput -Rec $recnum
         if ($safeAttachmentPolicies -ne 1) {
             try {
-                # Check if any Safe Attachments policy is enabled (Condition A)
-                $result = $null -ne $safeAttachmentPolicies -and $safeAttachmentPolicies.Count -gt 0
-
+                $highestPriorityPolicy = $safeAttachmentPolicies | Select-Object -First 1
                 # Initialize details and failure reasons
                 $details = @()
                 $failureReasons = @()
-
-                foreach ($policy in $safeAttachmentPolicies) {
-                    # Initialize policy detail and failed status
-                    $failed = $false
-
-                    # Check if the policy action is set to "Dynamic Delivery" or "Quarantine" (Condition C)
-                    if ($policy.Action -notin @("DynamicDelivery", "Quarantine")) {
-                        $failureReasons += "Policy '$($policy.Name)' action is not set to 'Dynamic Delivery' or 'Quarantine'."
-                        $failed = $true
-                    }
-
-                    # Check if the policy is not disabled (Condition D)
-                    if (-not $policy.Enable) {
-                        $failureReasons += "Policy '$($policy.Name)' is disabled."
-                        $failed = $true
-                    }
-
-                    # Add policy details to the details array
-                    $details += [PSCustomObject]@{
-                        Policy  = $policy.Name
-                        Enabled = $policy.Enable
-                        Action  = $policy.Action
-                        Failed  = $failed
-                    }
+                # Check policy specifics as per CIS benchmark requirements
+                if ($highestPriorityPolicy.Action -ne 'Block') {
+                    $failureReasons += "Policy action is not set to 'Block'."
+                }
+                if ($highestPriorityPolicy.QuarantineTag -ne 'AdminOnlyAccessPolicy') {
+                    $failureReasons += "Quarantine policy is not set to 'AdminOnlyAccessPolicy'."
+                }
+                if ($highestPriorityPolicy.Redirect -ne $false) {
+                    $failureReasons += "Redirect is not disabled."
                 }
-
                 # The result is a pass if there are no failure reasons
                 $result = $failureReasons.Count -eq 0
-
+                $details = [PSCustomObject]@{
+                    Policy          = $highestPriorityPolicy.Identity
+                    Action          = $highestPriorityPolicy.Action
+                    QuarantineTag   = $highestPriorityPolicy.QuarantineTag
+                    Redirect        = $highestPriorityPolicy.Redirect
+                    Enabled         = $highestPriorityPolicy.Enable
+                }
                 # Format details for output manually
-                $detailsString = "Policy|Enabled|Action|Failed`n" + ($details |
-                    ForEach-Object {"$($_.Policy)|$($_.Enabled)|$($_.Action)|$($_.Failed)`n"}
+                $detailsString = "Policy|Action|QuarantineTag|Redirect|Enabled`n" + ($details |
+                    ForEach-Object { "$($_.Policy)|$($_.Action)|$($_.QuarantineTag)|$($_.Redirect)|$($_.Enabled)`n" }
                 )
-                $failureReasonsString = ($failureReasons | ForEach-Object { $_ }) -join ' '
-
+                $failureReasonsString = ($failureReasons -join "`n")
                 # Create and populate the CISAuditResult object
                 $params = @{
                     Rec           = $recnum
@@ -84,13 +78,10 @@ function Test-SafeAttachmentsPolicy {
             }
             catch {
                 Write-Error "An error occurred during the test: $_"
-
                 # Retrieve the description from the test definitions
                 $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
                 $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
                 $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
                 # Call Initialize-CISAuditResult with error parameters
                 $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
             }
@@ -106,7 +97,6 @@ function Test-SafeAttachmentsPolicy {
             $auditResult = Initialize-CISAuditResult @params
         }
     }
-
     end {
         # Return the audit result
         return $auditResult

From 2466692e352a430a34c90463547f7fddc544df1d Mon Sep 17 00:00:00 2001
From: DrIOS <58635327+DrIOSX@users.noreply.github.com>
Date: Fri, 28 Jun 2024 21:19:03 -0500
Subject: [PATCH 12/24] fix: 2.1.5 simplified output and added object comment

---
 source/Private/Get-CISExoOutput.ps1        | 11 ++++++
 source/tests/Test-SafeAttachmentsTeams.ps1 | 41 ++++++++++++++++------
 2 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/source/Private/Get-CISExoOutput.ps1 b/source/Private/Get-CISExoOutput.ps1
index bc0de27..9d83b5c 100644
--- a/source/Private/Get-CISExoOutput.ps1
+++ b/source/Private/Get-CISExoOutput.ps1
@@ -288,6 +288,17 @@ function Get-CISExoOutput {
                     # Retrieve the ATP policies for Office 365 and check Safe Attachments settings
                     $atpPolicies = Get-AtpPolicyForO365
                     # Check if the required ATP policies are enabled
+                    # $atpPolicyResult Mock Object:
+                    <#
+                        $atpPolicyResult = @(
+                            [PSCustomObject]@{
+                                Name                   = "Default"
+                                EnableATPForSPOTeamsODB = $true
+                                EnableSafeDocs         = $true
+                                AllowSafeDocsOpen      = $false
+                            }
+                        )
+                    #>
                     $atpPolicyResult = $atpPolicies | Where-Object {
                         $_.EnableATPForSPOTeamsODB -eq $true -and
                         $_.EnableSafeDocs -eq $true -and
diff --git a/source/tests/Test-SafeAttachmentsTeams.ps1 b/source/tests/Test-SafeAttachmentsTeams.ps1
index 5ae5f14..d274411 100644
--- a/source/tests/Test-SafeAttachmentsTeams.ps1
+++ b/source/tests/Test-SafeAttachmentsTeams.ps1
@@ -5,7 +5,6 @@ function Test-SafeAttachmentsTeams {
         # Aligned
         # Parameters can be added if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
@@ -28,32 +27,58 @@ function Test-SafeAttachmentsTeams {
 
         # Initialization code, if needed
         $recnum = "2.1.5"
+        Write-Verbose "Running Test-SafeAttachmentsTeams for $recnum..."
     }
-
     process {
+        # $atpPolicyResult Mock Object
+        <#
+            $atpPolicyResult = @(
+                [PSCustomObject]@{
+                    Name                   = "Default"
+                    EnableATPForSPOTeamsODB = $true
+                    EnableSafeDocs         = $true
+                    AllowSafeDocsOpen      = $false
+                }
+            )
+        #>
         $atpPolicyResult = Get-CISExoOutput -Rec $recnum
         if ($atpPolicyResult -ne 1) {
             try {
                 # Condition A: Check Safe Attachments for SharePoint
                 # Condition B: Check Safe Attachments for OneDrive
                 # Condition C: Check Safe Attachments for Microsoft Teams
-
                 # Determine the result based on the ATP policy settings
                 $result = $null -ne $atpPolicyResult
+                $atpPolicyResult | Where-Object { $_.Identity -eq "Default" }
+                if ($result) {
+                    $detailpass = [PSCustomObject]@{
+                        Name                    = $atpPolicyResult.Name
+                        EnableATPForSPOTeamsODB = $atpPolicyResult.EnableATPForSPOTeamsODB
+                        EnableSafeDocs          = $atpPolicyResult.EnableSafeDocs
+                        AllowSafeDocsOpen       = $atpPolicyResult.AllowSafeDocsOpen
+                    }
+                    $detailsString = $detailpass | ForEach-Object {
+                        @"
+Name: $($_.Name)
+EnableATPForSPOTeamsODB: $($_.EnableATPForSPOTeamsODB)
+EnableSafeDocs: $($_.EnableSafeDocs)
+AllowSafeDocsOpen: $($_.AllowSafeDocsOpen)
+`n
+"@
+                    }
+                }
                 $details = if ($result) {
-                    "ATP for SharePoint, OneDrive, and Teams is enabled with correct settings."
+                    $detailsString
                 }
                 else {
                     "ATP for SharePoint, OneDrive, and Teams is not enabled with correct settings."
                 }
-
                 $failureReasons = if ($result) {
                     "N/A"
                 }
                 else {
                     "ATP policy for SharePoint, OneDrive, and Microsoft Teams is not correctly configured."
                 }
-
                 # Create and populate the CISAuditResult object
                 $params = @{
                     Rec           = $recnum
@@ -66,13 +91,10 @@ function Test-SafeAttachmentsTeams {
             }
             catch {
                 Write-Error "An error occurred during the test: $_"
-
                 # Retrieve the description from the test definitions
                 $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
                 $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
                 $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
                 # Call Initialize-CISAuditResult with error parameters
                 $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
             }
@@ -88,7 +110,6 @@ function Test-SafeAttachmentsTeams {
             $auditResult = Initialize-CISAuditResult @params
         }
     }
-
     end {
         # Return the audit result
         return $auditResult

From 3ecc8f4466dfe212228fc900c9375b6d87bcfbb5 Mon Sep 17 00:00:00 2001
From: DrIOS <58635327+DrIOSX@users.noreply.github.com>
Date: Fri, 28 Jun 2024 21:42:48 -0500
Subject: [PATCH 13/24] fix: 2.1.5 simplified output and added object comment

---
 source/tests/Test-SafeAttachmentsTeams.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/tests/Test-SafeAttachmentsTeams.ps1 b/source/tests/Test-SafeAttachmentsTeams.ps1
index d274411..c850c7e 100644
--- a/source/tests/Test-SafeAttachmentsTeams.ps1
+++ b/source/tests/Test-SafeAttachmentsTeams.ps1
@@ -49,7 +49,7 @@ function Test-SafeAttachmentsTeams {
                 # Condition C: Check Safe Attachments for Microsoft Teams
                 # Determine the result based on the ATP policy settings
                 $result = $null -ne $atpPolicyResult
-                $atpPolicyResult | Where-Object { $_.Identity -eq "Default" }
+                #$atpPolicyResult | Where-Object { $_.Identity -eq "Default" }
                 if ($result) {
                     $detailpass = [PSCustomObject]@{
                         Name                    = $atpPolicyResult.Name

From ad6ec465c836c81ce0130d6a9dc3c4bf48bf832d Mon Sep 17 00:00:00 2001
From: DrIOS <58635327+DrIOSX@users.noreply.github.com>
Date: Sat, 29 Jun 2024 11:01:40 -0500
Subject: [PATCH 14/24] fix: 2.1.6 simplified output and added object comment

---
 source/Private/Get-CISExoOutput.ps1         |  36 ++++-
 source/tests/Test-SpamPolicyAdminNotify.ps1 | 146 +++++++++++++-------
 2 files changed, 127 insertions(+), 55 deletions(-)

diff --git a/source/Private/Get-CISExoOutput.ps1 b/source/Private/Get-CISExoOutput.ps1
index 9d83b5c..da7a5e3 100644
--- a/source/Private/Get-CISExoOutput.ps1
+++ b/source/Private/Get-CISExoOutput.ps1
@@ -313,9 +313,39 @@ function Get-CISExoOutput {
             }
             '2.1.6' {
                 # Test-SpamPolicyAdminNotify.ps1
-                # Retrieve the default hosted outbound spam filter policy
-                $hostedOutboundSpamFilterPolicy = Get-HostedOutboundSpamFilterPolicy | Where-Object { $_.IsDefault -eq $true }
-                return $hostedOutboundSpamFilterPolicy
+                # Retrieve the hosted outbound spam filter policies
+                # $spamPolicies Mock Object:
+                <#
+                    # Mock data representing multiple spam filter policies
+                    $spamPolicies = @(
+                        [PSCustomObject]@{
+                            Name                                       = "Default"
+                            IsDefault                                  = $true
+                            NotifyOutboundSpam                         = $true
+                            BccSuspiciousOutboundMail                  = $true
+                            NotifyOutboundSpamRecipients               = "admin@example.com"
+                            BccSuspiciousOutboundAdditionalRecipients  = "bccadmin@example.com"
+                        },
+                        [PSCustomObject]@{
+                            Name                                       = "Custom Policy 1"
+                            IsDefault                                  = $false
+                            NotifyOutboundSpam                         = $false
+                            BccSuspiciousOutboundMail                  = $true
+                            NotifyOutboundSpamRecipients               = ""
+                            BccSuspiciousOutboundAdditionalRecipients  = ""
+                        },
+                        [PSCustomObject]@{
+                            Name                                       = "Custom Policy 2"
+                            IsDefault                                  = $false
+                            NotifyOutboundSpam                         = $true
+                            BccSuspiciousOutboundMail                  = $false
+                            NotifyOutboundSpamRecipients               = "notify@example.com"
+                            BccSuspiciousOutboundAdditionalRecipients  = "bccnotify@example.com"
+                        }
+                    )
+                #>
+                $spamPolicies = Get-HostedOutboundSpamFilterPolicy
+                return $spamPolicies
             }
             '2.1.7' {
                 # Test-AntiPhishingPolicy.ps1
diff --git a/source/tests/Test-SpamPolicyAdminNotify.ps1 b/source/tests/Test-SpamPolicyAdminNotify.ps1
index a574612..5f39b31 100644
--- a/source/tests/Test-SpamPolicyAdminNotify.ps1
+++ b/source/tests/Test-SpamPolicyAdminNotify.ps1
@@ -1,78 +1,120 @@
 function Test-SpamPolicyAdminNotify {
     [CmdletBinding()]
     [OutputType([CISAuditResult])]
-    param (
-        # Aligned
-        # Parameters can be added if needed
-    )
+    param ()
 
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
-
-        $recnum = "2.1.6"
-
         <#
-        Conditions for 2.1.6 (L1) Ensure Exchange Online Spam Policies are set to notify administrators
-
-        Validate recommendation details:
-        - Confirm that the recommendation details are accurate and complete as per the CIS benchmark.
-
-        Validate test for a pass:
-        - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
-        - Specific conditions to check:
-          - Condition A: In the Microsoft 365 Security & Compliance Center, the Exchange Online Spam Policies are set to notify administrators when a sender in the organization has been blocked for sending spam emails.
-          - Condition B: Using PowerShell, the `NotifyOutboundSpam` and `NotifyOutboundSpamContact` properties are correctly set in all relevant spam filter policies.
-
-        Validate test for a fail:
-        - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
-        - Specific conditions to check:
-          - Condition A: In the Microsoft 365 Security & Compliance Center, the Exchange Online Spam Policies are not set to notify administrators when a sender in the organization has been blocked for sending spam emails.
-          - Condition B: Using PowerShell, the `NotifyOutboundSpam` and `NotifyOutboundSpamContact` properties are not correctly set in all relevant spam filter policies.
+            Conditions for 2.1.6 (L1) Ensure Exchange Online Spam Policies are set to notify administrators:
+            Description:
+                - This test ensures that Exchange Online Spam Policies are configured to notify administrators when a sender in the organization has been blocked for sending spam. It checks for the proper setup of both Bcc and Notify properties and the inclusion of valid email addresses.
+            Validate test for a pass:
+                - Checks that the 'BccSuspiciousOutboundMail' and 'NotifyOutboundSpam' properties are enabled for the default policy.
+                - Ensures that valid email addresses are provided for 'NotifyOutboundSpamRecipients' and 'BccSuspiciousOutboundAdditionalRecipients'.
+            Validate test for a fail:
+            - If the default policy is not found, this is flagged as a critical compliance issue.
+            - The test fails if any of the following settings are incorrect:
+                - 'BccSuspiciousOutboundMail' is not enabled.
+                - 'NotifyOutboundSpam' is not enabled.
+                - 'NotifyOutboundSpamRecipients' does not contain at least one valid email address.
+                - 'BccSuspiciousOutboundAdditionalRecipients' does not contain at least one valid email address.
+            Note:
+            - While the primary focus is on the default policy, the function also retrieves and displays settings from additional policies that are not default, providing comprehensive insight into the organization's configuration. These additional policies are not used to determine the test's pass/fail status but are included in the details for informational purposes.
         #>
+        $recnum = "2.1.6"
+        Write-Verbose "Running Test-SpamPolicyAdminNotify for $recnum..."
     }
-
     process {
         try {
-            # 2.1.6 Ensure Exchange Online Spam Policies are set to notify administrators
-
-            # Retrieve the default hosted outbound spam filter policy
-            $hostedOutboundSpamFilterPolicy = Get-CISExoOutput -Rec $recnum
-
-            # Check if both settings are enabled (Condition A and Condition B for pass)
-            $bccSuspiciousOutboundMailEnabled = $hostedOutboundSpamFilterPolicy.BccSuspiciousOutboundMail
-            $notifyOutboundSpamEnabled = $hostedOutboundSpamFilterPolicy.NotifyOutboundSpam
-            $areSettingsEnabled = $bccSuspiciousOutboundMailEnabled -and $notifyOutboundSpamEnabled
-
-            # Prepare failure details if any setting is not enabled (Condition A and Condition B for fail)
-            $failureDetails = @()
-            if (-not $bccSuspiciousOutboundMailEnabled) {
-                $failureDetails += "BccSuspiciousOutboundMail is not enabled."
+            # Mock data representing multiple spam filter policies
+            <#
+                $spamPolicies = @(
+                    [PSCustomObject]@{
+                        Name                                       = "Default"
+                        IsDefault                                  = $true
+                        NotifyOutboundSpam                         = $false
+                        BccSuspiciousOutboundMail                  = $true
+                        NotifyOutboundSpamRecipients               = "admin@example.com"
+                        BccSuspiciousOutboundAdditionalRecipients  = "bccadmin@example.com"
+                    },
+                    [PSCustomObject]@{
+                        Name                                       = "Custom Policy 1"
+                        IsDefault                                  = $false
+                        NotifyOutboundSpam                         = $false
+                        BccSuspiciousOutboundMail                  = $true
+                        NotifyOutboundSpamRecipients               = ""
+                        BccSuspiciousOutboundAdditionalRecipients  = ""
+                    },
+                    [PSCustomObject]@{
+                        Name                                       = "Custom Policy 2"
+                        IsDefault                                  = $false
+                        NotifyOutboundSpam                         = $true
+                        BccSuspiciousOutboundMail                  = $false
+                        NotifyOutboundSpamRecipients               = "notify@example.com"
+                        BccSuspiciousOutboundAdditionalRecipients  = "bccnotify@example.com"
+                    }
+                )
+            #>
+            $spamPolicies = Get-CISExoOutput -Rec $recnum
+            $defaultPolicy = $spamPolicies | Where-Object { $_.IsDefault -eq $true }
+            $additionalPolicies = $spamPolicies | Where-Object { $_.IsDefault -eq $false }
+            $details = @()
+            $failureReasons = @()
+            # Check the default policy settings and format details
+            # Build the details string for the default policy
+            if ($defaultPolicy) {
+                $details += "Default Policy: $($defaultPolicy.Name)`n`n" +
+                "Bcc Suspicious Outbound Mail: $($defaultPolicy.BccSuspiciousOutboundMail)`n" +
+                "Notify Outbound Spam: $($defaultPolicy.NotifyOutboundSpam)`n" +
+                "Notify Emails: $($defaultPolicy.NotifyOutboundSpamRecipients -join ', ')`n" +
+                "Bcc Emails: $($defaultPolicy.BccSuspiciousOutboundAdditionalRecipients -join ', ')"
+                if (-not $defaultPolicy.BccSuspiciousOutboundMail) {
+                    $failureReasons += "BccSuspiciousOutboundMail should be enabled."
+                }
+                if (-not $defaultPolicy.NotifyOutboundSpam) {
+                    $failureReasons += "NotifyOutboundSpam should be enabled."
+                }
+                if (-not $defaultPolicy.NotifyOutboundSpamRecipients) {
+                    $failureReasons += "NotifyOutboundSpamRecipients should have at least one valid email."
+                }
+                if (-not $defaultPolicy.BccSuspiciousOutboundAdditionalRecipients) {
+                    $failureReasons += "BccSuspiciousOutboundAdditionalRecipients should have at least one valid email."
+                }
             }
-            if (-not $notifyOutboundSpamEnabled) {
-                $failureDetails += "NotifyOutboundSpam is not enabled."
+            else {
+                $failureReasons += "No default policy found. This is critical for compliance."
             }
-
-            # Create an instance of CISAuditResult and populate it
+            # Format additional policy details
+            foreach ($policy in $additionalPolicies) {
+                $details += "`n`nAdditional Policy: $($policy.Name)`n`n" +
+                "Bcc Suspicious Outbound Mail: $($policy.BccSuspiciousOutboundMail)`n" +
+                "Notify Outbound Spam: $($policy.NotifyOutboundSpam)`n" +
+                "Notify Emails: $($policy.NotifyOutboundSpamRecipients -join ', ')`n" +
+                "Bcc Emails: $($policy.BccSuspiciousOutboundAdditionalRecipients -join ', ')"
+            }
+            $result = $failureReasons.Count -eq 0
+            $detailsString = $details -join "`n"
+            $failureReasonsString = $failureReasons -join "`n"
+            # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
-                Result        = $areSettingsEnabled
-                Status        = if ($areSettingsEnabled) { "Pass" } else { "Fail" }
-                Details       = if ($areSettingsEnabled) { "Both BccSuspiciousOutboundMail and NotifyOutboundSpam are enabled." } else { $failureDetails -join ' ' }
-                FailureReason = if (-not $areSettingsEnabled) { "One or both spam policies are not set to notify administrators." } else { "N/A" }
+                Result        = $result
+                Status        = if ($result) { "Pass" } else { "Fail" }
+                Details       = $detailsString
+                FailureReason = if (-not $result) { $failureReasonsString } else { "All settings are correct based on the default policy." }
             }
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            $LastError = $_
-            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
+            Write-Error "An error occurred during the test: $_"
+            $auditResult = Get-TestError -LastError $_ -recnum $recnum
         }
     }
-
     end {
-        # Return auditResult
+        # Return the audit result
         return $auditResult
     }
-}
-
+}
\ No newline at end of file

From db38fe827e5184d62dad3deae034ba9589e22b9d Mon Sep 17 00:00:00 2001
From: DrIOS <58635327+DrIOSX@users.noreply.github.com>
Date: Sat, 29 Jun 2024 15:24:54 -0500
Subject: [PATCH 15/24] fix: 2.1.7 simplified output and added object
 comment-mid

---
 source/tests/Test-AntiPhishingPolicy.ps1 | 293 +++++++++++++++++------
 1 file changed, 224 insertions(+), 69 deletions(-)

diff --git a/source/tests/Test-AntiPhishingPolicy.ps1 b/source/tests/Test-AntiPhishingPolicy.ps1
index f2027ca..522aa69 100644
--- a/source/tests/Test-AntiPhishingPolicy.ps1
+++ b/source/tests/Test-AntiPhishingPolicy.ps1
@@ -1,104 +1,259 @@
+
+function Is-PolicyCompliant {
+    param ($policy)
+    return ($policy.Enabled -eq $true -and
+        $policy.PhishThresholdLevel -ge 2 -and
+        $policy.EnableMailboxIntelligenceProtection -eq $true -and
+        $policy.EnableMailboxIntelligence -eq $true -and
+        $policy.EnableSpoofIntelligence -eq $true)
+}
+
+function Get-PolicyDetails {
+    param (
+        [Parameter(Mandatory = $true)]
+        [pscustomobject]$policy,
+
+        [Parameter(Mandatory = $true)]
+        [bool]$isCompliant
+    )
+
+    return "Policy: $($policy.Identity)`n" +
+    "Enabled: $($policy.Enabled)`n" +
+    "PhishThresholdLevel: $($policy.PhishThresholdLevel)`n" +
+    "MailboxIntelligenceProtection: $($policy.EnableMailboxIntelligenceProtection)`n" +
+    "MailboxIntelligence: $($policy.EnableMailboxIntelligence)`n" +
+    "SpoofIntelligence: $($policy.EnableSpoofIntelligence)`n" +
+    "TargetedUsersToProtect: $($policy.TargetedUsersToProtect -join ', ')`n" +
+    "IsCompliant: $isCompliant"
+}
+
 function Test-AntiPhishingPolicy {
     [CmdletBinding()]
     [OutputType([CISAuditResult])]
-    param (
-        # Aligned
-        # Parameters can be added if needed
-    )
+    param ()
 
     begin {
-        # Dot source the class script if necessary
-        #. .\source\Classes\CISAuditResult.ps1
-        # Initialization code, if needed
-        #$auditResults = @()
         $recnum = "2.1.7"
-
+        Write-Verbose "Running Test-AntiPhishingPolicy for $recnum..."
+        . .\source\Classes\CISAuditResult.ps1
         <#
-        Conditions for 2.1.7 (L1) Ensure that an anti-phishing policy has been created
-
+        Conditions for 2.1.7 (L1) Ensure robust anti-phishing policies are enforced
         Validate test for a pass:
         - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
-        - Specific conditions to check:
-          - Condition A: Verify that an anti-phishing policy exists in the Microsoft 365 Security Center.
-          - Condition B: Using PowerShell, ensure the anti-phishing policy is configured with appropriate settings such as enabling impersonation protection and spoof intelligence.
-
+        - Ensure the policies are checked in the following order of precedence: Strict, Standard, Custom, and Default.
+            - Specific conditions to check:
+                - Condition A: At least one policy (preferably Strict or Standard) should cover all users or be marked as default.
+                - Condition B: The policy must have enabled settings including PhishThresholdLevel at least 2, EnableMailboxIntelligenceProtection, EnableMailboxIntelligence, and EnableSpoofIntelligence.
         Validate test for a fail:
-        - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
-        - Specific conditions to check:
-          - Condition A: No anti-phishing policy exists in the Microsoft 365 Security Center.
-          - Condition B: Using PowerShell, the anti-phishing policy is not configured with the required settings.
+        - Identify any policy misconfigurations or absence of comprehensive coverage.
+            - Specific conditions to check:
+                - Condition A: No policy comprehensively covers all users or meets specified security criteria.
+                - Condition B: Critical security features like Spoof Intelligence or Mailbox Intelligence are disabled in the relevant policies.
         #>
     }
 
     process {
-
         try {
-            # Condition A: Ensure that an anti-phishing policy has been created
-            $antiPhishPolicies = Get-CISExoOutput -Rec $recnum
+            # Step 1: Retrieve all anti-phishing policies
+            $VerbosePreference = "Continue"
+            Write-Verbose "Retrieving all anti-phishing policies..."
+            #$antiPhishPolicies = Get-CISExoOutput -Rec $recnum
 
-            # Condition B: Verify the anti-phishing policy settings using PowerShell
-            $validatedPolicies = $antiPhishPolicies | Where-Object {
-                $_.Enabled -eq $true -and
-                $_.PhishThresholdLevel -ge 2 -and
-                $_.EnableMailboxIntelligenceProtection -eq $true -and
-                $_.EnableMailboxIntelligence -eq $true -and
-                $_.EnableSpoofIntelligence -eq $true
+            # Step 2: Initialize variables to track compliance and details
+            $compliantPolicy = $null
+            $details = @()
+            $failureReasons = @()
+            $hasFullCoveragePolicy = $false
+            $policiesEvaluated = @()
+            $PassedTests = @()
+            $FailedTests = @()
+
+            Write-Verbose "Evaluating each policy for compliance..."
+
+            # Separate policies based on type
+            $strictPolicy = $antiPhishPolicies | Where-Object { $_.Identity -match "Strict Preset Security Policy" }
+            $standardPolicy = $antiPhishPolicies | Where-Object { $_.Identity -match "Standard Preset Security Policy" }
+            $customPolicies = $antiPhishPolicies | Where-Object { -not ($_.Identity -match "Strict Preset Security Policy" -or $_.Identity -match "Standard Preset Security Policy" -or $_.IsDefault) }
+            $defaultPolicy = $antiPhishPolicies | Where-Object { $_.IsDefault }
+
+            # Step 3: Check for Strict Preset Security Policy
+            if ($null -ne $strictPolicy) {
+                Write-Verbose "Evaluating policy: $($strictPolicy.Identity)"
+                $policiesEvaluated += $strictPolicy.Identity
+                # Check if policy is compliant
+                $isCompliant = Is-PolicyCompliant -policy $strictPolicy
+                # Log failure reasons for non-compliant policies
+                if (-not $isCompliant) {
+                    $failureReasons += "Policy $($strictPolicy.Identity) does not meet compliance criteria."
+                    Write-Verbose "Policy $($strictPolicy.Identity) fails to meet one or more required conditions."
+                    $FailedTests += $strictPolicy.Identity
+                }
+                # Compile details of each policy using the new function
+                $details += Get-PolicyDetails -policy $strictPolicy -isCompliant $isCompliant
+                # Check if policy is Strict and covers all users
+                if ($isCompliant) {
+                    $PassedTests += $strictPolicy.Identity
+                    Write-Verbose "Policy $($strictPolicy.Identity) is compliant."
+                    $strictUsersToProtect = $strictPolicy.TargetedUsersToProtect
+                    if ($strictUsersToProtect.count -eq 0) {
+                        $hasFullCoveragePolicy = $true
+                        $compliantPolicy = $strictPolicy
+                        $details += "Is Full Coverage Policy: $hasFullCoveragePolicy`n`n"
+                        Write-Verbose "$($strictPolicy.Identity) is compliant and covers all users. Stopping further evaluation."
+                    }
+                    else {
+                        $details += "Is Full Coverage Policy: $($false)`n`n"
+                    }
+                }
             }
-
-            # Check if there is at least one policy that meets the requirements
-            $nonCompliantItems = $antiPhishPolicies | Where-Object {
-                $_.Enabled -ne $true -or
-                $_.PhishThresholdLevel -lt 2 -or
-                $_.EnableMailboxIntelligenceProtection -ne $true -or
-                $_.EnableMailboxIntelligence -ne $true -or
-                $_.EnableSpoofIntelligence -ne $true
+            # Step 4: Check for Standard Preset Security Policy if no full coverage from Strict
+            if ($null -ne $standardPolicy -and $hasFullCoveragePolicy -ne $true) {
+                Write-Verbose "Evaluating policy: $($standardPolicy.Identity)"
+                $policiesEvaluated += $standardPolicy.Identity
+                # Check if policy is compliant
+                $isCompliant = Is-PolicyCompliant -policy $standardPolicy
+                # Log failure reasons for non-compliant policies
+                if (-not $isCompliant) {
+                    $failureReasons += "$($standardPolicy.Identity) does not meet compliance criteria."
+                    Write-Verbose "$($standardPolicy.Identity) fails to meet one or more required conditions."
+                    $FailedTests += $standardPolicy.Identity
+                }
+                # Compile details of each policy using the new function
+                $details += Get-PolicyDetails -policy $standardPolicy -isCompliant $isCompliant
+                # Check if policy is Strict and covers all users
+                if ($isCompliant) {
+                    Write-Verbose "$($standardPolicy.Identity) is compliant."
+                    $PassedTests += $standardPolicy.Identity
+                    $standardUsersToProtect = $standardPolicy.TargetedUsersToProtect
+                    if ($standardUsersToProtect.count -eq 0) {
+                        $hasFullCoveragePolicy = $true
+                        $compliantPolicy = $standardPolicy
+                        $details += "Is Full Coverage Policy: $hasFullCoveragePolicy`n`n"
+                        Write-Verbose "$($standardPolicy.Identity) is compliant and covers all users. Stopping further evaluation."
+                    }
+                    else {
+                        $details += "Is Full Coverage Policy: $($false)`n`n"
+                    }
+                }
             }
-            $compliantItems = $validatedPolicies
-            $isCompliant = $compliantItems.Count -gt 0
-
-            # Prepare failure reasons for non-compliant items
-            $nonCompliantNames = $nonCompliantItems | ForEach-Object { $_.Name }
-            $failureReasons = if ($nonCompliantNames.Count -gt 0) {
-                "Reason: Does not meet one or more compliance criteria.`nNon-compliant Policies:`n" + ($nonCompliantNames -join "`n")
+            elseif ($null -ne $standardPolicy) {
+                Write-Verbose "$($standardPolicy.Identity) was not evaluated."
+                $isCompliant = Is-PolicyCompliant -policy $standardPolicy
+                $details += Get-PolicyDetails -policy $standardPolicy -isCompliant $isCompliant
+                $details += "Is Full Coverage Policy: $($false)`n`n"
+            }
+            # Step 5: Check Custom Policies if no full coverage from Strict or Standard
+            if ($null -ne $customPolicies -and $hasFullCoveragePolicy -ne $true) {
+                foreach ($policy in $customPolicies) {
+                    if (-not $compliantPolicy) {
+                        Write-Verbose "Evaluating policy: $($policy.Identity)"
+                        $policiesEvaluated += $policy.Identity
+                        # Check if policy is compliant
+                        $isCompliant = Is-PolicyCompliant -policy $policy
+                        # Log failure reasons for non-compliant policies
+                        if (-not $isCompliant) {
+                            $failureReasons += "$($policy.Identity) Policy does not meet compliance criteria."
+                            Write-Verbose "$($policy.Identity) Policy fails to meet one or more required conditions."
+                            $FailedTests += $policy.Identity
+                        }
+                        # Compile details of each policy using the new function
+                        $details += Get-PolicyDetails -policy $policy -isCompliant $isCompliant
+                        # Check if policy is Custom and covers all users
+                        if ($isCompliant) {
+                            Write-Verbose "$($policy.Identity) is compliant."
+                            $PassedTests += $policy.Identity
+                            $custompolicyUsersToProtect = $policy.TargetedUsersToProtect
+                            if ($custompolicyUsersToProtect.count -eq 0) {
+                                $hasFullCoveragePolicy = $true
+                                $compliantPolicy = $policy
+                                $details += "Is Full Coverage Policy: $hasFullCoveragePolicy`n"
+                                Write-Verbose "$($policy.Identity) is compliant and covers all users. Stopping further evaluation."
+                            }
+                            else {
+                                $details += "Is Full Coverage Policy: $($false)`n`n"
+                            }
+                        }
+                    }
+                    elseif ($compliantPolicy) {
+                        Write-Verbose "$($policy.Identity) was not evaluated."
+                        $isCompliant = Is-PolicyCompliant -policy $policy
+                        $details += Get-PolicyDetails -policy $policy -isCompliant $isCompliant
+                        $details += "Is Full Coverage Policy: $($false)`n`n"
+                    }
+                }
+            }
+            elseif ($null -ne $customPolicies ) {
+                foreach ($policy in $customPolicies) {
+                    Write-Verbose "$($policy.Identity) was not evaluated."
+                    $isCompliant = Is-PolicyCompliant -policy $policy
+                    $details += Get-PolicyDetails -policy $policy -isCompliant $isCompliant
+                    $details += "Is Full Coverage Policy: $($false)`n`n"
+                }
+            }
+            # Step 6: Check Default Policy if no full coverage from Strict, Standard, or Custom
+            if ($null -ne $defaultPolicy -and $hasFullCoveragePolicy -ne $true) {
+                Write-Verbose "Evaluating policy: $($defaultPolicy.Identity)"
+                $policiesEvaluated += $defaultPolicy.Identity
+                # Check if policy is compliant
+                $isCompliant = Is-PolicyCompliant -policy $defaultPolicy
+                # Log failure reasons for non-compliant policies
+                if (-not $isCompliant) {
+                    $failureReasons += "$($defaultPolicy.Identity) Policy does not meet compliance criteria."
+                    Write-Verbose "$($defaultPolicy.Identity) Policy fails to meet one or more required conditions."
+                    $FailedTests += $defaultPolicy.Identity
+                }
+                # Compile details of each policy using the new function
+                $details += Get-PolicyDetails -policy $defaultPolicy -isCompliant $isCompliant
+                # Check if policy is Default and covers all users
+                if ($isCompliant) {
+                    Write-Verbose "$($defaultPolicy.Identity) is compliant."
+                    $PassedTests += $defaultPolicy.Identity
+                    $defaultUsersToProtect = $defaultPolicy.TargetedUsersToProtect
+                    if ($defaultUsersToProtect.count -eq 0) {
+                        $hasFullCoveragePolicy = $true
+                        $compliantPolicy = $defaultPolicy
+                        $details += "Is Full Coverage Policy: $hasFullCoveragePolicy`n"
+                        Write-Verbose "$($defaultPolicy.Identity) is compliant and covers all users. Stopping further evaluation."
+                    }
+                    else {
+                        $details += "Is Full Coverage Policy: $($false)`n`n"
+                    }
+                }
+            }
+            elseif ($null -ne $defaultPolicy) {
+                Write-Verbose "$($defaultPolicy.Identity) was not evaluated."
+                $isCompliant = Is-PolicyCompliant -policy $defaultPolicy
+                $details += Get-PolicyDetails -policy $defaultPolicy -isCompliant $isCompliant
+                $details += "Is Full Coverage Policy: $($false)`n`n"
+            }
+            # Need new steps for below:
+            $isOverallCompliant = $hasFullCoveragePolicy -and $null -ne $compliantPolicy
+            $resultDetails = if ($isOverallCompliant) {
+                "Compliant Policy: $($compliantPolicy.Identity)`nDetails:`n" + ($details -join "`n")
             }
             else {
-                "N/A"
+                "Non-Compliant or No Policy Fully Covers All Users.`nDetails:`n" + ($details -join "`n")
             }
 
-            # Prepare details for non-compliant items
-            $nonCompliantDetails = $nonCompliantItems | ForEach-Object {
-                "Policy: $($_.Name)"
-            }
-            $nonCompliantDetails = $nonCompliantDetails -join "`n"
-
-            # Prepare details based on compliance
-            $details = if ($nonCompliantItems) {
-                "Non-Compliant Items: $($nonCompliantItems.Count)`nDetails:`n$nonCompliantDetails"
-            }
-            else {
-                "Compliant Items: $($compliantItems.Count)"
-            }
-
-            # Parameter splat for Initialize-CISAuditResult function
+            $VerbosePreference = "SilentlyContinue"
             $params = @{
                 Rec           = $recnum
-                Result        = $nonCompliantItems.Count -eq 0
-                Status        = if ($isCompliant) { "Pass" } else { "Fail" }
-                Details       = $details
-                FailureReason = $failureReasons
+                Result        = $isOverallCompliant
+                Status        = if ($isOverallCompliant) { "Pass" } else { "Fail" }
+                Details       = $resultDetails
+                FailureReason = if (-not $isOverallCompliant) { $failureReasons -join "`n" } else { "All settings are correct based on the highest precedence policy that applies to all users." }
             }
-
-            # Create and populate the CISAuditResult object
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            $LastError = $_
-            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
+            Write-Error "An error occurred during the test: $_"
+            $auditResult = Get-TestError -LastError $_ -recnum $recnum
         }
     }
 
     end {
-        # Return auditResult
         return $auditResult
     }
 }
+
+

From d660f46eeb624fa041010d881bcb7ef32221a6e8 Mon Sep 17 00:00:00 2001
From: DrIOS <58635327+DrIOSX@users.noreply.github.com>
Date: Sat, 29 Jun 2024 15:32:19 -0500
Subject: [PATCH 16/24] fix: 2.1.7 simplified output and added object
 comment-rc

---
 source/Private/Get-CISExoOutput.ps1           | 41 ++++++++++++-
 source/Private/Get-PhishPolicyDetail.ps1      | 18 ++++++
 source/Private/Test-PhishPolicyCompliance.ps1 |  8 +++
 source/tests/Test-AntiPhishingPolicy.ps1      | 59 ++++++++-----------
 .../Private/Get-PhishPolicyDetail.tests.ps1   | 27 +++++++++
 .../Test-PhishPolicyCompliance.tests.ps1      | 27 +++++++++
 6 files changed, 143 insertions(+), 37 deletions(-)
 create mode 100644 source/Private/Get-PhishPolicyDetail.ps1
 create mode 100644 source/Private/Test-PhishPolicyCompliance.ps1
 create mode 100644 tests/Unit/Private/Get-PhishPolicyDetail.tests.ps1
 create mode 100644 tests/Unit/Private/Test-PhishPolicyCompliance.tests.ps1

diff --git a/source/Private/Get-CISExoOutput.ps1 b/source/Private/Get-CISExoOutput.ps1
index da7a5e3..615c421 100644
--- a/source/Private/Get-CISExoOutput.ps1
+++ b/source/Private/Get-CISExoOutput.ps1
@@ -349,7 +349,46 @@ function Get-CISExoOutput {
             }
             '2.1.7' {
                 # Test-AntiPhishingPolicy.ps1
-                # Condition A: Ensure that an anti-phishing policy has been created
+                <#
+                    $antiPhishPolicies = @(
+                        [PSCustomObject]@{
+                            Identity = "Strict Preset Security Policy"
+                            Enabled = $true
+                            PhishThresholdLevel = 4
+                            EnableMailboxIntelligenceProtection = $true
+                            EnableMailboxIntelligence = $true
+                            EnableSpoofIntelligence = $true
+                            TargetedUsersToProtect = "John Doe;jdoe@contoso.net, Jane Does;janedoe@contoso.net"
+                        },
+                        [PSCustomObject]@{
+                            Identity = "Office365 AntiPhish Default"
+                            Enabled = $true
+                            PhishThresholdLevel = 2
+                            EnableMailboxIntelligenceProtection = $true
+                            EnableMailboxIntelligence = $true
+                            EnableSpoofIntelligence = $true
+                            TargetedUsersToProtect = $null  # Assuming it targets all users as it's the default
+                        },
+                        [PSCustomObject]@{
+                            Identity = "Admin"
+                            Enabled = $true
+                            PhishThresholdLevel = 2
+                            EnableMailboxIntelligenceProtection = $true
+                            EnableMailboxIntelligence = $true
+                            EnableSpoofIntelligence = $true
+                            TargetedUsersToProtect = $null  # Assuming it targets all users
+                        },
+                        [PSCustomObject]@{
+                            Identity = "Standard Preset Security Policy"
+                            Enabled = $true
+                            PhishThresholdLevel = 3
+                            EnableMailboxIntelligenceProtection = $true
+                            EnableMailboxIntelligence = $true
+                            EnableSpoofIntelligence = $true
+                            TargetedUsersToProtect = $null  # Assuming it targets all users
+                        }
+                    )
+                #>
                 $antiPhishPolicies = Get-AntiPhishPolicy
                 return $antiPhishPolicies
             }
diff --git a/source/Private/Get-PhishPolicyDetail.ps1 b/source/Private/Get-PhishPolicyDetail.ps1
new file mode 100644
index 0000000..c9be82c
--- /dev/null
+++ b/source/Private/Get-PhishPolicyDetail.ps1
@@ -0,0 +1,18 @@
+function Get-PhishPolicyDetail {
+    param (
+        [Parameter(Mandatory = $true)]
+        [pscustomobject]$policy,
+
+        [Parameter(Mandatory = $true)]
+        [bool]$isCompliant
+    )
+
+    return "Policy: $($policy.Identity)`n" +
+    "Enabled: $($policy.Enabled)`n" +
+    "PhishThresholdLevel: $($policy.PhishThresholdLevel)`n" +
+    "MailboxIntelligenceProtection: $($policy.EnableMailboxIntelligenceProtection)`n" +
+    "MailboxIntelligence: $($policy.EnableMailboxIntelligence)`n" +
+    "SpoofIntelligence: $($policy.EnableSpoofIntelligence)`n" +
+    "TargetedUsersToProtect: $($policy.TargetedUsersToProtect -join ', ')`n" +
+    "IsCompliant: $isCompliant"
+}
\ No newline at end of file
diff --git a/source/Private/Test-PhishPolicyCompliance.ps1 b/source/Private/Test-PhishPolicyCompliance.ps1
new file mode 100644
index 0000000..01b99aa
--- /dev/null
+++ b/source/Private/Test-PhishPolicyCompliance.ps1
@@ -0,0 +1,8 @@
+function Test-PhishPolicyCompliance {
+    param ($policy)
+    return ($policy.Enabled -eq $true -and
+        $policy.PhishThresholdLevel -ge 2 -and
+        $policy.EnableMailboxIntelligenceProtection -eq $true -and
+        $policy.EnableMailboxIntelligence -eq $true -and
+        $policy.EnableSpoofIntelligence -eq $true)
+}
\ No newline at end of file
diff --git a/source/tests/Test-AntiPhishingPolicy.ps1 b/source/tests/Test-AntiPhishingPolicy.ps1
index 522aa69..34b84a4 100644
--- a/source/tests/Test-AntiPhishingPolicy.ps1
+++ b/source/tests/Test-AntiPhishingPolicy.ps1
@@ -1,5 +1,5 @@
 
-function Is-PolicyCompliant {
+function Test-PhishPolicyCompliance {
     param ($policy)
     return ($policy.Enabled -eq $true -and
         $policy.PhishThresholdLevel -ge 2 -and
@@ -8,24 +8,7 @@ function Is-PolicyCompliant {
         $policy.EnableSpoofIntelligence -eq $true)
 }
 
-function Get-PolicyDetails {
-    param (
-        [Parameter(Mandatory = $true)]
-        [pscustomobject]$policy,
 
-        [Parameter(Mandatory = $true)]
-        [bool]$isCompliant
-    )
-
-    return "Policy: $($policy.Identity)`n" +
-    "Enabled: $($policy.Enabled)`n" +
-    "PhishThresholdLevel: $($policy.PhishThresholdLevel)`n" +
-    "MailboxIntelligenceProtection: $($policy.EnableMailboxIntelligenceProtection)`n" +
-    "MailboxIntelligence: $($policy.EnableMailboxIntelligence)`n" +
-    "SpoofIntelligence: $($policy.EnableSpoofIntelligence)`n" +
-    "TargetedUsersToProtect: $($policy.TargetedUsersToProtect -join ', ')`n" +
-    "IsCompliant: $isCompliant"
-}
 
 function Test-AntiPhishingPolicy {
     [CmdletBinding()]
@@ -81,7 +64,7 @@ function Test-AntiPhishingPolicy {
                 Write-Verbose "Evaluating policy: $($strictPolicy.Identity)"
                 $policiesEvaluated += $strictPolicy.Identity
                 # Check if policy is compliant
-                $isCompliant = Is-PolicyCompliant -policy $strictPolicy
+                $isCompliant = Test-PhishPolicyCompliance -policy $strictPolicy
                 # Log failure reasons for non-compliant policies
                 if (-not $isCompliant) {
                     $failureReasons += "Policy $($strictPolicy.Identity) does not meet compliance criteria."
@@ -89,7 +72,7 @@ function Test-AntiPhishingPolicy {
                     $FailedTests += $strictPolicy.Identity
                 }
                 # Compile details of each policy using the new function
-                $details += Get-PolicyDetails -policy $strictPolicy -isCompliant $isCompliant
+                $details += Get-PhishPolicyDetail -policy $strictPolicy -isCompliant $isCompliant
                 # Check if policy is Strict and covers all users
                 if ($isCompliant) {
                     $PassedTests += $strictPolicy.Identity
@@ -111,7 +94,7 @@ function Test-AntiPhishingPolicy {
                 Write-Verbose "Evaluating policy: $($standardPolicy.Identity)"
                 $policiesEvaluated += $standardPolicy.Identity
                 # Check if policy is compliant
-                $isCompliant = Is-PolicyCompliant -policy $standardPolicy
+                $isCompliant = Test-PhishPolicyCompliance -policy $standardPolicy
                 # Log failure reasons for non-compliant policies
                 if (-not $isCompliant) {
                     $failureReasons += "$($standardPolicy.Identity) does not meet compliance criteria."
@@ -119,7 +102,7 @@ function Test-AntiPhishingPolicy {
                     $FailedTests += $standardPolicy.Identity
                 }
                 # Compile details of each policy using the new function
-                $details += Get-PolicyDetails -policy $standardPolicy -isCompliant $isCompliant
+                $details += Get-PhishPolicyDetail -policy $standardPolicy -isCompliant $isCompliant
                 # Check if policy is Strict and covers all users
                 if ($isCompliant) {
                     Write-Verbose "$($standardPolicy.Identity) is compliant."
@@ -138,8 +121,8 @@ function Test-AntiPhishingPolicy {
             }
             elseif ($null -ne $standardPolicy) {
                 Write-Verbose "$($standardPolicy.Identity) was not evaluated."
-                $isCompliant = Is-PolicyCompliant -policy $standardPolicy
-                $details += Get-PolicyDetails -policy $standardPolicy -isCompliant $isCompliant
+                $isCompliant = Test-PhishPolicyCompliance -policy $standardPolicy
+                $details += Get-PhishPolicyDetail -policy $standardPolicy -isCompliant $isCompliant
                 $details += "Is Full Coverage Policy: $($false)`n`n"
             }
             # Step 5: Check Custom Policies if no full coverage from Strict or Standard
@@ -149,7 +132,7 @@ function Test-AntiPhishingPolicy {
                         Write-Verbose "Evaluating policy: $($policy.Identity)"
                         $policiesEvaluated += $policy.Identity
                         # Check if policy is compliant
-                        $isCompliant = Is-PolicyCompliant -policy $policy
+                        $isCompliant = Test-PhishPolicyCompliance -policy $policy
                         # Log failure reasons for non-compliant policies
                         if (-not $isCompliant) {
                             $failureReasons += "$($policy.Identity) Policy does not meet compliance criteria."
@@ -157,7 +140,7 @@ function Test-AntiPhishingPolicy {
                             $FailedTests += $policy.Identity
                         }
                         # Compile details of each policy using the new function
-                        $details += Get-PolicyDetails -policy $policy -isCompliant $isCompliant
+                        $details += Get-PhishPolicyDetail -policy $policy -isCompliant $isCompliant
                         # Check if policy is Custom and covers all users
                         if ($isCompliant) {
                             Write-Verbose "$($policy.Identity) is compliant."
@@ -176,8 +159,8 @@ function Test-AntiPhishingPolicy {
                     }
                     elseif ($compliantPolicy) {
                         Write-Verbose "$($policy.Identity) was not evaluated."
-                        $isCompliant = Is-PolicyCompliant -policy $policy
-                        $details += Get-PolicyDetails -policy $policy -isCompliant $isCompliant
+                        $isCompliant = Test-PhishPolicyCompliance -policy $policy
+                        $details += Get-PhishPolicyDetail -policy $policy -isCompliant $isCompliant
                         $details += "Is Full Coverage Policy: $($false)`n`n"
                     }
                 }
@@ -185,8 +168,8 @@ function Test-AntiPhishingPolicy {
             elseif ($null -ne $customPolicies ) {
                 foreach ($policy in $customPolicies) {
                     Write-Verbose "$($policy.Identity) was not evaluated."
-                    $isCompliant = Is-PolicyCompliant -policy $policy
-                    $details += Get-PolicyDetails -policy $policy -isCompliant $isCompliant
+                    $isCompliant = Test-PhishPolicyCompliance -policy $policy
+                    $details += Get-PhishPolicyDetail -policy $policy -isCompliant $isCompliant
                     $details += "Is Full Coverage Policy: $($false)`n`n"
                 }
             }
@@ -195,7 +178,7 @@ function Test-AntiPhishingPolicy {
                 Write-Verbose "Evaluating policy: $($defaultPolicy.Identity)"
                 $policiesEvaluated += $defaultPolicy.Identity
                 # Check if policy is compliant
-                $isCompliant = Is-PolicyCompliant -policy $defaultPolicy
+                $isCompliant = Test-PhishPolicyCompliance -policy $defaultPolicy
                 # Log failure reasons for non-compliant policies
                 if (-not $isCompliant) {
                     $failureReasons += "$($defaultPolicy.Identity) Policy does not meet compliance criteria."
@@ -203,7 +186,7 @@ function Test-AntiPhishingPolicy {
                     $FailedTests += $defaultPolicy.Identity
                 }
                 # Compile details of each policy using the new function
-                $details += Get-PolicyDetails -policy $defaultPolicy -isCompliant $isCompliant
+                $details += Get-PhishPolicyDetail -policy $defaultPolicy -isCompliant $isCompliant
                 # Check if policy is Default and covers all users
                 if ($isCompliant) {
                     Write-Verbose "$($defaultPolicy.Identity) is compliant."
@@ -222,20 +205,23 @@ function Test-AntiPhishingPolicy {
             }
             elseif ($null -ne $defaultPolicy) {
                 Write-Verbose "$($defaultPolicy.Identity) was not evaluated."
-                $isCompliant = Is-PolicyCompliant -policy $defaultPolicy
-                $details += Get-PolicyDetails -policy $defaultPolicy -isCompliant $isCompliant
+                $isCompliant = Test-PhishPolicyCompliance -policy $defaultPolicy
+                $details += Get-PhishPolicyDetail -policy $defaultPolicy -isCompliant $isCompliant
                 $details += "Is Full Coverage Policy: $($false)`n`n"
             }
-            # Need new steps for below:
+            # Determine overall compliance based on the evaluations
             $isOverallCompliant = $hasFullCoveragePolicy -and $null -ne $compliantPolicy
+            # Prepare result details
             $resultDetails = if ($isOverallCompliant) {
                 "Compliant Policy: $($compliantPolicy.Identity)`nDetails:`n" + ($details -join "`n")
             }
             else {
                 "Non-Compliant or No Policy Fully Covers All Users.`nDetails:`n" + ($details -join "`n")
             }
-
+            # Verbose output for the overall compliance
+            Write-Verbose "Overall Compliance: $isOverallCompliant"
             $VerbosePreference = "SilentlyContinue"
+            # Prepare the parameters for the audit result
             $params = @{
                 Rec           = $recnum
                 Result        = $isOverallCompliant
@@ -243,6 +229,7 @@ function Test-AntiPhishingPolicy {
                 Details       = $resultDetails
                 FailureReason = if (-not $isOverallCompliant) { $failureReasons -join "`n" } else { "All settings are correct based on the highest precedence policy that applies to all users." }
             }
+            # Initialize the audit result
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
diff --git a/tests/Unit/Private/Get-PhishPolicyDetail.tests.ps1 b/tests/Unit/Private/Get-PhishPolicyDetail.tests.ps1
new file mode 100644
index 0000000..4a2aa69
--- /dev/null
+++ b/tests/Unit/Private/Get-PhishPolicyDetail.tests.ps1
@@ -0,0 +1,27 @@
+$ProjectPath = "$PSScriptRoot\..\..\.." | Convert-Path
+$ProjectName = ((Get-ChildItem -Path $ProjectPath\*\*.psd1).Where{
+        ($_.Directory.Name -match 'source|src' -or $_.Directory.Name -eq $_.BaseName) -and
+        $(try { Test-ModuleManifest $_.FullName -ErrorAction Stop } catch { $false } )
+    }).BaseName
+
+
+Import-Module $ProjectName
+
+InModuleScope $ProjectName {
+    Describe Get-PrivateFunction {
+        Context 'Default' {
+            BeforeEach {
+                $return = Get-PrivateFunction -PrivateData 'string'
+            }
+
+            It 'Returns a single object' {
+                ($return | Measure-Object).Count | Should -Be 1
+            }
+
+            It 'Returns a string based on the parameter PrivateData' {
+                $return | Should -Be 'string'
+            }
+        }
+    }
+}
+
diff --git a/tests/Unit/Private/Test-PhishPolicyCompliance.tests.ps1 b/tests/Unit/Private/Test-PhishPolicyCompliance.tests.ps1
new file mode 100644
index 0000000..4a2aa69
--- /dev/null
+++ b/tests/Unit/Private/Test-PhishPolicyCompliance.tests.ps1
@@ -0,0 +1,27 @@
+$ProjectPath = "$PSScriptRoot\..\..\.." | Convert-Path
+$ProjectName = ((Get-ChildItem -Path $ProjectPath\*\*.psd1).Where{
+        ($_.Directory.Name -match 'source|src' -or $_.Directory.Name -eq $_.BaseName) -and
+        $(try { Test-ModuleManifest $_.FullName -ErrorAction Stop } catch { $false } )
+    }).BaseName
+
+
+Import-Module $ProjectName
+
+InModuleScope $ProjectName {
+    Describe Get-PrivateFunction {
+        Context 'Default' {
+            BeforeEach {
+                $return = Get-PrivateFunction -PrivateData 'string'
+            }
+
+            It 'Returns a single object' {
+                ($return | Measure-Object).Count | Should -Be 1
+            }
+
+            It 'Returns a string based on the parameter PrivateData' {
+                $return | Should -Be 'string'
+            }
+        }
+    }
+}
+

From 34a44d07098ccfefa5583d19c390d0bd69343b1c Mon Sep 17 00:00:00 2001
From: DrIOS <58635327+DrIOSX@users.noreply.github.com>
Date: Sat, 29 Jun 2024 16:14:55 -0500
Subject: [PATCH 17/24] fix: 2.1.7 simplified output and added object
 comment-release

---
 source/tests/Test-AntiPhishingPolicy.ps1 | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/source/tests/Test-AntiPhishingPolicy.ps1 b/source/tests/Test-AntiPhishingPolicy.ps1
index 34b84a4..cd2fbac 100644
--- a/source/tests/Test-AntiPhishingPolicy.ps1
+++ b/source/tests/Test-AntiPhishingPolicy.ps1
@@ -1,15 +1,3 @@
-
-function Test-PhishPolicyCompliance {
-    param ($policy)
-    return ($policy.Enabled -eq $true -and
-        $policy.PhishThresholdLevel -ge 2 -and
-        $policy.EnableMailboxIntelligenceProtection -eq $true -and
-        $policy.EnableMailboxIntelligence -eq $true -and
-        $policy.EnableSpoofIntelligence -eq $true)
-}
-
-
-
 function Test-AntiPhishingPolicy {
     [CmdletBinding()]
     [OutputType([CISAuditResult])]
@@ -18,7 +6,7 @@ function Test-AntiPhishingPolicy {
     begin {
         $recnum = "2.1.7"
         Write-Verbose "Running Test-AntiPhishingPolicy for $recnum..."
-        . .\source\Classes\CISAuditResult.ps1
+        #. .\source\Classes\CISAuditResult.ps1
         <#
         Conditions for 2.1.7 (L1) Ensure robust anti-phishing policies are enforced
         Validate test for a pass:
@@ -38,9 +26,9 @@ function Test-AntiPhishingPolicy {
     process {
         try {
             # Step 1: Retrieve all anti-phishing policies
-            $VerbosePreference = "Continue"
+            #$VerbosePreference = "Continue"
             Write-Verbose "Retrieving all anti-phishing policies..."
-            #$antiPhishPolicies = Get-CISExoOutput -Rec $recnum
+            $antiPhishPolicies = Get-CISExoOutput -Rec $recnum
 
             # Step 2: Initialize variables to track compliance and details
             $compliantPolicy = $null
@@ -220,14 +208,14 @@ function Test-AntiPhishingPolicy {
             }
             # Verbose output for the overall compliance
             Write-Verbose "Overall Compliance: $isOverallCompliant"
-            $VerbosePreference = "SilentlyContinue"
+            #$VerbosePreference = "SilentlyContinue"
             # Prepare the parameters for the audit result
             $params = @{
                 Rec           = $recnum
                 Result        = $isOverallCompliant
                 Status        = if ($isOverallCompliant) { "Pass" } else { "Fail" }
                 Details       = $resultDetails
-                FailureReason = if (-not $isOverallCompliant) { $failureReasons -join "`n" } else { "All settings are correct based on the highest precedence policy that applies to all users." }
+                FailureReason = if (-not $isOverallCompliant) { $failureReasons -join "`n" } else { "None: All settings are correct based on the highest precedence policy that applies to all users." }
             }
             # Initialize the audit result
             $auditResult = Initialize-CISAuditResult @params

From 9805e9910923f507ed7bc729bae4290dd757bb41 Mon Sep 17 00:00:00 2001
From: DrIOS <58635327+DrIOSX@users.noreply.github.com>
Date: Sat, 29 Jun 2024 19:16:27 -0500
Subject: [PATCH 18/24] fix: 2.1.9 simplified output and added object
 comment-release

---
 source/tests/Test-EnableDKIM.ps1 | 34 +++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/source/tests/Test-EnableDKIM.ps1 b/source/tests/Test-EnableDKIM.ps1
index fa86282..ec92d52 100644
--- a/source/tests/Test-EnableDKIM.ps1
+++ b/source/tests/Test-EnableDKIM.ps1
@@ -4,6 +4,7 @@ function Test-EnableDKIM {
     param (
         # Aligned
         # Parameters can be added if needed
+        [string]$DomainName
     )
 
     begin {
@@ -37,9 +38,16 @@ function Test-EnableDKIM {
 
             # Retrieve DKIM configuration for all domains
             $dkimConfig = Get-CISExoOutput -Rec $recnum
-            $dkimResult = ($dkimConfig | ForEach-Object { $_.Enabled }) -notcontains $false
-            $dkimFailedDomains = $dkimConfig | Where-Object { -not $_.Enabled } | ForEach-Object { $_.Domain }
-
+            if (-not $DomainName) {
+                $dkimResult = ($dkimConfig | ForEach-Object { $_.Enabled }) -notcontains $false
+                $dkimFailedDomains = $dkimConfig | Where-Object { -not $_.Enabled } | ForEach-Object { $_.Domain }
+            }
+            else {
+                $dkimResult = ($dkimConfig | Where-Object { $_.Domain -eq $DomainName }).Enabled
+                if ($dkimResult -eq $false) {
+                    $dkimFailedDomains = $dkimConfig | Where-Object { $_.Domain -eq $DomainName } | ForEach-Object { $_.Domain }
+                }
+            }
             # Prepare failure reasons and details based on compliance
             $failureReasons = if (-not $dkimResult) {
                 "DKIM is not enabled for some domains"  # Condition A fail
@@ -47,21 +55,25 @@ function Test-EnableDKIM {
             else {
                 "N/A"
             }
-
+            $basedetails = "All domains have DKIM enabled"
             $details = if ($dkimResult) {
-                "All domains have DKIM enabled"  # Condition A pass
+                if ($DomainName) {
+                    "Domain: $DomainName; $basedetails"
+                }
+                else {
+                    $basedetails
+                }  # Condition A pass
             }
             else {
                 "DKIM not enabled for: $($dkimFailedDomains -join ', ')"  # Condition B fail
             }
-
             # Create and populate the CISAuditResult object
             $params = @{
-                Rec            = $recnum
-                Result         = $dkimResult
-                Status         = if ($dkimResult) { "Pass" } else { "Fail" }
-                Details        = $details
-                FailureReason  = $failureReasons
+                Rec           = $recnum
+                Result        = $dkimResult
+                Status        = if ($dkimResult) { "Pass" } else { "Fail" }
+                Details       = $details
+                FailureReason = $failureReasons
             }
             $auditResult = Initialize-CISAuditResult @params
         }

From bd0ce158afe3a58244a4a00a28dc65f2d6adb0d3 Mon Sep 17 00:00:00 2001
From: DrIOS <58635327+DrIOSX@users.noreply.github.com>
Date: Sat, 29 Jun 2024 19:54:18 -0500
Subject: [PATCH 19/24] fix: 2.1.9 simplified output and added object
 comment-release

---
 source/tests/Test-EnableDKIM.ps1 | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/source/tests/Test-EnableDKIM.ps1 b/source/tests/Test-EnableDKIM.ps1
index ec92d52..358d40d 100644
--- a/source/tests/Test-EnableDKIM.ps1
+++ b/source/tests/Test-EnableDKIM.ps1
@@ -6,23 +6,19 @@ function Test-EnableDKIM {
         # Parameters can be added if needed
         [string]$DomainName
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
         # Initialization code, if needed
         $recnum = "2.1.9"
-
+        Write-Verbose "Running Test-EnableDKIM for $recnum..."
         <#
         Conditions for 2.1.9 (L1) Ensure DKIM is enabled for all Exchange Online Domains (Automated)
-
         Validate test for a pass:
         - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
         - Specific conditions to check:
           - Condition A: DKIM is enabled for all Exchange Online domains in the Microsoft 365 security center.
           - Condition B: Using the Exchange Online PowerShell Module, the `CnameConfiguration.Enabled` property for each domain is set to `True`.
-
         Validate test for a fail:
         - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
         - Specific conditions to check:
@@ -30,12 +26,9 @@ function Test-EnableDKIM {
           - Condition B: Using the Exchange Online PowerShell Module, the `CnameConfiguration.Enabled` property for one or more domains is set to `False`.
         #>
     }
-
     process {
-
         try {
             # 2.1.9 (L1) Ensure DKIM is enabled for all Exchange Online Domains
-
             # Retrieve DKIM configuration for all domains
             $dkimConfig = Get-CISExoOutput -Rec $recnum
             if (-not $DomainName) {
@@ -82,7 +75,6 @@ function Test-EnableDKIM {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult

From c7f7fe11cc46a544b3385e00fa20203ce93f64d8 Mon Sep 17 00:00:00 2001
From: DrIOS <58635327+DrIOSX@users.noreply.github.com>
Date: Sat, 29 Jun 2024 19:54:32 -0500
Subject: [PATCH 20/24] fix: formatting

---
 source/tests/Test-AntiPhishingPolicy.ps1      |  7 ------
 source/tests/Test-AuditDisabledFalse.ps1      | 10 +-------
 source/tests/Test-AuditLogSearch.ps1          | 14 ++---------
 source/tests/Test-BlockMailForwarding.ps1     | 17 ++------------
 .../tests/Test-BlockSharedMailboxSignIn.ps1   |  7 ------
 source/tests/Test-CommonAttachmentFilter.ps1  |  1 -
 source/tests/Test-CustomerLockbox.ps1         |  4 ----
 .../tests/Test-ExternalSharingCalendars.ps1   |  5 ----
 source/tests/Test-IdentifyExternalEmail.ps1   | 10 +-------
 source/tests/Test-MailTipsEnabled.ps1         | 12 +---------
 source/tests/Test-MailboxAuditingE3.ps1       | 23 +------------------
 source/tests/Test-MailboxAuditingE5.ps1       | 18 +--------------
 .../tests/Test-ModernAuthExchangeOnline.ps1   | 12 +---------
 source/tests/Test-NoWhitelistDomains.ps1      | 11 +--------
 source/tests/Test-NotifyMalwareInternal.ps1   |  9 --------
 source/tests/Test-ReportSecurityInTeams.ps1   |  8 +------
 source/tests/Test-RestrictOutlookAddins.ps1   | 12 +---------
 .../Test-RestrictStorageProvidersOutlook.ps1  | 10 +-------
 source/tests/Test-SafeAttachmentsPolicy.ps1   | 12 ++++------
 source/tests/Test-SafeAttachmentsTeams.ps1    |  2 --
 source/tests/Test-SafeLinksOfficeApps.ps1     |  9 --------
 source/tests/Test-SpamPolicyAdminNotify.ps1   |  1 -
 22 files changed, 19 insertions(+), 195 deletions(-)

diff --git a/source/tests/Test-AntiPhishingPolicy.ps1 b/source/tests/Test-AntiPhishingPolicy.ps1
index cd2fbac..61901c6 100644
--- a/source/tests/Test-AntiPhishingPolicy.ps1
+++ b/source/tests/Test-AntiPhishingPolicy.ps1
@@ -2,7 +2,6 @@ function Test-AntiPhishingPolicy {
     [CmdletBinding()]
     [OutputType([CISAuditResult])]
     param ()
-
     begin {
         $recnum = "2.1.7"
         Write-Verbose "Running Test-AntiPhishingPolicy for $recnum..."
@@ -22,14 +21,12 @@ function Test-AntiPhishingPolicy {
                 - Condition B: Critical security features like Spoof Intelligence or Mailbox Intelligence are disabled in the relevant policies.
         #>
     }
-
     process {
         try {
             # Step 1: Retrieve all anti-phishing policies
             #$VerbosePreference = "Continue"
             Write-Verbose "Retrieving all anti-phishing policies..."
             $antiPhishPolicies = Get-CISExoOutput -Rec $recnum
-
             # Step 2: Initialize variables to track compliance and details
             $compliantPolicy = $null
             $details = @()
@@ -38,15 +35,12 @@ function Test-AntiPhishingPolicy {
             $policiesEvaluated = @()
             $PassedTests = @()
             $FailedTests = @()
-
             Write-Verbose "Evaluating each policy for compliance..."
-
             # Separate policies based on type
             $strictPolicy = $antiPhishPolicies | Where-Object { $_.Identity -match "Strict Preset Security Policy" }
             $standardPolicy = $antiPhishPolicies | Where-Object { $_.Identity -match "Standard Preset Security Policy" }
             $customPolicies = $antiPhishPolicies | Where-Object { -not ($_.Identity -match "Strict Preset Security Policy" -or $_.Identity -match "Standard Preset Security Policy" -or $_.IsDefault) }
             $defaultPolicy = $antiPhishPolicies | Where-Object { $_.IsDefault }
-
             # Step 3: Check for Strict Preset Security Policy
             if ($null -ne $strictPolicy) {
                 Write-Verbose "Evaluating policy: $($strictPolicy.Identity)"
@@ -225,7 +219,6 @@ function Test-AntiPhishingPolicy {
             $auditResult = Get-TestError -LastError $_ -recnum $recnum
         }
     }
-
     end {
         return $auditResult
     }
diff --git a/source/tests/Test-AuditDisabledFalse.ps1 b/source/tests/Test-AuditDisabledFalse.ps1
index fd8436e..ccfc555 100644
--- a/source/tests/Test-AuditDisabledFalse.ps1
+++ b/source/tests/Test-AuditDisabledFalse.ps1
@@ -5,11 +5,9 @@ function Test-AuditDisabledFalse {
     param (
         # Parameters can be added if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
         # Conditions for 6.1.1 (L1) Ensure 'AuditDisabled' organizationally is set to 'False'
         #
         # Validate test for a pass:
@@ -25,18 +23,15 @@ function Test-AuditDisabledFalse {
         #   - Condition A: The `AuditDisabled` organizational setting is set to `True` in the Microsoft 365 admin center.
         #   - Condition B: Using PowerShell, the `AuditDisabled` property in the organization's configuration is set to `True`.
         #   - Condition C: Mailbox auditing is not enabled by default at the organizational level.
-
         # Initialization code, if needed
         $recnum = "6.1.1"
+        Write-Verbose "Running Test-AuditDisabledFalse for $recnum..."
     }
-
     process {
         try {
             # 6.1.1 (L1) Ensure 'AuditDisabled' organizationally is set to 'False'
-
             # Retrieve the AuditDisabled configuration (Condition B)
             $auditNotDisabled = Get-CISExoOutput -Rec $recnum
-
             # Prepare failure reasons and details based on compliance
             $failureReasons = if (-not $auditNotDisabled) {
                 "AuditDisabled is set to True"  # Condition A Fail
@@ -44,14 +39,12 @@ function Test-AuditDisabledFalse {
             else {
                 "N/A"
             }
-
             $details = if ($auditNotDisabled) {
                 "Audit is not disabled organizationally"  # Condition C Pass
             }
             else {
                 "Audit is disabled organizationally"  # Condition C Fail
             }
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -67,7 +60,6 @@ function Test-AuditDisabledFalse {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult
diff --git a/source/tests/Test-AuditLogSearch.ps1 b/source/tests/Test-AuditLogSearch.ps1
index 2d44b69..a1a8962 100644
--- a/source/tests/Test-AuditLogSearch.ps1
+++ b/source/tests/Test-AuditLogSearch.ps1
@@ -5,23 +5,20 @@ function Test-AuditLogSearch {
         # Aligned
         # Parameters can be added if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
         $recnum = "3.1.1"
-
+        Write-Verbose "Running Test-AuditLogSearch for $recnum..."
         <#
         Conditions for 3.1.1 (L1) Ensure Microsoft 365 audit log search is Enabled
-
         Validate test for a pass:
         - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
         - Specific conditions to check:
             - Condition A: Audit log search is enabled in the Microsoft Purview compliance portal.
             - Condition B: The audit log retains user and admin activity for 90 days.
             - Condition C: Audit log search capabilities are functional (search results are displayed for activities within the past 30 days).
-
         Validate test for a fail:
         - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
         - Specific conditions to check:
@@ -30,14 +27,10 @@ function Test-AuditLogSearch {
             - Condition C: Audit log search capabilities are non-functional (no search results are displayed for activities within the past 30 days).
         #>
     }
-
     process {
-
         try {
             # 3.1.1 (L1) Ensure Microsoft 365 audit log search is Enabled
-
             $auditLogResult = Get-CISExoOutput -Rec $recnum
-
             # Prepare failure reasons and details based on compliance
             $failureReasons = if (-not $auditLogResult) {
                 # Condition A (Fail): Audit log search is not enabled in the Microsoft Purview compliance portal
@@ -46,7 +39,6 @@ function Test-AuditLogSearch {
             else {
                 "N/A"
             }
-
             $details = if ($auditLogResult) {
                 # Condition A (Pass): Audit log search is enabled in the Microsoft Purview compliance portal
                 "UnifiedAuditLogIngestionEnabled: True"
@@ -54,7 +46,6 @@ function Test-AuditLogSearch {
             else {
                 "UnifiedAuditLogIngestionEnabled: False"
             }
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -70,9 +61,8 @@ function Test-AuditLogSearch {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult
     }
-}
+}
\ No newline at end of file
diff --git a/source/tests/Test-BlockMailForwarding.ps1 b/source/tests/Test-BlockMailForwarding.ps1
index 81177ff..645b783 100644
--- a/source/tests/Test-BlockMailForwarding.ps1
+++ b/source/tests/Test-BlockMailForwarding.ps1
@@ -4,23 +4,20 @@ function Test-BlockMailForwarding {
     param (
         # Parameters can be added if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
         $recnum = "6.2.1"
-
+        Write-Verbose "Running Test-BlockMailForwarding for $recnum..."
         <#
         Conditions for 6.2.1 (L1) Ensure all forms of mail forwarding are blocked and/or disabled
-
         Validate test for a pass:
         - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
         - Specific conditions to check:
           - Condition A: Transport rules do not forward email to external domains.
           - Condition B: Anti-spam outbound policy is configured to disable automatic email forwarding to external domains.
           - Condition C: No exceptions to the forwarding rules unless explicitly defined by organizational policy.
-
         Validate test for a fail:
         - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
         - Specific conditions to check:
@@ -29,26 +26,20 @@ function Test-BlockMailForwarding {
           - Condition C: Unapproved exceptions to the forwarding rules are present.
         #>
     }
-
     process {
         try {
             # 6.2.1 (L1) Ensure all forms of mail forwarding are blocked and/or disabled
-
             # Step 1: Retrieve the transport rules that redirect messages
             $transportRules,$nonCompliantSpamPolicies = Get-CISExoOutput -Rec $recnum
             $transportForwardingBlocked = $transportRules.Count -eq 0
-
             # Step 2: Check all anti-spam outbound policies
             $nonCompliantSpamPoliciesArray = @($nonCompliantSpamPolicies)
             $spamForwardingBlocked = $nonCompliantSpamPoliciesArray.Count -eq 0
-
             # Determine overall compliance
             $forwardingBlocked = $transportForwardingBlocked -and $spamForwardingBlocked
-
             # Prepare failure reasons and details based on compliance
             $failureReasons = @()
             $details = @()
-
             if ($transportRules -ne 1) {
                 # Fail Condition A
                 $failureReasons += "Mail forwarding rules found: $($transportRules.Name -join ', ')"
@@ -58,7 +49,6 @@ function Test-BlockMailForwarding {
                 }
                 $details += "`n"
             }
-
             if ($nonCompliantSpamPoliciesArray.Count -gt 0) {
                 # Fail Condition B
                 $failureReasons += "Outbound spam policies allowing automatic forwarding found."
@@ -67,7 +57,6 @@ function Test-BlockMailForwarding {
                     "$($_.Name)|$($_.AutoForwardingMode)"
                 }
             }
-
             if ($failureReasons.Count -eq 0) {
                 $failureReasons = "N/A"
                 $details = "Both transport rules and outbound spam policies are configured correctly to block forwarding."
@@ -76,7 +65,6 @@ function Test-BlockMailForwarding {
                 $failureReasons = $failureReasons -join " | "
                 $details = $details -join "`n"
             }
-
             # Populate the audit result
             $params = @{
                 Rec           = $recnum
@@ -92,9 +80,8 @@ function Test-BlockMailForwarding {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult
     }
-}
+}
\ No newline at end of file
diff --git a/source/tests/Test-BlockSharedMailboxSignIn.ps1 b/source/tests/Test-BlockSharedMailboxSignIn.ps1
index 2e6166e..d0edeaf 100644
--- a/source/tests/Test-BlockSharedMailboxSignIn.ps1
+++ b/source/tests/Test-BlockSharedMailboxSignIn.ps1
@@ -8,7 +8,6 @@ function Test-BlockSharedMailboxSignIn {
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
         # Initialization code, if needed
         $recnum = "1.2.2"
         Write-Verbose "Running Test-BlockSharedMailboxSignIn for $recnum..."
@@ -26,7 +25,6 @@ function Test-BlockSharedMailboxSignIn {
         #   - Condition A: One or more shared mailboxes have the "Sign-in blocked" option enabled in the properties pane on the Microsoft 365 admin center.
         #   - Condition B: Using PowerShell, the `AccountEnabled` property for one or more shared mailboxes is set to `True`.
     }
-
     process {
         try {
             # Step: Retrieve shared mailbox details
@@ -63,11 +61,9 @@ function Test-BlockSharedMailboxSignIn {
             $users = Get-CISAadOutput -Rec $recnum
             # Step: Retrieve details of shared mailboxes from Azure AD (Condition B: Pass/Fail)
             $sharedMailboxDetails = $users | Where-Object {$_.objectid -in $objectids}
-
             # Step: Identify enabled mailboxes (Condition B: Pass/Fail)
             $enabledMailboxes = $sharedMailboxDetails | Where-Object { $_.AccountEnabled } | ForEach-Object { $_.DisplayName }
             $allBlocked = $enabledMailboxes.Count -eq 0
-
             # Step: Determine failure reasons based on enabled mailboxes (Condition A & B: Fail)
             $failureReasons = if (-not $allBlocked) {
                 "Some mailboxes have sign-in enabled (AccountEnabled:True):`n$($enabledMailboxes -join ', ')"
@@ -75,7 +71,6 @@ function Test-BlockSharedMailboxSignIn {
             else {
                 "N/A"
             }
-
             # Step: Prepare details for the audit result (Condition A & B: Pass/Fail)
             $details = if ($allBlocked) {
                 "All shared mailboxes have sign-in blocked."
@@ -83,7 +78,6 @@ function Test-BlockSharedMailboxSignIn {
             else {
                 "AccountEnabled set to True Mailboxes: $($enabledMailboxes -join ', ')"
             }
-
             # Step: Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -99,7 +93,6 @@ function Test-BlockSharedMailboxSignIn {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult
diff --git a/source/tests/Test-CommonAttachmentFilter.ps1 b/source/tests/Test-CommonAttachmentFilter.ps1
index 7a77945..0abb2c8 100644
--- a/source/tests/Test-CommonAttachmentFilter.ps1
+++ b/source/tests/Test-CommonAttachmentFilter.ps1
@@ -5,7 +5,6 @@ function Test-CommonAttachmentFilter {
         # Aligned
         # Parameters can be added if needed
     )
-
     begin {
         <#
             Conditions for 2.1.2 (L1) Ensure the Common Attachment Types Filter is enabled
diff --git a/source/tests/Test-CustomerLockbox.ps1 b/source/tests/Test-CustomerLockbox.ps1
index d71cf5e..9f4b830 100644
--- a/source/tests/Test-CustomerLockbox.ps1
+++ b/source/tests/Test-CustomerLockbox.ps1
@@ -29,7 +29,6 @@ function Test-CustomerLockbox {
         #   - Condition B: Using the SecureScore portal, the Customer Lockbox feature is not enabled.
         #   - Condition C: Using PowerShell, the Customer Lockbox feature is not set to `True`.
     }
-
     process {
         try {
             # Step: Retrieve the organization configuration (Condition C: Pass/Fail)
@@ -43,7 +42,6 @@ function Test-CustomerLockbox {
             else {
                 "N/A"
             }
-
             # Step: Prepare details for the audit result (Condition A, B, & C: Pass/Fail)
             $details = if ($customerLockboxEnabled) {
                 "Customer Lockbox Enabled: True"
@@ -51,7 +49,6 @@ function Test-CustomerLockbox {
             else {
                 "Customer Lockbox Enabled: False"
             }
-
             # Step: Create and populate the CISAuditResult object
             $params = @{
                 Rec            = $recnum
@@ -67,7 +64,6 @@ function Test-CustomerLockbox {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult
diff --git a/source/tests/Test-ExternalSharingCalendars.ps1 b/source/tests/Test-ExternalSharingCalendars.ps1
index 9cf01d9..0a43079 100644
--- a/source/tests/Test-ExternalSharingCalendars.ps1
+++ b/source/tests/Test-ExternalSharingCalendars.ps1
@@ -5,11 +5,9 @@ function Test-ExternalSharingCalendars {
         # Aligned
         # Parameters can be added if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
         # Initialization code, if needed
         $recnum = "1.3.3"
         Write-Verbose "Running Test-ExternalSharingCalendars for $recnum..."
@@ -27,7 +25,6 @@ function Test-ExternalSharingCalendars {
         #   - Condition A: In the Microsoft 365 admin center, external calendar sharing is enabled.
         #   - Condition B: Using the Exchange Online PowerShell Module, the `OrganizationConfig` property `ExternalSharingEnabled` is set to `True`.
     }
-
     process {
         try {
             # Step: Retrieve sharing policies related to calendar sharing
@@ -87,7 +84,6 @@ function Test-ExternalSharingCalendars {
             else {
                 "Enabled Sharing Policies:`n$($sharingPolicyDetails -join ', ')"
             }
-
             # Step: Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -103,7 +99,6 @@ function Test-ExternalSharingCalendars {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult
diff --git a/source/tests/Test-IdentifyExternalEmail.ps1 b/source/tests/Test-IdentifyExternalEmail.ps1
index 571b41d..5191899 100644
--- a/source/tests/Test-IdentifyExternalEmail.ps1
+++ b/source/tests/Test-IdentifyExternalEmail.ps1
@@ -9,10 +9,9 @@ function Test-IdentifyExternalEmail {
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
         # Initialization code, if needed
         $recnum = "6.2.3"
-
+        Write-Verbose "Running Test-IdentifyExternalEmail for $recnum..."
         # Conditions for 6.2.3 (L1) Ensure email from external senders is identified
         #
         # Validate test for a pass:
@@ -29,16 +28,12 @@ function Test-IdentifyExternalEmail {
         #   - Condition B: The BypassAllowList contains unauthorized email addresses.
         #   - Condition C: External sender tag does not appear in email messages received from external sources.
     }
-
     process {
-
         try {
             # 6.2.3 (L1) Ensure email from external senders is identified
-
             # Retrieve external sender tagging configuration
             $externalInOutlook = Get-CISExoOutput -Rec $recnum
             $externalTaggingEnabled = ($externalInOutlook | ForEach-Object { $_.Enabled }) -contains $true
-
             # Prepare failure reasons and details based on compliance
             $failureReasons = if (-not $externalTaggingEnabled) {
                 # Condition A: External tagging is not enabled using PowerShell for all identities.
@@ -47,10 +42,8 @@ function Test-IdentifyExternalEmail {
             else {
                 "N/A"
             }
-
             # Details for external tagging configuration
             $details = "Enabled: $($externalTaggingEnabled); AllowList: $($externalInOutlook.AllowList)"
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -66,7 +59,6 @@ function Test-IdentifyExternalEmail {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult
diff --git a/source/tests/Test-MailTipsEnabled.ps1 b/source/tests/Test-MailTipsEnabled.ps1
index aa6d6bc..be58075 100644
--- a/source/tests/Test-MailTipsEnabled.ps1
+++ b/source/tests/Test-MailTipsEnabled.ps1
@@ -5,15 +5,12 @@ function Test-MailTipsEnabled {
         # Aligned
         # Parameters can be added if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
-
-        $auditResult = [CISAuditResult]::new()
         $recnum = "6.5.2"
-
+        Write-Verbose "Running Test-MailTipsEnabled for $recnum..."
         # Conditions for 6.5.2 (L2) Ensure MailTips are enabled for end users
         #
         # Validate test for a pass:
@@ -32,18 +29,14 @@ function Test-MailTipsEnabled {
         #   - Condition C: MailTipsGroupMetricsEnabled is not set to True.
         #   - Condition D: MailTipsLargeAudienceThreshold is not set to an acceptable value (default is 25).
     }
-
     process {
         try {
             # 6.5.2 (L2) Ensure MailTips are enabled for end users
-
             # Retrieve organization configuration for MailTips settings
             $orgConfig = Get-CISExoOutput -Rec $recnum
-
             # Check the MailTips settings (Conditions A, B, C, D)
             $allTipsEnabled = $orgConfig.MailTipsAllTipsEnabled -and $orgConfig.MailTipsGroupMetricsEnabled -and $orgConfig.MailTipsLargeAudienceThreshold -eq 25
             $externalRecipientsTipsEnabled = $orgConfig.MailTipsExternalRecipientsTipsEnabled
-
             # Prepare failure reasons and details based on compliance
             $failureReasons = if (-not ($allTipsEnabled -and $externalRecipientsTipsEnabled)) {
                 "One or more MailTips settings are not configured as required."
@@ -51,14 +44,12 @@ function Test-MailTipsEnabled {
             else {
                 "N/A"
             }
-
             $details = if ($allTipsEnabled -and $externalRecipientsTipsEnabled) {
                 "MailTipsAllTipsEnabled: $($orgConfig.MailTipsAllTipsEnabled); MailTipsExternalRecipientsTipsEnabled: $($orgConfig.MailTipsExternalRecipientsTipsEnabled); MailTipsGroupMetricsEnabled: $($orgConfig.MailTipsGroupMetricsEnabled); MailTipsLargeAudienceThreshold: $($orgConfig.MailTipsLargeAudienceThreshold)"
             }
             else {
                 "One or more MailTips settings are not configured as required."
             }
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -74,7 +65,6 @@ function Test-MailTipsEnabled {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult
diff --git a/source/tests/Test-MailboxAuditingE3.ps1 b/source/tests/Test-MailboxAuditingE3.ps1
index d05c18c..ab6b2dc 100644
--- a/source/tests/Test-MailboxAuditingE3.ps1
+++ b/source/tests/Test-MailboxAuditingE3.ps1
@@ -4,11 +4,9 @@ function Test-MailboxAuditingE3 {
     param (
         # Parameters can be added if needed
     )
-
     begin {
         <#
         Conditions for 6.1.2 (L1) Ensure mailbox auditing for E3 users is Enabled
-
         Validate test for a pass:
         - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
         - Specific conditions to check:
@@ -16,7 +14,6 @@ function Test-MailboxAuditingE3 {
           - Condition B: The `AuditAdmin` actions include `ApplyRecord`, `Create`, `HardDelete`, `MoveToDeletedItems`, `SendAs`, `SendOnBehalf`, `SoftDelete`, `Update`, `UpdateCalendarDelegation`, `UpdateFolderPermissions`, and `UpdateInboxRules`.
           - Condition C: The `AuditDelegate` actions include `ApplyRecord`, `Create`, `HardDelete`, `MoveToDeletedItems`, `SendAs`, `SendOnBehalf`, `SoftDelete`, `Update`, `UpdateFolderPermissions`, and `UpdateInboxRules`.
           - Condition D: The `AuditOwner` actions include `ApplyRecord`, `HardDelete`, `MoveToDeletedItems`, `SoftDelete`, `Update`, `UpdateCalendarDelegation`, `UpdateFolderPermissions`, and `UpdateInboxRules`.
-
         Validate test for a fail:
         - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
         - Specific conditions to check:
@@ -25,24 +22,19 @@ function Test-MailboxAuditingE3 {
           - Condition C: The `AuditDelegate` actions do not include `ApplyRecord`, `Create`, `HardDelete`, `MoveToDeletedItems`, `SendAs`, `SendOnBehalf`, `SoftDelete`, `Update`, `UpdateFolderPermissions`, and `UpdateInboxRules`.
           - Condition D: The `AuditOwner` actions do not include `ApplyRecord`, `HardDelete`, `MoveToDeletedItems`, `SoftDelete`, `Update`, `UpdateCalendarDelegation`, `UpdateFolderPermissions`, and `UpdateInboxRules`.
         #>
-
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
-
         $actionDictionaries = Get-Action -Dictionaries
         # E3 specific actions
         $AdminActions = $actionDictionaries.AdminActions.Keys | Where-Object { $_ -notin @("MailItemsAccessed", "Send") }
         $DelegateActions = $actionDictionaries.DelegateActions.Keys | Where-Object { $_ -notin @("MailItemsAccessed") }
         $OwnerActions = $actionDictionaries.OwnerActions.Keys | Where-Object { $_ -notin @("MailItemsAccessed", "Send") }
-
         $allFailures = @()
         $recnum = "6.1.2"
+        Write-Verbose "Running Test-MailboxAuditingE3 for $recnum..."
         $allUsers = Get-CISMgOutput -Rec $recnum
         $processedUsers = @{}  # Dictionary to track processed users
-
     }
-
     process {
         if ($null -ne $allUsers) {
             $mailboxes = Get-CISExoOutput -Rec $recnum
@@ -52,14 +44,11 @@ function Test-MailboxAuditingE3 {
                         Write-Verbose "Skipping already processed user: $($user.UserPrincipalName)"
                         continue
                     }
-
                     $userUPN = $user.UserPrincipalName
                     $mailbox = $mailboxes | Where-Object { $_.UserPrincipalName -eq $user.UserPrincipalName }
-
                     $missingAdminActions = @()
                     $missingDelegateActions = @()
                     $missingOwnerActions = @()
-
                     if ($mailbox.AuditEnabled) {
                         foreach ($action in $AdminActions) {
                             if ($mailbox.AuditAdmin -notcontains $action) {
@@ -76,7 +65,6 @@ function Test-MailboxAuditingE3 {
                                 $missingOwnerActions += (Get-Action -Actions $action -ActionType "Owner")
                             }
                         }
-
                         if ($missingAdminActions.Count -gt 0 -or $missingDelegateActions.Count -gt 0 -or $missingOwnerActions.Count -gt 0) {
                             $allFailures += "$userUPN|True|$($missingAdminActions -join ',')|$($missingDelegateActions -join ',')|$($missingOwnerActions -join ',')"
                         }
@@ -84,11 +72,9 @@ function Test-MailboxAuditingE3 {
                     else {
                         $allFailures += "$userUPN|False|||" # Condition A for fail
                     }
-
                     # Mark the user as processed
                     $processedUsers[$user.UserPrincipalName] = $true
                 }
-
                 # Prepare failure reasons and details based on compliance
                 if ($allFailures.Count -eq 0) {
                     $failureReasons = "N/A"
@@ -102,7 +88,6 @@ function Test-MailboxAuditingE3 {
                 else {
                     "UserPrincipalName|AuditEnabled|AdminActionsMissing|DelegateActionsMissing|OwnerActionsMissing`n" + ($allFailures -join "`n")
                 }
-
                 # Populate the audit result
                 $params = @{
                     Rec           = $recnum
@@ -115,13 +100,10 @@ function Test-MailboxAuditingE3 {
             }
             catch {
                 Write-Error "An error occurred during the test: $_"
-
                 # Retrieve the description from the test definitions
                 $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
                 $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
                 $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
                 # Call Initialize-CISAuditResult with error parameters
                 $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
             }
@@ -137,15 +119,12 @@ function Test-MailboxAuditingE3 {
             $auditResult = Initialize-CISAuditResult @params
         }
     }
-
     end {
         $detailsLength = $details.Length
         Write-Verbose "Character count of the details: $detailsLength"
-
         if ($detailsLength -gt 32767) {
             Write-Verbose "Warning: The character count exceeds the limit for Excel cells."
         }
-
         return $auditResult
     }
 }
diff --git a/source/tests/Test-MailboxAuditingE5.ps1 b/source/tests/Test-MailboxAuditingE5.ps1
index f0ee6be..0bc9020 100644
--- a/source/tests/Test-MailboxAuditingE5.ps1
+++ b/source/tests/Test-MailboxAuditingE5.ps1
@@ -4,11 +4,9 @@ function Test-MailboxAuditingE5 {
     param (
         # Parameters can be added if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
         # Conditions for 6.1.3 (L1) Ensure mailbox auditing for E5 users is Enabled
         #
         # Validate test for a pass:
@@ -26,18 +24,16 @@ function Test-MailboxAuditingE5 {
         #   - Condition B: AuditAdmin actions do not include all of the following: ApplyRecord, Create, HardDelete, MailItemsAccessed, MoveToDeletedItems, Send, SendAs, SendOnBehalf, SoftDelete, Update, UpdateCalendarDelegation, UpdateFolderPermissions, UpdateInboxRules.
         #   - Condition C: AuditDelegate actions do not include all of the following: ApplyRecord, Create, HardDelete, MailItemsAccessed, MoveToDeletedItems, SendAs, SendOnBehalf, SoftDelete, Update, UpdateFolderPermissions, UpdateInboxRules.
         #   - Condition D: AuditOwner actions do not include all of the following: ApplyRecord, HardDelete, MailItemsAccessed, MoveToDeletedItems, Send, SoftDelete, Update, UpdateCalendarDelegation, UpdateFolderPermissions, UpdateInboxRules.
-
         $actionDictionaries = Get-Action -Dictionaries
         $AdminActions = $actionDictionaries.AdminActions.Keys
         $DelegateActions = $actionDictionaries.DelegateActions.Keys
         $OwnerActions = $actionDictionaries.OwnerActions.Keys
-
         $allFailures = @()
         $processedUsers = @{}
         $recnum = "6.1.3"
+        Write-Verbose "Running Test-MailboxAuditingE5 for $recnum..."
         $allUsers = Get-CISMgOutput -Rec $recnum
     }
-
     process {
         if ($null -ne $allUsers) {
             $mailboxes = Get-CISExoOutput -Rec $recnum
@@ -47,14 +43,11 @@ function Test-MailboxAuditingE5 {
                         Write-Verbose "Skipping already processed user: $($user.UserPrincipalName)"
                         continue
                     }
-
                     $mailbox = $mailboxes | Where-Object { $_.UserPrincipalName -eq $user.UserPrincipalName }
                     $userUPN = $user.UserPrincipalName
-
                     $missingAdminActions = @()
                     $missingDelegateActions = @()
                     $missingOwnerActions = @()
-
                     if ($mailbox.AuditEnabled) {
                         # Validate Admin actions
                         foreach ($action in $AdminActions) {
@@ -74,7 +67,6 @@ function Test-MailboxAuditingE5 {
                                 $missingOwnerActions += (Get-Action -Actions $action -ActionType "Owner") # Condition D
                             }
                         }
-
                         if ($missingAdminActions.Count -gt 0 -or $missingDelegateActions.Count -gt 0 -or $missingOwnerActions.Count -gt 0) {
                             $allFailures += "$userUPN|True|$($missingAdminActions -join ',')|$($missingDelegateActions -join ',')|$($missingOwnerActions -join ',')"
                         }
@@ -82,11 +74,9 @@ function Test-MailboxAuditingE5 {
                     else {
                         $allFailures += "$userUPN|False|||" # Condition A for fail
                     }
-
                     # Mark the user as processed
                     $processedUsers[$user.UserPrincipalName] = $true
                 }
-
                 # Prepare failure reasons and details based on compliance
                 if ($allFailures.Count -eq 0) {
                     $failureReasons = "N/A"
@@ -113,13 +103,10 @@ function Test-MailboxAuditingE5 {
             }
             catch {
                 Write-Error "An error occurred during the test: $_"
-
                 # Retrieve the description from the test definitions
                 $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
                 $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
                 $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
                 # Call Initialize-CISAuditResult with error parameters
                 $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
             }
@@ -135,15 +122,12 @@ function Test-MailboxAuditingE5 {
             $auditResult = Initialize-CISAuditResult @params
         }
     }
-
     end {
         $detailsLength = $details.Length
         Write-Verbose "Character count of the details: $detailsLength"
-
         if ($detailsLength -gt 32767) {
             Write-Verbose "Warning: The character count exceeds the limit for Excel cells."
         }
-
         return $auditResult
     }
 }
\ No newline at end of file
diff --git a/source/tests/Test-ModernAuthExchangeOnline.ps1 b/source/tests/Test-ModernAuthExchangeOnline.ps1
index d4cd0bc..90f82d5 100644
--- a/source/tests/Test-ModernAuthExchangeOnline.ps1
+++ b/source/tests/Test-ModernAuthExchangeOnline.ps1
@@ -5,11 +5,9 @@ function Test-ModernAuthExchangeOnline {
         # Aligned
         # Define your parameters here
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
         # Conditions for 6.5.1 (L1) Ensure modern authentication for Exchange Online is enabled
         #
         # Validate test for a pass:
@@ -25,17 +23,14 @@ function Test-ModernAuthExchangeOnline {
         #   - Condition A: Modern authentication for Exchange Online is not enabled.
         #   - Condition B: Exchange Online clients do not use modern authentication to log in to Microsoft 365 mailboxes.
         #   - Condition C: Users of older email clients, such as Outlook 2013 and Outlook 2016, are still able to authenticate to Exchange using Basic Authentication.
-
         $recnum = "6.5.1"
+        Write-Verbose "Running Test-ModernAuthExchangeOnline for $recnum..."
     }
-
     process {
         try {
             # 6.5.1 (L1) Ensure modern authentication for Exchange Online is enabled
-
             # Check modern authentication setting in Exchange Online configuration (Condition A and B)
             $orgConfig = Get-CISExoOutput -Rec $recnum
-
             # Prepare failure reasons and details based on compliance
             $failureReasons = if (-not $orgConfig.OAuth2ClientProfileEnabled) {
                 "Modern authentication is disabled"
@@ -43,10 +38,8 @@ function Test-ModernAuthExchangeOnline {
             else {
                 "N/A"
             }
-
             # Details include the current setting (Condition A and B)
             $details = "OAuth2ClientProfileEnabled: $($orgConfig.OAuth2ClientProfileEnabled) for Organization: $($orgConfig.Name)"
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -56,15 +49,12 @@ function Test-ModernAuthExchangeOnline {
                 FailureReason = $failureReasons
             }
             $auditResult = Initialize-CISAuditResult @params
-
         }
         catch {
             $LastError = $_
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-
     }
-
     end {
         # Return the audit result
         return $auditResult
diff --git a/source/tests/Test-NoWhitelistDomains.ps1 b/source/tests/Test-NoWhitelistDomains.ps1
index da28030..dc8f958 100644
--- a/source/tests/Test-NoWhitelistDomains.ps1
+++ b/source/tests/Test-NoWhitelistDomains.ps1
@@ -5,24 +5,20 @@ function Test-NoWhitelistDomains {
         # Aligned
         # Define your parameters here
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
         # Initialization code, if needed
         $recnum = "6.2.2"
-
+        Write-Verbose "Running Test-NoWhitelistDomains for $recnum..."
         <#
         Conditions for 6.2.2 (L1) Ensure mail transport rules do not whitelist specific domains (Automated)
-
         Validate test for a pass:
         - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
         - Specific conditions to check:
           - Condition A: No mail transport rules whitelist any specific domains.
           - Condition B: Verification of mail transport rules using PowerShell shows no domains are whitelisted.
           - Condition C: Manual review in Exchange Online admin center confirms no whitelisted domains in transport rules.
-
         Validate test for a fail:
         - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
         - Specific conditions to check:
@@ -31,11 +27,9 @@ function Test-NoWhitelistDomains {
           - Condition C: Manual review in Exchange Online admin center shows whitelisted domains in transport rules.
         #>
     }
-
     process {
         try {
             # 6.2.2 (L1) Ensure mail transport rules do not whitelist specific domains
-
             # Retrieve transport rules that whitelist specific domains
             # Condition A: Checking for transport rules that whitelist specific domains
             $whitelistedRules = Get-CISExoOutput -Rec $recnum
@@ -47,7 +41,6 @@ function Test-NoWhitelistDomains {
             else {
                 "N/A"
             }
-
             # Condition C: Prepare details about the whitelisted rules if found
             $details = if ($whitelistedRules) {
                 $ruleDetails = $whitelistedRules | ForEach-Object { "{0}: {1}" -f $_.Name, ($_.SenderDomainIs -join ', ') }
@@ -56,7 +49,6 @@ function Test-NoWhitelistDomains {
             else {
                 "No transport rules whitelisting specific domains found."
             }
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -72,7 +64,6 @@ function Test-NoWhitelistDomains {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return auditResult
         return $auditResult
diff --git a/source/tests/Test-NotifyMalwareInternal.ps1 b/source/tests/Test-NotifyMalwareInternal.ps1
index 380bcf5..f836b8a 100644
--- a/source/tests/Test-NotifyMalwareInternal.ps1
+++ b/source/tests/Test-NotifyMalwareInternal.ps1
@@ -5,7 +5,6 @@ function Test-NotifyMalwareInternal {
         # Aligned
         # Parameters can be added if needed
     )
-
     begin {
         <#
         # Conditions for 2.1.3 (L1) Ensure notifications for internal users sending malware is Enabled
@@ -22,14 +21,12 @@ function Test-NotifyMalwareInternal {
         #   - Condition A: Notifications for internal users sending malware are not enabled in the Microsoft 365 Security & Compliance Center.
         #   - Condition B: Using PowerShell, the `NotifyInternal` property in the anti-malware policy is set to `False` or does not include any valid email addresses for notifications.
         #>
-
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
         $recnum = "2.1.3"
         Write-Verbose "Running Test-NotifyMalwareInternal for $recnum..."
     }
-
     process {
         try {
             # 2.1.3 Ensure notifications for internal users sending malware is Enabled
@@ -51,7 +48,6 @@ function Test-NotifyMalwareInternal {
                 )
             #>
             $malwareNotifications = Get-CISExoOutput -Rec $recnum
-
             # Condition B: Using PowerShell, the `NotifyInternal` property in the anti-malware policy is set to `True` and includes at least one valid email address for notifications.
             $policiesToReport = @()
             foreach ($policy in $malwareNotifications) {
@@ -59,10 +55,8 @@ function Test-NotifyMalwareInternal {
                     $policiesToReport += "$($policy.Identity): Notifications Disabled"
                 }
             }
-
             # Determine the result based on the presence of custom policies without notifications
             $result = $policiesToReport.Count -eq 0
-
             # Prepare failure reasons and details based on compliance
             $failureReasons = if ($result) {
                 "N/A"
@@ -71,14 +65,12 @@ function Test-NotifyMalwareInternal {
                 # Condition A: Notifications for internal users sending malware are not enabled in the Microsoft 365 Security & Compliance Center.
                 "Some custom policies do not have notifications for internal users sending malware enabled."
             }
-
             $details = if ($result) {
                 "All custom malware policies have notifications enabled."
             }
             else {
                 "Misconfigured Policies: $($policiesToReport -join '`n')"
             }
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -94,7 +86,6 @@ function Test-NotifyMalwareInternal {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult
diff --git a/source/tests/Test-ReportSecurityInTeams.ps1 b/source/tests/Test-ReportSecurityInTeams.ps1
index 589fa6f..2080cb1 100644
--- a/source/tests/Test-ReportSecurityInTeams.ps1
+++ b/source/tests/Test-ReportSecurityInTeams.ps1
@@ -5,20 +5,17 @@ function Test-ReportSecurityInTeams {
         # Aligned
         # Parameters can be defined here if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
         # Initialization code, if needed
         $recnum = "8.6.1"
+        Write-Verbose "Running Test-ReportSecurityInTeams for $recnum..."
     }
-
     process {
         try {
             # Test-ReportSecurityInTeams.ps1
             # 8.6.1 (L1) Ensure users can report security concerns in Teams
-
             # Retrieve the necessary settings for Teams and Exchange Online
             # Condition A: Ensure the 'Report a security concern' setting in the Teams admin center is set to 'On'.
             $CsTeamsMessagingPolicy = Get-CISMSTeamsOutput -Rec $recnum
@@ -35,7 +32,6 @@ function Test-ReportSecurityInTeams {
             $null -ne $ReportSubmissionPolicy.ReportPhishAddresses -and
             $ReportSubmissionPolicy.ReportChatMessageToCustomizedAddressEnabled -and
             -not $ReportSubmissionPolicy.ReportChatMessageEnabled
-
             $detailsString = @"
 The following settings are required for users to report security concerns in Teams:
 
@@ -75,7 +71,6 @@ ReportChatMessageToCustomizedAddressEnabled: True
             else {
                 $faildetailstring
             }
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -91,7 +86,6 @@ ReportChatMessageToCustomizedAddressEnabled: True
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult
diff --git a/source/tests/Test-RestrictOutlookAddins.ps1 b/source/tests/Test-RestrictOutlookAddins.ps1
index 4952b24..94755d0 100644
--- a/source/tests/Test-RestrictOutlookAddins.ps1
+++ b/source/tests/Test-RestrictOutlookAddins.ps1
@@ -5,16 +5,14 @@ function Test-RestrictOutlookAddins {
         # Aligned
         # Parameters could include credentials or other necessary data
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
         # Initialization code
         $defaultPolicyFailureDetails = @()
         $relevantRoles = @('My Custom Apps', 'My Marketplace Apps', 'My ReadWriteMailbox Apps')
         $recnum = "6.3.1"
-
+        Write-Verbose "Running Test-RestrictOutlookAddins for $recnum..."
         # Conditions for 6.3.1 (L2) Ensure users installing Outlook add-ins is not allowed
         #
         # Validate test for a pass:
@@ -29,21 +27,17 @@ function Test-RestrictOutlookAddins {
         #   - Condition A: One or more of the roles MyCustomApps, MyMarketplaceApps, and MyReadWriteMailboxApps are checked under Other roles.
         #   - Condition B: Using PowerShell, verify that MyCustomApps, MyMarketplaceApps, and MyReadWriteMailboxApps are assigned to users.
     }
-
     process {
         try {
             # 6.3.1 (L2) Ensure users installing Outlook add-ins is not allowed
-
             # Check all mailboxes for custom policies with unallowed add-ins
             # Check Default Role Assignment Policy
             $customPolicyFailures, $defaultPolicy = Get-CISExoOutput -Rec $recnum
             $defaultPolicyRoles = $defaultPolicy.AssignedRoles | Where-Object { $_ -in $relevantRoles }
-
             # Condition A: Verify that the roles MyCustomApps, MyMarketplaceApps, and MyReadWriteMailboxApps are unchecked under Other roles.
             if ($defaultPolicyRoles) {
                 $defaultPolicyFailureDetails = $defaultPolicyRoles
             }
-
             # Prepare result details string
             $detailsString = ""
             if ($customPolicyFailures) {
@@ -53,7 +47,6 @@ function Test-RestrictOutlookAddins {
             else {
                 $detailsString += "Custom Policy Failures: None | "
             }
-
             $detailsString += "Default Role Assignment Policy: "
             if ($defaultPolicyFailureDetails) {
                 $detailsString += ($defaultPolicyFailureDetails -join ', ')
@@ -61,10 +54,8 @@ function Test-RestrictOutlookAddins {
             else {
                 $detailsString += "Compliant"
             }
-
             # Determine result based on findings
             $isCompliant = -not ($customPolicyFailures -or $defaultPolicyFailureDetails)
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -80,7 +71,6 @@ function Test-RestrictOutlookAddins {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult
diff --git a/source/tests/Test-RestrictStorageProvidersOutlook.ps1 b/source/tests/Test-RestrictStorageProvidersOutlook.ps1
index 1db39e5..0160d82 100644
--- a/source/tests/Test-RestrictStorageProvidersOutlook.ps1
+++ b/source/tests/Test-RestrictStorageProvidersOutlook.ps1
@@ -5,7 +5,6 @@ function Test-RestrictStorageProvidersOutlook {
         # Aligned
         # Parameters can be added here if needed
     )
-
     begin {
         <#
         # 6.5.3 (L2) Ensure additional storage providers are restricted in Outlook on the web
@@ -22,25 +21,21 @@ function Test-RestrictStorageProvidersOutlook {
         #   - Condition A: Using PowerShell, verify that `AdditionalStorageProvidersAvailable` is not set to `False` in the OwaMailboxPolicy.
         #   - Condition B: Ensure that the command `Get-OwaMailboxPolicy | Format-Table Name, AdditionalStorageProvidersAvailable` does not return `False`.
         #>
-
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
         $recnum = "6.5.3"
+        Write-Verbose "Running Test-RestrictStorageProvidersOutlook for $recnum..."
     }
-
     process {
         try {
             # 6.5.3 (L2) Ensure additional storage providers are restricted in Outlook on the web
-
             # Retrieve all OwaMailbox policies
             $owaPolicies = Get-CISExoOutput -Rec $recnum
             # Condition A: Check if AdditionalStorageProvidersAvailable is set to False
             $nonCompliantPolicies = $owaPolicies | Where-Object { $_.AdditionalStorageProvidersAvailable }
-
             # Determine compliance
             $allPoliciesRestricted = $nonCompliantPolicies.Count -eq 0
-
             # Prepare failure reasons and details based on compliance
             $failureReasons = if ($allPoliciesRestricted) {
                 "N/A"
@@ -48,14 +43,12 @@ function Test-RestrictStorageProvidersOutlook {
             else {
                 "One or more OwaMailbox policies allow AdditionalStorageProvidersAvailable."
             }
-
             $details = if ($allPoliciesRestricted) {
                 "All OwaMailbox policies restrict AdditionalStorageProvidersAvailable"
             }
             else {
                 "Non-compliant OwaMailbox policies: $($nonCompliantPolicies.Name -join ', ')"
             }
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -71,7 +64,6 @@ function Test-RestrictStorageProvidersOutlook {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult
diff --git a/source/tests/Test-SafeAttachmentsPolicy.ps1 b/source/tests/Test-SafeAttachmentsPolicy.ps1
index 2065728..9337729 100644
--- a/source/tests/Test-SafeAttachmentsPolicy.ps1
+++ b/source/tests/Test-SafeAttachmentsPolicy.ps1
@@ -2,7 +2,6 @@ function Test-SafeAttachmentsPolicy {
     [CmdletBinding()]
     [OutputType([CISAuditResult])]
     param ()
-
     begin {
         $recnum = "2.1.4"
         Write-Verbose "Running Test-SafeAttachmentsPolicy for $recnum..."
@@ -13,7 +12,6 @@ function Test-SafeAttachmentsPolicy {
                 - Check if the policy's action is set to 'Block'.
                 - Confirm the QuarantineTag is set to 'AdminOnlyAccessPolicy'.
                 - Verify that the Redirect setting is disabled.
-
             Validate test for a fail:
                 - If the highest priority Safe Attachments policy's action is not set to 'Block'.
                 - If the QuarantineTag is not set to 'AdminOnlyAccessPolicy'.
@@ -55,11 +53,11 @@ function Test-SafeAttachmentsPolicy {
                 # The result is a pass if there are no failure reasons
                 $result = $failureReasons.Count -eq 0
                 $details = [PSCustomObject]@{
-                    Policy          = $highestPriorityPolicy.Identity
-                    Action          = $highestPriorityPolicy.Action
-                    QuarantineTag   = $highestPriorityPolicy.QuarantineTag
-                    Redirect        = $highestPriorityPolicy.Redirect
-                    Enabled         = $highestPriorityPolicy.Enable
+                    Policy        = $highestPriorityPolicy.Identity
+                    Action        = $highestPriorityPolicy.Action
+                    QuarantineTag = $highestPriorityPolicy.QuarantineTag
+                    Redirect      = $highestPriorityPolicy.Redirect
+                    Enabled       = $highestPriorityPolicy.Enable
                 }
                 # Format details for output manually
                 $detailsString = "Policy|Action|QuarantineTag|Redirect|Enabled`n" + ($details |
diff --git a/source/tests/Test-SafeAttachmentsTeams.ps1 b/source/tests/Test-SafeAttachmentsTeams.ps1
index c850c7e..b9f29b9 100644
--- a/source/tests/Test-SafeAttachmentsTeams.ps1
+++ b/source/tests/Test-SafeAttachmentsTeams.ps1
@@ -8,7 +8,6 @@ function Test-SafeAttachmentsTeams {
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
         # Conditions for 2.1.5 (L2) Ensure Safe Attachments for SharePoint, OneDrive, and Microsoft Teams is Enabled
         #
         # Validate test for a pass:
@@ -24,7 +23,6 @@ function Test-SafeAttachmentsTeams {
         #   - Condition A: Safe Attachments for SharePoint is not enabled.
         #   - Condition B: Safe Attachments for OneDrive is not enabled.
         #   - Condition C: Safe Attachments for Microsoft Teams is not enabled.
-
         # Initialization code, if needed
         $recnum = "2.1.5"
         Write-Verbose "Running Test-SafeAttachmentsTeams for $recnum..."
diff --git a/source/tests/Test-SafeLinksOfficeApps.ps1 b/source/tests/Test-SafeLinksOfficeApps.ps1
index 154a28d..d41777f 100644
--- a/source/tests/Test-SafeLinksOfficeApps.ps1
+++ b/source/tests/Test-SafeLinksOfficeApps.ps1
@@ -5,7 +5,6 @@ function Test-SafeLinksOfficeApps {
         # Aligned
         # Define your parameters here if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
@@ -14,7 +13,6 @@ function Test-SafeLinksOfficeApps {
         Write-Verbose "Running Test-SafeLinksOfficeApps for $recnum..."
         <#
         Conditions for 2.1.1 (L2) Ensure Safe Links for Office Applications is Enabled
-
         Validate test for a pass:
         - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
         - Specific conditions to check:
@@ -25,7 +23,6 @@ function Test-SafeLinksOfficeApps {
             - Click protection settings: On
             - Do not track when users click safe links: Off
           - Condition B: Using the Exchange Online PowerShell Module, Safe Links policies are retrieved, and the relevant policy shows Safe Links for Office applications is enabled.
-
         Validate test for a fail:
         - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
         - Specific conditions to check:
@@ -38,7 +35,6 @@ function Test-SafeLinksOfficeApps {
           - Condition B: Using the Exchange Online PowerShell Module, Safe Links policies are retrieved, and the relevant policy shows Safe Links for Office applications is not enabled.
         #>
     }
-
     process {
         # 2.1.1 (L2) Ensure Safe Links for Office Applications is Enabled
         # Retrieve all Safe Links policies
@@ -51,7 +47,6 @@ function Test-SafeLinksOfficeApps {
                 $result = $misconfiguredDetails.Count -eq 0
                 $details = if ($result) { "All Safe Links policies are correctly configured." } else { $misconfiguredDetails -join '`n' }
                 $failureReasons = if ($result) { "N/A" } else { "The following Safe Links policies settings do not meet the recommended configuration: $($misconfiguredDetails -join ' | ')" }
-
                 # Create and populate the CISAuditResult object
                 $params = @{
                     Rec           = $recnum
@@ -64,13 +59,10 @@ function Test-SafeLinksOfficeApps {
             }
             catch {
                 Write-Error "An error occurred during the test: $_"
-
                 # Retrieve the description from the test definitions
                 $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
                 $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
                 $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
                 # Call Initialize-CISAuditResult with error parameters
                 $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
             }
@@ -86,7 +78,6 @@ function Test-SafeLinksOfficeApps {
             $auditResult = Initialize-CISAuditResult @params
         }
     }
-
     end {
         # Return the audit result
         return $auditResult
diff --git a/source/tests/Test-SpamPolicyAdminNotify.ps1 b/source/tests/Test-SpamPolicyAdminNotify.ps1
index 5f39b31..194b441 100644
--- a/source/tests/Test-SpamPolicyAdminNotify.ps1
+++ b/source/tests/Test-SpamPolicyAdminNotify.ps1
@@ -2,7 +2,6 @@ function Test-SpamPolicyAdminNotify {
     [CmdletBinding()]
     [OutputType([CISAuditResult])]
     param ()
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1

From 2c407a469c33e1b30f8dcf00b73d56763521f496 Mon Sep 17 00:00:00 2001
From: DrIOS <58635327+DrIOSX@users.noreply.github.com>
Date: Sat, 29 Jun 2024 20:00:00 -0500
Subject: [PATCH 21/24] fix: Update main function paramter DomainName

---
 source/Public/Invoke-M365SecurityAudit.ps1 | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/source/Public/Invoke-M365SecurityAudit.ps1 b/source/Public/Invoke-M365SecurityAudit.ps1
index 6d63b5b..feea04b 100644
--- a/source/Public/Invoke-M365SecurityAudit.ps1
+++ b/source/Public/Invoke-M365SecurityAudit.ps1
@@ -5,7 +5,7 @@
         The Invoke-M365SecurityAudit cmdlet performs a comprehensive security audit based on the specified parameters. It allows auditing of various configurations and settings within a Microsoft 365 environment, such as compliance with CIS benchmarks.
     .PARAMETER TenantAdminUrl
         The URL of the tenant admin. If not specified, none of the SharePoint Online tests will run.
-    .PARAMETER M365DomainForPWPolicyTest
+    .PARAMETER DomainName
         The domain name of the Microsoft 365 environment to test. This parameter is not mandatory and by default it will pass/fail all found domains as a group if a specific domain is not specified.
     .PARAMETER ELevel
         Specifies the E-Level (E3 or E5) for the audit. This parameter is optional and can be combined with the ProfileLevel parameter.
@@ -46,7 +46,7 @@
                         user2@domain.com| Global Administrator   | Hybrid       | AAD_PREMIUM, AAD_PREMIUM_P2
         FailureReason: Non-Compliant Accounts: 2
     .EXAMPLE
-        PS> Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -M365DomainForPWPolicyTest "contoso.com" -ELevel "E5" -ProfileLevel "L1"
+        PS> Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -DomainName "contoso.com" -ELevel "E5" -ProfileLevel "L1"
 
         Performs a security audit for the E5 level and L1 profile in the specified Microsoft 365 environment.
         Output:
@@ -62,7 +62,7 @@
                         user2@domain.com| Global Administrator   | Hybrid       | AAD_PREMIUM, AAD_PREMIUM_P2
         FailureReason: Non-Compliant Accounts: 2
     .EXAMPLE
-        PS> Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -M365DomainForPWPolicyTest "contoso.com" -IncludeIG1
+        PS> Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -DomainName "contoso.com" -IncludeIG1
 
         Performs an audit including all tests where IG1 is true.
         Output:
@@ -78,7 +78,7 @@
                         user2@domain.com| Global Administrator   | Hybrid       | AAD_PREMIUM, AAD_PREMIUM_P2
         FailureReason: Non-Compliant Accounts: 2
     .EXAMPLE
-        PS> Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -M365DomainForPWPolicyTest "contoso.com" -SkipRecommendation '1.1.3', '2.1.1'
+        PS> Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -DomainName "contoso.com" -SkipRecommendation '1.1.3', '2.1.1'
         Performs an audit while excluding specific recommendations 1.1.3 and 2.1.1.
         Output:
         Status      : Fail
@@ -93,7 +93,7 @@
                         user2@domain.com| Global Administrator   | Hybrid       | AAD_PREMIUM, AAD_PREMIUM_P2
         FailureReason: Non-Compliant Accounts: 2
     .EXAMPLE
-        PS> $auditResults = Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -M365DomainForPWPolicyTest "contoso.com"
+        PS> $auditResults = Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -DomainName "contoso.com"
         PS> $auditResults | Export-Csv -Path "auditResults.csv" -NoTypeInformation
 
         Captures the audit results into a variable and exports them to a CSV file.
@@ -131,7 +131,7 @@ function Invoke-M365SecurityAudit {
 
         [Parameter(Mandatory = $false, HelpMessage = "Specify this to test only the default domain for password expiration policy when '1.3.1' is included in the tests to be run. The domain name of your organization, e.g., 'example.com'.")]
         [ValidatePattern('^[a-zA-Z0-9-]+\.[a-zA-Z]{2,}$')]
-        [string]$M365DomainForPWPolicyTest,
+        [string]$DomainName,
 
         # E-Level with optional ProfileLevel selection
         [Parameter(Mandatory = $true, ParameterSetName = 'ELevelFilter')]
@@ -286,7 +286,7 @@ function Invoke-M365SecurityAudit {
                 Write-Progress -Activity "Executing Tests" -Status "Executing $($currentTestIndex) of $($totalTests): $($testFunction.Name)" -PercentComplete (($currentTestIndex / $totalTests) * 100)
                 $functionName = $testFunction.BaseName
                 if ($PSCmdlet.ShouldProcess($functionName, "Execute test")) {
-                    $auditResult = Invoke-TestFunction -FunctionFile $testFunction -DomainName $M365DomainForPWPolicyTest
+                    $auditResult = Invoke-TestFunction -FunctionFile $testFunction -DomainName $DomainName
                     # Add the result to the collection
                     [void]$allAuditResults.Add($auditResult)
                 }

From 338ed4e871b4d9aa6f2c85c81b26c8946c5c4ab5 Mon Sep 17 00:00:00 2001
From: DrIOS <58635327+DrIOSX@users.noreply.github.com>
Date: Sat, 29 Jun 2024 20:00:46 -0500
Subject: [PATCH 22/24] docs: Update CHANGELOG

---
 CHANGELOG.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f600e29..6f5cf4e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,22 @@ The format is based on and uses the types of changes according to [Keep a Change
 
 ## [Unreleased]
 
+### Added
+
+- Added `Get-PhishPolicyDetail` and `Test-PhishPolicyCompliance` private functions to help test for phishing policy compliance.
+
+### Fixed
+
+- Fixed various EXO test to be more accurate and include more properties in the output.
+
+#### Changed
+
+- Changed main function parameter for Domain to `DomainName`.
+
+
+
+## [0.1.17] - 2024-06-28
+
 ### Fixed
 
 - Fixed `Get-ExceededLengthResultDetail` function paramter validation for Exported Tests to allow for Null.

From aae91a5a195371ec334364c6e3a22b4e496fd1f2 Mon Sep 17 00:00:00 2001
From: DrIOS <58635327+DrIOSX@users.noreply.github.com>
Date: Sat, 29 Jun 2024 20:03:33 -0500
Subject: [PATCH 23/24] docs: Update README/HTML HELP

---
 README.md       | Bin 20489 -> 41524 bytes
 docs/index.html | Bin 54847 -> 111548 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/README.md b/README.md
index 8e92751f4322abc42d5ca8d5b02a76243719e285..d1fb1899666265927ce0f64e6719ce96b9eac202 100644
GIT binary patch
literal 41524
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
Tgxvfzp1fL_`DtrcUjF|8W`=j3

literal 20489
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
KdB^C_d;bP8W0hL~

diff --git a/docs/index.html b/docs/index.html
index 27236b2e47a28c7ddde385fa1c5402281f910ef2..f940d701f8f759fb9b5ef5ec6c8f6dcaedf1c51a 100644
GIT binary patch
literal 111548
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
ZuJ?P1oc99ffd=hgp(Xb9Q_bC1{y(Hkx<&v1

literal 54847
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
UW4ZVPmx7ENMSej#fRXC|0dan-A^-pY


From 5f4df00ceaa746288ab4d54fa126717bdddd3037 Mon Sep 17 00:00:00 2001
From: DrIOS <58635327+DrIOSX@users.noreply.github.com>
Date: Sat, 29 Jun 2024 20:05:04 -0500
Subject: [PATCH 24/24] docs: Update Help/WikiFiles

---
 help/Export-M365SecurityAuditTable.md         |   90 +-
 help/Get-AdminRoleUserLicense.md              |   17 +-
 help/Get-MFAStatus.md                         |   32 +-
 help/Grant-M365SecurityAuditConsent.md        |   68 +-
 help/Invoke-M365SecurityAudit.md              |  194 ++-
 help/M365FoundationsCISReport.md              |    5 +-
 help/Remove-RowsWithEmptyCSVStatus.md         |   18 +-
 help/Sync-CISExcelAndCsvData.md               |   31 +-
 .../en-US/M365FoundationsCISReport-help.xml   | 1356 +++++++----------
 9 files changed, 718 insertions(+), 1093 deletions(-)

diff --git a/help/Export-M365SecurityAuditTable.md b/help/Export-M365SecurityAuditTable.md
index a2a7ba0..858ea30 100644
--- a/help/Export-M365SecurityAuditTable.md
+++ b/help/Export-M365SecurityAuditTable.md
@@ -1,4 +1,4 @@
----
+---
 external help file: M365FoundationsCISReport-help.xml
 Module Name: M365FoundationsCISReport
 online version: https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Export-M365SecurityAuditTable
@@ -15,25 +15,24 @@ Exports M365 security audit results to a CSV file or outputs a specific test res
 ### OutputObjectFromAuditResultsSingle
 ```
 Export-M365SecurityAuditTable [-AuditResults] <CISAuditResult[]> [-OutputTestNumber] <String>
- [-ProgressAction <ActionPreference>] [<CommonParameters>]
+ [<CommonParameters>]
 ```
 
 ### ExportAllResultsFromAuditResults
 ```
 Export-M365SecurityAuditTable [-AuditResults] <CISAuditResult[]> [-ExportAllTests] -ExportPath <String>
- [-ExportOriginalTests] [-ExportToExcel] [-ProgressAction <ActionPreference>] [<CommonParameters>]
+ [-ExportOriginalTests] [-ExportToExcel] [<CommonParameters>]
 ```
 
 ### OutputObjectFromCsvSingle
 ```
-Export-M365SecurityAuditTable [-CsvPath] <String> [-OutputTestNumber] <String>
- [-ProgressAction <ActionPreference>] [<CommonParameters>]
+Export-M365SecurityAuditTable [-CsvPath] <String> [-OutputTestNumber] <String> [<CommonParameters>]
 ```
 
 ### ExportAllResultsFromCsv
 ```
 Export-M365SecurityAuditTable [-CsvPath] <String> [-ExportAllTests] -ExportPath <String> [-ExportOriginalTests]
- [-ExportToExcel] [-ProgressAction <ActionPreference>] [<CommonParameters>]
+ [-ExportToExcel] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -110,6 +109,22 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -OutputTestNumber
+The test number to output as an object.
+Valid values are "1.1.1", "1.3.1", "6.1.2", "6.1.3", "7.3.4".
+
+```yaml
+Type: String
+Parameter Sets: OutputObjectFromAuditResultsSingle, OutputObjectFromCsvSingle
+Aliases:
+
+Required: True
+Position: 2
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -ExportAllTests
 Switch to export all test results.
 
@@ -118,23 +133,8 @@ Type: SwitchParameter
 Parameter Sets: ExportAllResultsFromAuditResults, ExportAllResultsFromCsv
 Aliases:
 
-Required: True
-Position: 1
-Default value: False
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
-### -ExportOriginalTests
-Switch to export the original audit results to a CSV file.
-
-```yaml
-Type: SwitchParameter
-Parameter Sets: ExportAllResultsFromAuditResults, ExportAllResultsFromCsv
-Aliases:
-
 Required: False
-Position: Named
+Position: 1
 Default value: False
 Accept pipeline input: False
 Accept wildcard characters: False
@@ -155,6 +155,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -ExportOriginalTests
+Switch to export the original audit results to a CSV file.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: ExportAllResultsFromAuditResults, ExportAllResultsFromCsv
+Aliases:
+
+Required: True
+Position: Named
+Default value: False
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -ExportToExcel
 Switch to export the results to an Excel file.
 
@@ -170,37 +185,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -OutputTestNumber
-The test number to output as an object.
-Valid values are "1.1.1", "1.3.1", "6.1.2", "6.1.3", "7.3.4".
-
-```yaml
-Type: String
-Parameter Sets: OutputObjectFromAuditResultsSingle, OutputObjectFromCsvSingle
-Aliases:
-
-Required: True
-Position: 2
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
-### -ProgressAction
-{{ Fill ProgressAction Description }}
-
-```yaml
-Type: ActionPreference
-Parameter Sets: (All)
-Aliases: proga
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### CommonParameters
 This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
 
diff --git a/help/Get-AdminRoleUserLicense.md b/help/Get-AdminRoleUserLicense.md
index 22625bb..0100860 100644
--- a/help/Get-AdminRoleUserLicense.md
+++ b/help/Get-AdminRoleUserLicense.md
@@ -13,7 +13,7 @@ Retrieves user licenses and roles for administrative accounts from Microsoft 365
 ## SYNTAX
 
 ```
-Get-AdminRoleUserLicense [-SkipGraphConnection] [-ProgressAction <ActionPreference>] [<CommonParameters>]
+Get-AdminRoleUserLicense [-SkipGraphConnection] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -38,21 +38,6 @@ This example retrieves all administrative role users along with their licenses w
 
 ## PARAMETERS
 
-### -ProgressAction
-{{ Fill ProgressAction Description }}
-
-```yaml
-Type: ActionPreference
-Parameter Sets: (All)
-Aliases: proga
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### -SkipGraphConnection
 A switch parameter that, when set, skips the connection to Microsoft Graph if already established.
 This is useful for batch processing or when used within scripts where multiple calls are made and the connection is managed externally.
diff --git a/help/Get-MFAStatus.md b/help/Get-MFAStatus.md
index 9e9b878..c64235b 100644
--- a/help/Get-MFAStatus.md
+++ b/help/Get-MFAStatus.md
@@ -1,4 +1,4 @@
----
+---
 external help file: M365FoundationsCISReport-help.xml
 Module Name: M365FoundationsCISReport
 online version: https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Get-MFAStatus
@@ -13,8 +13,7 @@ Retrieves the MFA (Multi-Factor Authentication) status for Azure Active Director
 ## SYNTAX
 
 ```
-Get-MFAStatus [[-UserId] <String>] [-SkipMSOLConnectionChecks] [-ProgressAction <ActionPreference>]
- [<CommonParameters>]
+Get-MFAStatus [[-UserId] <String>] [-SkipMSOLConnectionChecks] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -37,16 +36,17 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
 
 ## PARAMETERS
 
-### -ProgressAction
-{{ Fill ProgressAction Description }}
+### -UserId
+The User Principal Name (UPN) of a specific user to retrieve MFA status for.
+If not provided, the function retrieves MFA status for all users.
 
 ```yaml
-Type: ActionPreference
+Type: String
 Parameter Sets: (All)
-Aliases: proga
+Aliases:
 
 Required: False
-Position: Named
+Position: 1
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
@@ -67,22 +67,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -UserId
-The User Principal Name (UPN) of a specific user to retrieve MFA status for.
-If not provided, the function retrieves MFA status for all users.
-
-```yaml
-Type: String
-Parameter Sets: (All)
-Aliases:
-
-Required: False
-Position: 1
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### CommonParameters
 This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
 
diff --git a/help/Grant-M365SecurityAuditConsent.md b/help/Grant-M365SecurityAuditConsent.md
index e2c864c..c5c5564 100644
--- a/help/Grant-M365SecurityAuditConsent.md
+++ b/help/Grant-M365SecurityAuditConsent.md
@@ -14,8 +14,7 @@ Grants Microsoft Graph permissions for an auditor.
 
 ```
 Grant-M365SecurityAuditConsent [-UserPrincipalNameForConsent] <String> [-SkipGraphConnection]
- [-SkipModuleCheck] [-SuppressRevertOutput] [-DoNotDisconnect] [-ProgressAction <ActionPreference>] [-WhatIf]
- [-Confirm] [<CommonParameters>]
+ [-SkipModuleCheck] [-SuppressRevertOutput] [-DoNotDisconnect] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -41,33 +40,18 @@ Grants Microsoft Graph permissions to user@example.com, skipping the connection
 
 ## PARAMETERS
 
-### -DoNotDisconnect
-If specified, does not disconnect from Microsoft Graph after granting consent.
+### -UserPrincipalNameForConsent
+Specify the UPN of the user to grant consent for.
 
 ```yaml
-Type: SwitchParameter
+Type: String
 Parameter Sets: (All)
 Aliases:
 
-Required: False
-Position: Named
-Default value: False
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
-### -ProgressAction
-{{ Fill ProgressAction Description }}
-
-```yaml
-Type: ActionPreference
-Parameter Sets: (All)
-Aliases: proga
-
-Required: False
-Position: Named
+Required: True
+Position: 1
 Default value: None
-Accept pipeline input: False
+Accept pipeline input: True (ByPropertyName, ByValue)
 Accept wildcard characters: False
 ```
 
@@ -116,32 +100,17 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -UserPrincipalNameForConsent
-Specify the UPN of the user to grant consent for.
-
-```yaml
-Type: String
-Parameter Sets: (All)
-Aliases:
-
-Required: True
-Position: 1
-Default value: None
-Accept pipeline input: True (ByPropertyName, ByValue)
-Accept wildcard characters: False
-```
-
-### -Confirm
-Prompts you for confirmation before running the cmdlet.
+### -DoNotDisconnect
+If specified, does not disconnect from Microsoft Graph after granting consent.
 
 ```yaml
 Type: SwitchParameter
 Parameter Sets: (All)
-Aliases: cf
+Aliases:
 
 Required: False
 Position: Named
-Default value: None
+Default value: False
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
@@ -162,6 +131,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -Confirm
+Prompts you for confirmation before running the cmdlet.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases: cf
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### CommonParameters
 This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
 
diff --git a/help/Invoke-M365SecurityAudit.md b/help/Invoke-M365SecurityAudit.md
index 706ab6f..21ad90a 100644
--- a/help/Invoke-M365SecurityAudit.md
+++ b/help/Invoke-M365SecurityAudit.md
@@ -1,4 +1,4 @@
----
+---
 external help file: M365FoundationsCISReport-help.xml
 Module Name: M365FoundationsCISReport
 online version: https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Invoke-M365SecurityAudit
@@ -14,51 +14,47 @@ Invokes a security audit for Microsoft 365 environments.
 
 ### Default (Default)
 ```
-Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-M365DomainForPWPolicyTest <String>] [-DoNotConnect]
- [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-ProgressAction <ActionPreference>] [-WhatIf]
- [-Confirm] [<CommonParameters>]
+Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-DomainName <String>] [-DoNotConnect] [-DoNotDisconnect]
+ [-NoModuleCheck] [-DoNotConfirmConnections] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### ELevelFilter
 ```
-Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-M365DomainForPWPolicyTest <String>] -ELevel <String>
+Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-DomainName <String>] -ELevel <String>
  -ProfileLevel <String> [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections]
- [-ProgressAction <ActionPreference>] [-WhatIf] [-Confirm] [<CommonParameters>]
+ [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### IG1Filter
 ```
-Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-M365DomainForPWPolicyTest <String>] [-IncludeIG1]
- [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections]
- [-ProgressAction <ActionPreference>] [-WhatIf] [-Confirm] [<CommonParameters>]
+Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-DomainName <String>] [-IncludeIG1] [-DoNotConnect]
+ [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### IG2Filter
 ```
-Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-M365DomainForPWPolicyTest <String>] [-IncludeIG2]
- [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections]
- [-ProgressAction <ActionPreference>] [-WhatIf] [-Confirm] [<CommonParameters>]
+Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-DomainName <String>] [-IncludeIG2] [-DoNotConnect]
+ [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### IG3Filter
 ```
-Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-M365DomainForPWPolicyTest <String>] [-IncludeIG3]
- [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections]
- [-ProgressAction <ActionPreference>] [-WhatIf] [-Confirm] [<CommonParameters>]
+Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-DomainName <String>] [-IncludeIG3] [-DoNotConnect]
+ [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### RecFilter
 ```
-Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-M365DomainForPWPolicyTest <String>]
- -IncludeRecommendation <String[]> [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck]
- [-DoNotConfirmConnections] [-ProgressAction <ActionPreference>] [-WhatIf] [-Confirm] [<CommonParameters>]
+Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-DomainName <String>] -IncludeRecommendation <String[]>
+ [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-WhatIf] [-Confirm]
+ [<CommonParameters>]
 ```
 
 ### SkipRecFilter
 ```
-Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-M365DomainForPWPolicyTest <String>]
- -SkipRecommendation <String[]> [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections]
- [-ProgressAction <ActionPreference>] [-WhatIf] [-Confirm] [<CommonParameters>]
+Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-DomainName <String>] -SkipRecommendation <String[]>
+ [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-WhatIf] [-Confirm]
+ [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -164,47 +160,33 @@ What if: Performing the operation "Invoke-M365SecurityAudit" on target "Microsof
 
 ## PARAMETERS
 
-### -DoNotConfirmConnections
-If specified, the cmdlet will not prompt for confirmation before proceeding with established connections and will disconnect from all of them.
+### -TenantAdminUrl
+The URL of the tenant admin.
+If not specified, none of the SharePoint Online tests will run.
 
 ```yaml
-Type: SwitchParameter
+Type: String
 Parameter Sets: (All)
 Aliases:
 
 Required: False
 Position: Named
-Default value: False
+Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -DoNotConnect
-If specified, the cmdlet will not establish a connection to Microsoft 365 services.
+### -DomainName
+The domain name of the Microsoft 365 environment to test. This parameter is not mandatory and by default it will pass/fail all found domains as a group if a specific domain is not specified.
 
 ```yaml
-Type: SwitchParameter
+Type: String
 Parameter Sets: (All)
 Aliases:
 
 Required: False
 Position: Named
-Default value: False
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
-### -DoNotDisconnect
-If specified, the cmdlet will not disconnect from Microsoft 365 services after execution.
-
-```yaml
-Type: SwitchParameter
-Parameter Sets: (All)
-Aliases:
-
-Required: False
-Position: Named
-Default value: False
+Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
@@ -225,6 +207,22 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -ProfileLevel
+Specifies the profile level (L1 or L2) for the audit.
+This parameter is optional and can be combined with the ELevel parameter.
+
+```yaml
+Type: String
+Parameter Sets: ELevelFilter
+Aliases:
+
+Required: True
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -IncludeIG1
 If specified, includes tests where IG1 is true.
 
@@ -286,18 +284,48 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -M365DomainForPWPolicyTest
-The domain name of the Microsoft 365 environment to test.
-This parameter is not mandatory and by default it will pass/fail all found domains as a group if a specific domain is not specified.
+### -SkipRecommendation
+Specifies specific recommendations to exclude from the audit.
+Accepts an array of recommendation numbers.
 
 ```yaml
-Type: String
+Type: String[]
+Parameter Sets: SkipRecFilter
+Aliases:
+
+Required: True
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -DoNotConnect
+If specified, the cmdlet will not establish a connection to Microsoft 365 services.
+
+```yaml
+Type: SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
 Required: False
 Position: Named
-Default value: None
+Default value: False
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -DoNotDisconnect
+If specified, the cmdlet will not disconnect from Microsoft 365 services after execution.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: False
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
@@ -317,61 +345,29 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -ProfileLevel
-Specifies the profile level (L1 or L2) for the audit.
-This parameter is optional and can be combined with the ELevel parameter.
+### -DoNotConfirmConnections
+If specified, the cmdlet will not prompt for confirmation before proceeding with established connections and will disconnect from all of them.
 
 ```yaml
-Type: String
-Parameter Sets: ELevelFilter
-Aliases:
-
-Required: True
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
-### -ProgressAction
-{{ Fill ProgressAction Description }}
-
-```yaml
-Type: ActionPreference
+Type: SwitchParameter
 Parameter Sets: (All)
-Aliases: proga
+Aliases:
 
 Required: False
 Position: Named
-Default value: None
+Default value: False
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -SkipRecommendation
-Specifies specific recommendations to exclude from the audit.
-Accepts an array of recommendation numbers.
+### -WhatIf
+Shows what would happen if the cmdlet runs.
+The cmdlet is not run.
 
 ```yaml
-Type: String[]
-Parameter Sets: SkipRecFilter
-Aliases:
-
-Required: True
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
-### -TenantAdminUrl
-The URL of the tenant admin.
-If not specified, none of the SharePoint Online tests will run.
-
-```yaml
-Type: String
+Type: SwitchParameter
 Parameter Sets: (All)
-Aliases:
+Aliases: wi
 
 Required: False
 Position: Named
@@ -395,22 +391,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -WhatIf
-Shows what would happen if the cmdlet runs.
-The cmdlet is not run.
-
-```yaml
-Type: SwitchParameter
-Parameter Sets: (All)
-Aliases: wi
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### CommonParameters
 This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
 
diff --git a/help/M365FoundationsCISReport.md b/help/M365FoundationsCISReport.md
index 267b0ab..3c8e111 100644
--- a/help/M365FoundationsCISReport.md
+++ b/help/M365FoundationsCISReport.md
@@ -1,4 +1,4 @@
----
+---
 Module Name: M365FoundationsCISReport
 Module Guid: 0d064bfb-d1ce-484b-a173-993b55984dc9
 Download Help Link: {{Please enter Link manually}}
@@ -20,6 +20,9 @@ Retrieves user licenses and roles for administrative accounts from Microsoft 365
 ### [Get-MFAStatus](Get-MFAStatus.md)
 Retrieves the MFA (Multi-Factor Authentication) status for Azure Active Directory users.
 
+### [Grant-M365SecurityAuditConsent](Grant-M365SecurityAuditConsent.md)
+Grants Microsoft Graph permissions for an auditor.
+
 ### [Invoke-M365SecurityAudit](Invoke-M365SecurityAudit.md)
 Invokes a security audit for Microsoft 365 environments.
 
diff --git a/help/Remove-RowsWithEmptyCSVStatus.md b/help/Remove-RowsWithEmptyCSVStatus.md
index eca797b..4b0f57d 100644
--- a/help/Remove-RowsWithEmptyCSVStatus.md
+++ b/help/Remove-RowsWithEmptyCSVStatus.md
@@ -13,8 +13,7 @@ Removes rows from an Excel worksheet where the 'CSV_Status' column is empty and
 ## SYNTAX
 
 ```
-Remove-RowsWithEmptyCSVStatus [-FilePath] <String> [-WorksheetName] <String>
- [-ProgressAction <ActionPreference>] [<CommonParameters>]
+Remove-RowsWithEmptyCSVStatus [-FilePath] <String> [-WorksheetName] <String> [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -46,21 +45,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -ProgressAction
-{{ Fill ProgressAction Description }}
-
-```yaml
-Type: ActionPreference
-Parameter Sets: (All)
-Aliases: proga
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### -WorksheetName
 The name of the worksheet within the Excel file to be processed.
 
diff --git a/help/Sync-CISExcelAndCsvData.md b/help/Sync-CISExcelAndCsvData.md
index 663e3e4..758f362 100644
--- a/help/Sync-CISExcelAndCsvData.md
+++ b/help/Sync-CISExcelAndCsvData.md
@@ -1,4 +1,4 @@
----
+---
 external help file: M365FoundationsCISReport-help.xml
 Module Name: M365FoundationsCISReport
 online version: https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Sync-CISExcelAndCsvData
@@ -14,7 +14,7 @@ Synchronizes and updates data in an Excel worksheet with new information from a
 
 ```
 Sync-CISExcelAndCsvData [[-ExcelPath] <String>] [[-CsvPath] <String>] [[-SheetName] <String>]
- [-ProgressAction <ActionPreference>] [<CommonParameters>]
+ [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -32,22 +32,6 @@ Updates the 'AuditData' worksheet in 'excel.xlsx' with data from 'data.csv', add
 
 ## PARAMETERS
 
-### -CsvPath
-Specifies the path to the CSV file containing new data.
-This parameter is mandatory.
-
-```yaml
-Type: String
-Parameter Sets: (All)
-Aliases:
-
-Required: False
-Position: 2
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### -ExcelPath
 Specifies the path to the Excel file to be updated.
 This parameter is mandatory.
@@ -64,16 +48,17 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -ProgressAction
-{{ Fill ProgressAction Description }}
+### -CsvPath
+Specifies the path to the CSV file containing new data.
+This parameter is mandatory.
 
 ```yaml
-Type: ActionPreference
+Type: String
 Parameter Sets: (All)
-Aliases: proga
+Aliases:
 
 Required: False
-Position: Named
+Position: 2
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
diff --git a/source/en-US/M365FoundationsCISReport-help.xml b/source/en-US/M365FoundationsCISReport-help.xml
index 4ea02c5..507ad97 100644
--- a/source/en-US/M365FoundationsCISReport-help.xml
+++ b/source/en-US/M365FoundationsCISReport-help.xml
@@ -39,22 +39,10 @@
           </dev:type>
           <dev:defaultValue>None</dev:defaultValue>
         </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
-          <maml:name>ProgressAction</maml:name>
-          <maml:description>
-            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
-          </maml:description>
-          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
-          <dev:type>
-            <maml:name>ActionPreference</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>None</dev:defaultValue>
-        </command:parameter>
       </command:syntaxItem>
       <command:syntaxItem>
         <maml:name>Export-M365SecurityAuditTable</maml:name>
-        <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="1" aliases="none">
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="1" aliases="none">
           <maml:name>ExportAllTests</maml:name>
           <maml:description>
             <maml:para>Switch to export all test results.</maml:para>
@@ -77,17 +65,6 @@
           </dev:type>
           <dev:defaultValue>None</dev:defaultValue>
         </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-          <maml:name>ExportOriginalTests</maml:name>
-          <maml:description>
-            <maml:para>Switch to export the original audit results to a CSV file.</maml:para>
-          </maml:description>
-          <dev:type>
-            <maml:name>SwitchParameter</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>False</dev:defaultValue>
-        </command:parameter>
         <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
           <maml:name>ExportPath</maml:name>
           <maml:description>
@@ -100,6 +77,17 @@
           </dev:type>
           <dev:defaultValue>None</dev:defaultValue>
         </command:parameter>
+        <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>ExportOriginalTests</maml:name>
+          <maml:description>
+            <maml:para>Switch to export the original audit results to a CSV file.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
         <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
           <maml:name>ExportToExcel</maml:name>
           <maml:description>
@@ -111,18 +99,6 @@
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
-          <maml:name>ProgressAction</maml:name>
-          <maml:description>
-            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
-          </maml:description>
-          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
-          <dev:type>
-            <maml:name>ActionPreference</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>None</dev:defaultValue>
-        </command:parameter>
       </command:syntaxItem>
       <command:syntaxItem>
         <maml:name>Export-M365SecurityAuditTable</maml:name>
@@ -150,22 +126,10 @@
           </dev:type>
           <dev:defaultValue>None</dev:defaultValue>
         </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
-          <maml:name>ProgressAction</maml:name>
-          <maml:description>
-            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
-          </maml:description>
-          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
-          <dev:type>
-            <maml:name>ActionPreference</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>None</dev:defaultValue>
-        </command:parameter>
       </command:syntaxItem>
       <command:syntaxItem>
         <maml:name>Export-M365SecurityAuditTable</maml:name>
-        <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="1" aliases="none">
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="1" aliases="none">
           <maml:name>ExportAllTests</maml:name>
           <maml:description>
             <maml:para>Switch to export all test results.</maml:para>
@@ -188,17 +152,6 @@
           </dev:type>
           <dev:defaultValue>None</dev:defaultValue>
         </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-          <maml:name>ExportOriginalTests</maml:name>
-          <maml:description>
-            <maml:para>Switch to export the original audit results to a CSV file.</maml:para>
-          </maml:description>
-          <dev:type>
-            <maml:name>SwitchParameter</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>False</dev:defaultValue>
-        </command:parameter>
         <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
           <maml:name>ExportPath</maml:name>
           <maml:description>
@@ -211,6 +164,17 @@
           </dev:type>
           <dev:defaultValue>None</dev:defaultValue>
         </command:parameter>
+        <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>ExportOriginalTests</maml:name>
+          <maml:description>
+            <maml:para>Switch to export the original audit results to a CSV file.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
         <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
           <maml:name>ExportToExcel</maml:name>
           <maml:description>
@@ -222,18 +186,6 @@
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
-          <maml:name>ProgressAction</maml:name>
-          <maml:description>
-            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
-          </maml:description>
-          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
-          <dev:type>
-            <maml:name>ActionPreference</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>None</dev:defaultValue>
-        </command:parameter>
       </command:syntaxItem>
     </command:syntax>
     <command:parameters>
@@ -261,7 +213,19 @@
         </dev:type>
         <dev:defaultValue>None</dev:defaultValue>
       </command:parameter>
-      <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="1" aliases="none">
+      <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="2" aliases="none">
+        <maml:name>OutputTestNumber</maml:name>
+        <maml:description>
+          <maml:para>The test number to output as an object. Valid values are "1.1.1", "1.3.1", "6.1.2", "6.1.3", "7.3.4".</maml:para>
+        </maml:description>
+        <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
+        <dev:type>
+          <maml:name>String</maml:name>
+          <maml:uri />
+        </dev:type>
+        <dev:defaultValue>None</dev:defaultValue>
+      </command:parameter>
+      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="1" aliases="none">
         <maml:name>ExportAllTests</maml:name>
         <maml:description>
           <maml:para>Switch to export all test results.</maml:para>
@@ -273,18 +237,6 @@
         </dev:type>
         <dev:defaultValue>False</dev:defaultValue>
       </command:parameter>
-      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-        <maml:name>ExportOriginalTests</maml:name>
-        <maml:description>
-          <maml:para>Switch to export the original audit results to a CSV file.</maml:para>
-        </maml:description>
-        <command:parameterValue required="false" variableLength="false">SwitchParameter</command:parameterValue>
-        <dev:type>
-          <maml:name>SwitchParameter</maml:name>
-          <maml:uri />
-        </dev:type>
-        <dev:defaultValue>False</dev:defaultValue>
-      </command:parameter>
       <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
         <maml:name>ExportPath</maml:name>
         <maml:description>
@@ -297,6 +249,18 @@
         </dev:type>
         <dev:defaultValue>None</dev:defaultValue>
       </command:parameter>
+      <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+        <maml:name>ExportOriginalTests</maml:name>
+        <maml:description>
+          <maml:para>Switch to export the original audit results to a CSV file.</maml:para>
+        </maml:description>
+        <command:parameterValue required="false" variableLength="false">SwitchParameter</command:parameterValue>
+        <dev:type>
+          <maml:name>SwitchParameter</maml:name>
+          <maml:uri />
+        </dev:type>
+        <dev:defaultValue>False</dev:defaultValue>
+      </command:parameter>
       <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
         <maml:name>ExportToExcel</maml:name>
         <maml:description>
@@ -309,30 +273,6 @@
         </dev:type>
         <dev:defaultValue>False</dev:defaultValue>
       </command:parameter>
-      <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="2" aliases="none">
-        <maml:name>OutputTestNumber</maml:name>
-        <maml:description>
-          <maml:para>The test number to output as an object. Valid values are "1.1.1", "1.3.1", "6.1.2", "6.1.3", "7.3.4".</maml:para>
-        </maml:description>
-        <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
-        <dev:type>
-          <maml:name>String</maml:name>
-          <maml:uri />
-        </dev:type>
-        <dev:defaultValue>None</dev:defaultValue>
-      </command:parameter>
-      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
-        <maml:name>ProgressAction</maml:name>
-        <maml:description>
-          <maml:para>{{ Fill ProgressAction Description }}</maml:para>
-        </maml:description>
-        <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
-        <dev:type>
-          <maml:name>ActionPreference</maml:name>
-          <maml:uri />
-        </dev:type>
-        <dev:defaultValue>None</dev:defaultValue>
-      </command:parameter>
     </command:parameters>
     <command:inputTypes>
       <command:inputType>
@@ -431,18 +371,6 @@
     <command:syntax>
       <command:syntaxItem>
         <maml:name>Get-AdminRoleUserLicense</maml:name>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
-          <maml:name>ProgressAction</maml:name>
-          <maml:description>
-            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
-          </maml:description>
-          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
-          <dev:type>
-            <maml:name>ActionPreference</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>None</dev:defaultValue>
-        </command:parameter>
         <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
           <maml:name>SkipGraphConnection</maml:name>
           <maml:description>
@@ -457,18 +385,6 @@
       </command:syntaxItem>
     </command:syntax>
     <command:parameters>
-      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
-        <maml:name>ProgressAction</maml:name>
-        <maml:description>
-          <maml:para>{{ Fill ProgressAction Description }}</maml:para>
-        </maml:description>
-        <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
-        <dev:type>
-          <maml:name>ActionPreference</maml:name>
-          <maml:uri />
-        </dev:type>
-        <dev:defaultValue>None</dev:defaultValue>
-      </command:parameter>
       <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
         <maml:name>SkipGraphConnection</maml:name>
         <maml:description>
@@ -565,18 +481,6 @@
           </dev:type>
           <dev:defaultValue>None</dev:defaultValue>
         </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
-          <maml:name>ProgressAction</maml:name>
-          <maml:description>
-            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
-          </maml:description>
-          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
-          <dev:type>
-            <maml:name>ActionPreference</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>None</dev:defaultValue>
-        </command:parameter>
         <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
           <maml:name>SkipMSOLConnectionChecks</maml:name>
           <maml:description>
@@ -591,14 +495,14 @@
       </command:syntaxItem>
     </command:syntax>
     <command:parameters>
-      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
-        <maml:name>ProgressAction</maml:name>
+      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="1" aliases="none">
+        <maml:name>UserId</maml:name>
         <maml:description>
-          <maml:para>{{ Fill ProgressAction Description }}</maml:para>
+          <maml:para>The User Principal Name (UPN) of a specific user to retrieve MFA status for. If not provided, the function retrieves MFA status for all users.</maml:para>
         </maml:description>
-        <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
+        <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
         <dev:type>
-          <maml:name>ActionPreference</maml:name>
+          <maml:name>String</maml:name>
           <maml:uri />
         </dev:type>
         <dev:defaultValue>None</dev:defaultValue>
@@ -615,18 +519,6 @@
         </dev:type>
         <dev:defaultValue>False</dev:defaultValue>
       </command:parameter>
-      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="1" aliases="none">
-        <maml:name>UserId</maml:name>
-        <maml:description>
-          <maml:para>The User Principal Name (UPN) of a specific user to retrieve MFA status for. If not provided, the function retrieves MFA status for all users.</maml:para>
-        </maml:description>
-        <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
-        <dev:type>
-          <maml:name>String</maml:name>
-          <maml:uri />
-        </dev:type>
-        <dev:defaultValue>None</dev:defaultValue>
-      </command:parameter>
     </command:parameters>
     <command:inputTypes />
     <command:returnValues>
@@ -760,29 +652,6 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
           </dev:type>
           <dev:defaultValue>None</dev:defaultValue>
         </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-          <maml:name>DoNotDisconnect</maml:name>
-          <maml:description>
-            <maml:para>If specified, does not disconnect from Microsoft Graph after granting consent.</maml:para>
-          </maml:description>
-          <dev:type>
-            <maml:name>SwitchParameter</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>False</dev:defaultValue>
-        </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
-          <maml:name>ProgressAction</maml:name>
-          <maml:description>
-            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
-          </maml:description>
-          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
-          <dev:type>
-            <maml:name>ActionPreference</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>None</dev:defaultValue>
-        </command:parameter>
         <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
           <maml:name>SkipGraphConnection</maml:name>
           <maml:description>
@@ -816,10 +685,10 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="cf">
-          <maml:name>Confirm</maml:name>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>DoNotDisconnect</maml:name>
           <maml:description>
-            <maml:para>Prompts you for confirmation before running the cmdlet.</maml:para>
+            <maml:para>If specified, does not disconnect from Microsoft Graph after granting consent.</maml:para>
           </maml:description>
           <dev:type>
             <maml:name>SwitchParameter</maml:name>
@@ -838,29 +707,28 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="cf">
+          <maml:name>Confirm</maml:name>
+          <maml:description>
+            <maml:para>Prompts you for confirmation before running the cmdlet.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
       </command:syntaxItem>
     </command:syntax>
     <command:parameters>
-      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-        <maml:name>DoNotDisconnect</maml:name>
+      <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="True (ByPropertyName, ByValue)" position="1" aliases="none">
+        <maml:name>UserPrincipalNameForConsent</maml:name>
         <maml:description>
-          <maml:para>If specified, does not disconnect from Microsoft Graph after granting consent.</maml:para>
+          <maml:para>Specify the UPN of the user to grant consent for.</maml:para>
         </maml:description>
-        <command:parameterValue required="false" variableLength="false">SwitchParameter</command:parameterValue>
+        <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
         <dev:type>
-          <maml:name>SwitchParameter</maml:name>
-          <maml:uri />
-        </dev:type>
-        <dev:defaultValue>False</dev:defaultValue>
-      </command:parameter>
-      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
-        <maml:name>ProgressAction</maml:name>
-        <maml:description>
-          <maml:para>{{ Fill ProgressAction Description }}</maml:para>
-        </maml:description>
-        <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
-        <dev:type>
-          <maml:name>ActionPreference</maml:name>
+          <maml:name>String</maml:name>
           <maml:uri />
         </dev:type>
         <dev:defaultValue>None</dev:defaultValue>
@@ -901,22 +769,10 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
         </dev:type>
         <dev:defaultValue>False</dev:defaultValue>
       </command:parameter>
-      <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="True (ByPropertyName, ByValue)" position="1" aliases="none">
-        <maml:name>UserPrincipalNameForConsent</maml:name>
+      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+        <maml:name>DoNotDisconnect</maml:name>
         <maml:description>
-          <maml:para>Specify the UPN of the user to grant consent for.</maml:para>
-        </maml:description>
-        <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
-        <dev:type>
-          <maml:name>String</maml:name>
-          <maml:uri />
-        </dev:type>
-        <dev:defaultValue>None</dev:defaultValue>
-      </command:parameter>
-      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="cf">
-        <maml:name>Confirm</maml:name>
-        <maml:description>
-          <maml:para>Prompts you for confirmation before running the cmdlet.</maml:para>
+          <maml:para>If specified, does not disconnect from Microsoft Graph after granting consent.</maml:para>
         </maml:description>
         <command:parameterValue required="false" variableLength="false">SwitchParameter</command:parameterValue>
         <dev:type>
@@ -937,6 +793,18 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
         </dev:type>
         <dev:defaultValue>False</dev:defaultValue>
       </command:parameter>
+      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="cf">
+        <maml:name>Confirm</maml:name>
+        <maml:description>
+          <maml:para>Prompts you for confirmation before running the cmdlet.</maml:para>
+        </maml:description>
+        <command:parameterValue required="false" variableLength="false">SwitchParameter</command:parameterValue>
+        <dev:type>
+          <maml:name>SwitchParameter</maml:name>
+          <maml:uri />
+        </dev:type>
+        <dev:defaultValue>False</dev:defaultValue>
+      </command:parameter>
     </command:parameters>
     <command:inputTypes />
     <command:returnValues>
@@ -993,37 +861,28 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
       <command:syntaxItem>
         <maml:name>Invoke-M365SecurityAudit</maml:name>
         <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-          <maml:name>DoNotConfirmConnections</maml:name>
+          <maml:name>TenantAdminUrl</maml:name>
           <maml:description>
-            <maml:para>If specified, the cmdlet will not prompt for confirmation before proceeding with established connections and will disconnect from all of them.</maml:para>
+            <maml:para>The URL of the tenant admin. If not specified, none of the SharePoint Online tests will run.</maml:para>
           </maml:description>
+          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
           <dev:type>
-            <maml:name>SwitchParameter</maml:name>
+            <maml:name>String</maml:name>
             <maml:uri />
           </dev:type>
-          <dev:defaultValue>False</dev:defaultValue>
+          <dev:defaultValue>None</dev:defaultValue>
         </command:parameter>
         <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-          <maml:name>DoNotConnect</maml:name>
+          <maml:name>DomainName</maml:name>
           <maml:description>
-            <maml:para>If specified, the cmdlet will not establish a connection to Microsoft 365 services.</maml:para>
+            <maml:para>The domain name of the Microsoft 365 environment to test. This parameter is not mandatory and by default it will pass/fail all found domains as a group if a specific domain is not specified.</maml:para>
           </maml:description>
+          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
           <dev:type>
-            <maml:name>SwitchParameter</maml:name>
+            <maml:name>String</maml:name>
             <maml:uri />
           </dev:type>
-          <dev:defaultValue>False</dev:defaultValue>
-        </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-          <maml:name>DoNotDisconnect</maml:name>
-          <maml:description>
-            <maml:para>If specified, the cmdlet will not disconnect from Microsoft 365 services after execution.</maml:para>
-          </maml:description>
-          <dev:type>
-            <maml:name>SwitchParameter</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>False</dev:defaultValue>
+          <dev:defaultValue>None</dev:defaultValue>
         </command:parameter>
         <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
           <maml:name>ELevel</maml:name>
@@ -1037,29 +896,6 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
           </dev:type>
           <dev:defaultValue>None</dev:defaultValue>
         </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-          <maml:name>M365DomainForPWPolicyTest</maml:name>
-          <maml:description>
-            <maml:para>The domain name of the Microsoft 365 environment to test. This parameter is not mandatory and by default it will pass/fail all found domains as a group if a specific domain is not specified.</maml:para>
-          </maml:description>
-          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
-          <dev:type>
-            <maml:name>String</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>None</dev:defaultValue>
-        </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-          <maml:name>NoModuleCheck</maml:name>
-          <maml:description>
-            <maml:para>If specified, the cmdlet will not check for the presence of required modules.</maml:para>
-          </maml:description>
-          <dev:type>
-            <maml:name>SwitchParameter</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>False</dev:defaultValue>
-        </command:parameter>
         <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
           <maml:name>ProfileLevel</maml:name>
           <maml:description>
@@ -1072,66 +908,6 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
           </dev:type>
           <dev:defaultValue>None</dev:defaultValue>
         </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
-          <maml:name>ProgressAction</maml:name>
-          <maml:description>
-            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
-          </maml:description>
-          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
-          <dev:type>
-            <maml:name>ActionPreference</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>None</dev:defaultValue>
-        </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-          <maml:name>TenantAdminUrl</maml:name>
-          <maml:description>
-            <maml:para>The URL of the tenant admin. If not specified, none of the SharePoint Online tests will run.</maml:para>
-          </maml:description>
-          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
-          <dev:type>
-            <maml:name>String</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>None</dev:defaultValue>
-        </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="cf">
-          <maml:name>Confirm</maml:name>
-          <maml:description>
-            <maml:para>Prompts you for confirmation before running the cmdlet.</maml:para>
-          </maml:description>
-          <dev:type>
-            <maml:name>SwitchParameter</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>False</dev:defaultValue>
-        </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="wi">
-          <maml:name>WhatIf</maml:name>
-          <maml:description>
-            <maml:para>Shows what would happen if the cmdlet runs. The cmdlet is not run.</maml:para>
-          </maml:description>
-          <dev:type>
-            <maml:name>SwitchParameter</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>False</dev:defaultValue>
-        </command:parameter>
-      </command:syntaxItem>
-      <command:syntaxItem>
-        <maml:name>Invoke-M365SecurityAudit</maml:name>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-          <maml:name>DoNotConfirmConnections</maml:name>
-          <maml:description>
-            <maml:para>If specified, the cmdlet will not prompt for confirmation before proceeding with established connections and will disconnect from all of them.</maml:para>
-          </maml:description>
-          <dev:type>
-            <maml:name>SwitchParameter</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>False</dev:defaultValue>
-        </command:parameter>
         <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
           <maml:name>DoNotConnect</maml:name>
           <maml:description>
@@ -1154,6 +930,77 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>NoModuleCheck</maml:name>
+          <maml:description>
+            <maml:para>If specified, the cmdlet will not check for the presence of required modules.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>DoNotConfirmConnections</maml:name>
+          <maml:description>
+            <maml:para>If specified, the cmdlet will not prompt for confirmation before proceeding with established connections and will disconnect from all of them.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="wi">
+          <maml:name>WhatIf</maml:name>
+          <maml:description>
+            <maml:para>Shows what would happen if the cmdlet runs. The cmdlet is not run.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="cf">
+          <maml:name>Confirm</maml:name>
+          <maml:description>
+            <maml:para>Prompts you for confirmation before running the cmdlet.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
+      </command:syntaxItem>
+      <command:syntaxItem>
+        <maml:name>Invoke-M365SecurityAudit</maml:name>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>TenantAdminUrl</maml:name>
+          <maml:description>
+            <maml:para>The URL of the tenant admin. If not specified, none of the SharePoint Online tests will run.</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
+          <dev:type>
+            <maml:name>String</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>DomainName</maml:name>
+          <maml:description>
+            <maml:para>The domain name of the Microsoft 365 environment to test. This parameter is not mandatory and by default it will pass/fail all found domains as a group if a specific domain is not specified.</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
+          <dev:type>
+            <maml:name>String</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
         <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
           <maml:name>IncludeIG1</maml:name>
           <maml:description>
@@ -1165,89 +1012,6 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-          <maml:name>M365DomainForPWPolicyTest</maml:name>
-          <maml:description>
-            <maml:para>The domain name of the Microsoft 365 environment to test. This parameter is not mandatory and by default it will pass/fail all found domains as a group if a specific domain is not specified.</maml:para>
-          </maml:description>
-          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
-          <dev:type>
-            <maml:name>String</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>None</dev:defaultValue>
-        </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-          <maml:name>NoModuleCheck</maml:name>
-          <maml:description>
-            <maml:para>If specified, the cmdlet will not check for the presence of required modules.</maml:para>
-          </maml:description>
-          <dev:type>
-            <maml:name>SwitchParameter</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>False</dev:defaultValue>
-        </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
-          <maml:name>ProgressAction</maml:name>
-          <maml:description>
-            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
-          </maml:description>
-          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
-          <dev:type>
-            <maml:name>ActionPreference</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>None</dev:defaultValue>
-        </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-          <maml:name>TenantAdminUrl</maml:name>
-          <maml:description>
-            <maml:para>The URL of the tenant admin. If not specified, none of the SharePoint Online tests will run.</maml:para>
-          </maml:description>
-          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
-          <dev:type>
-            <maml:name>String</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>None</dev:defaultValue>
-        </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="cf">
-          <maml:name>Confirm</maml:name>
-          <maml:description>
-            <maml:para>Prompts you for confirmation before running the cmdlet.</maml:para>
-          </maml:description>
-          <dev:type>
-            <maml:name>SwitchParameter</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>False</dev:defaultValue>
-        </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="wi">
-          <maml:name>WhatIf</maml:name>
-          <maml:description>
-            <maml:para>Shows what would happen if the cmdlet runs. The cmdlet is not run.</maml:para>
-          </maml:description>
-          <dev:type>
-            <maml:name>SwitchParameter</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>False</dev:defaultValue>
-        </command:parameter>
-      </command:syntaxItem>
-      <command:syntaxItem>
-        <maml:name>Invoke-M365SecurityAudit</maml:name>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-          <maml:name>DoNotConfirmConnections</maml:name>
-          <maml:description>
-            <maml:para>If specified, the cmdlet will not prompt for confirmation before proceeding with established connections and will disconnect from all of them.</maml:para>
-          </maml:description>
-          <dev:type>
-            <maml:name>SwitchParameter</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>False</dev:defaultValue>
-        </command:parameter>
         <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
           <maml:name>DoNotConnect</maml:name>
           <maml:description>
@@ -1270,6 +1034,77 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>NoModuleCheck</maml:name>
+          <maml:description>
+            <maml:para>If specified, the cmdlet will not check for the presence of required modules.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>DoNotConfirmConnections</maml:name>
+          <maml:description>
+            <maml:para>If specified, the cmdlet will not prompt for confirmation before proceeding with established connections and will disconnect from all of them.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="wi">
+          <maml:name>WhatIf</maml:name>
+          <maml:description>
+            <maml:para>Shows what would happen if the cmdlet runs. The cmdlet is not run.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="cf">
+          <maml:name>Confirm</maml:name>
+          <maml:description>
+            <maml:para>Prompts you for confirmation before running the cmdlet.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
+      </command:syntaxItem>
+      <command:syntaxItem>
+        <maml:name>Invoke-M365SecurityAudit</maml:name>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>TenantAdminUrl</maml:name>
+          <maml:description>
+            <maml:para>The URL of the tenant admin. If not specified, none of the SharePoint Online tests will run.</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
+          <dev:type>
+            <maml:name>String</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>DomainName</maml:name>
+          <maml:description>
+            <maml:para>The domain name of the Microsoft 365 environment to test. This parameter is not mandatory and by default it will pass/fail all found domains as a group if a specific domain is not specified.</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
+          <dev:type>
+            <maml:name>String</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
         <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
           <maml:name>IncludeIG2</maml:name>
           <maml:description>
@@ -1281,89 +1116,6 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-          <maml:name>M365DomainForPWPolicyTest</maml:name>
-          <maml:description>
-            <maml:para>The domain name of the Microsoft 365 environment to test. This parameter is not mandatory and by default it will pass/fail all found domains as a group if a specific domain is not specified.</maml:para>
-          </maml:description>
-          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
-          <dev:type>
-            <maml:name>String</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>None</dev:defaultValue>
-        </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-          <maml:name>NoModuleCheck</maml:name>
-          <maml:description>
-            <maml:para>If specified, the cmdlet will not check for the presence of required modules.</maml:para>
-          </maml:description>
-          <dev:type>
-            <maml:name>SwitchParameter</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>False</dev:defaultValue>
-        </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
-          <maml:name>ProgressAction</maml:name>
-          <maml:description>
-            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
-          </maml:description>
-          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
-          <dev:type>
-            <maml:name>ActionPreference</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>None</dev:defaultValue>
-        </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-          <maml:name>TenantAdminUrl</maml:name>
-          <maml:description>
-            <maml:para>The URL of the tenant admin. If not specified, none of the SharePoint Online tests will run.</maml:para>
-          </maml:description>
-          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
-          <dev:type>
-            <maml:name>String</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>None</dev:defaultValue>
-        </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="cf">
-          <maml:name>Confirm</maml:name>
-          <maml:description>
-            <maml:para>Prompts you for confirmation before running the cmdlet.</maml:para>
-          </maml:description>
-          <dev:type>
-            <maml:name>SwitchParameter</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>False</dev:defaultValue>
-        </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="wi">
-          <maml:name>WhatIf</maml:name>
-          <maml:description>
-            <maml:para>Shows what would happen if the cmdlet runs. The cmdlet is not run.</maml:para>
-          </maml:description>
-          <dev:type>
-            <maml:name>SwitchParameter</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>False</dev:defaultValue>
-        </command:parameter>
-      </command:syntaxItem>
-      <command:syntaxItem>
-        <maml:name>Invoke-M365SecurityAudit</maml:name>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-          <maml:name>DoNotConfirmConnections</maml:name>
-          <maml:description>
-            <maml:para>If specified, the cmdlet will not prompt for confirmation before proceeding with established connections and will disconnect from all of them.</maml:para>
-          </maml:description>
-          <dev:type>
-            <maml:name>SwitchParameter</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>False</dev:defaultValue>
-        </command:parameter>
         <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
           <maml:name>DoNotConnect</maml:name>
           <maml:description>
@@ -1386,6 +1138,77 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>NoModuleCheck</maml:name>
+          <maml:description>
+            <maml:para>If specified, the cmdlet will not check for the presence of required modules.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>DoNotConfirmConnections</maml:name>
+          <maml:description>
+            <maml:para>If specified, the cmdlet will not prompt for confirmation before proceeding with established connections and will disconnect from all of them.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="wi">
+          <maml:name>WhatIf</maml:name>
+          <maml:description>
+            <maml:para>Shows what would happen if the cmdlet runs. The cmdlet is not run.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="cf">
+          <maml:name>Confirm</maml:name>
+          <maml:description>
+            <maml:para>Prompts you for confirmation before running the cmdlet.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
+      </command:syntaxItem>
+      <command:syntaxItem>
+        <maml:name>Invoke-M365SecurityAudit</maml:name>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>TenantAdminUrl</maml:name>
+          <maml:description>
+            <maml:para>The URL of the tenant admin. If not specified, none of the SharePoint Online tests will run.</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
+          <dev:type>
+            <maml:name>String</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>DomainName</maml:name>
+          <maml:description>
+            <maml:para>The domain name of the Microsoft 365 environment to test. This parameter is not mandatory and by default it will pass/fail all found domains as a group if a specific domain is not specified.</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
+          <dev:type>
+            <maml:name>String</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
         <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
           <maml:name>IncludeIG3</maml:name>
           <maml:description>
@@ -1397,89 +1220,6 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-          <maml:name>M365DomainForPWPolicyTest</maml:name>
-          <maml:description>
-            <maml:para>The domain name of the Microsoft 365 environment to test. This parameter is not mandatory and by default it will pass/fail all found domains as a group if a specific domain is not specified.</maml:para>
-          </maml:description>
-          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
-          <dev:type>
-            <maml:name>String</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>None</dev:defaultValue>
-        </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-          <maml:name>NoModuleCheck</maml:name>
-          <maml:description>
-            <maml:para>If specified, the cmdlet will not check for the presence of required modules.</maml:para>
-          </maml:description>
-          <dev:type>
-            <maml:name>SwitchParameter</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>False</dev:defaultValue>
-        </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
-          <maml:name>ProgressAction</maml:name>
-          <maml:description>
-            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
-          </maml:description>
-          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
-          <dev:type>
-            <maml:name>ActionPreference</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>None</dev:defaultValue>
-        </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-          <maml:name>TenantAdminUrl</maml:name>
-          <maml:description>
-            <maml:para>The URL of the tenant admin. If not specified, none of the SharePoint Online tests will run.</maml:para>
-          </maml:description>
-          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
-          <dev:type>
-            <maml:name>String</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>None</dev:defaultValue>
-        </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="cf">
-          <maml:name>Confirm</maml:name>
-          <maml:description>
-            <maml:para>Prompts you for confirmation before running the cmdlet.</maml:para>
-          </maml:description>
-          <dev:type>
-            <maml:name>SwitchParameter</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>False</dev:defaultValue>
-        </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="wi">
-          <maml:name>WhatIf</maml:name>
-          <maml:description>
-            <maml:para>Shows what would happen if the cmdlet runs. The cmdlet is not run.</maml:para>
-          </maml:description>
-          <dev:type>
-            <maml:name>SwitchParameter</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>False</dev:defaultValue>
-        </command:parameter>
-      </command:syntaxItem>
-      <command:syntaxItem>
-        <maml:name>Invoke-M365SecurityAudit</maml:name>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-          <maml:name>DoNotConfirmConnections</maml:name>
-          <maml:description>
-            <maml:para>If specified, the cmdlet will not prompt for confirmation before proceeding with established connections and will disconnect from all of them.</maml:para>
-          </maml:description>
-          <dev:type>
-            <maml:name>SwitchParameter</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>False</dev:defaultValue>
-        </command:parameter>
         <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
           <maml:name>DoNotConnect</maml:name>
           <maml:description>
@@ -1502,6 +1242,77 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>NoModuleCheck</maml:name>
+          <maml:description>
+            <maml:para>If specified, the cmdlet will not check for the presence of required modules.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>DoNotConfirmConnections</maml:name>
+          <maml:description>
+            <maml:para>If specified, the cmdlet will not prompt for confirmation before proceeding with established connections and will disconnect from all of them.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="wi">
+          <maml:name>WhatIf</maml:name>
+          <maml:description>
+            <maml:para>Shows what would happen if the cmdlet runs. The cmdlet is not run.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="cf">
+          <maml:name>Confirm</maml:name>
+          <maml:description>
+            <maml:para>Prompts you for confirmation before running the cmdlet.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
+      </command:syntaxItem>
+      <command:syntaxItem>
+        <maml:name>Invoke-M365SecurityAudit</maml:name>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>TenantAdminUrl</maml:name>
+          <maml:description>
+            <maml:para>The URL of the tenant admin. If not specified, none of the SharePoint Online tests will run.</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
+          <dev:type>
+            <maml:name>String</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>DomainName</maml:name>
+          <maml:description>
+            <maml:para>The domain name of the Microsoft 365 environment to test. This parameter is not mandatory and by default it will pass/fail all found domains as a group if a specific domain is not specified.</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
+          <dev:type>
+            <maml:name>String</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
         <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
           <maml:name>IncludeRecommendation</maml:name>
           <maml:description>
@@ -1514,89 +1325,6 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
           </dev:type>
           <dev:defaultValue>None</dev:defaultValue>
         </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-          <maml:name>M365DomainForPWPolicyTest</maml:name>
-          <maml:description>
-            <maml:para>The domain name of the Microsoft 365 environment to test. This parameter is not mandatory and by default it will pass/fail all found domains as a group if a specific domain is not specified.</maml:para>
-          </maml:description>
-          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
-          <dev:type>
-            <maml:name>String</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>None</dev:defaultValue>
-        </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-          <maml:name>NoModuleCheck</maml:name>
-          <maml:description>
-            <maml:para>If specified, the cmdlet will not check for the presence of required modules.</maml:para>
-          </maml:description>
-          <dev:type>
-            <maml:name>SwitchParameter</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>False</dev:defaultValue>
-        </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
-          <maml:name>ProgressAction</maml:name>
-          <maml:description>
-            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
-          </maml:description>
-          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
-          <dev:type>
-            <maml:name>ActionPreference</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>None</dev:defaultValue>
-        </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-          <maml:name>TenantAdminUrl</maml:name>
-          <maml:description>
-            <maml:para>The URL of the tenant admin. If not specified, none of the SharePoint Online tests will run.</maml:para>
-          </maml:description>
-          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
-          <dev:type>
-            <maml:name>String</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>None</dev:defaultValue>
-        </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="cf">
-          <maml:name>Confirm</maml:name>
-          <maml:description>
-            <maml:para>Prompts you for confirmation before running the cmdlet.</maml:para>
-          </maml:description>
-          <dev:type>
-            <maml:name>SwitchParameter</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>False</dev:defaultValue>
-        </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="wi">
-          <maml:name>WhatIf</maml:name>
-          <maml:description>
-            <maml:para>Shows what would happen if the cmdlet runs. The cmdlet is not run.</maml:para>
-          </maml:description>
-          <dev:type>
-            <maml:name>SwitchParameter</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>False</dev:defaultValue>
-        </command:parameter>
-      </command:syntaxItem>
-      <command:syntaxItem>
-        <maml:name>Invoke-M365SecurityAudit</maml:name>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-          <maml:name>DoNotConfirmConnections</maml:name>
-          <maml:description>
-            <maml:para>If specified, the cmdlet will not prompt for confirmation before proceeding with established connections and will disconnect from all of them.</maml:para>
-          </maml:description>
-          <dev:type>
-            <maml:name>SwitchParameter</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>False</dev:defaultValue>
-        </command:parameter>
         <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
           <maml:name>DoNotConnect</maml:name>
           <maml:description>
@@ -1619,18 +1347,6 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-          <maml:name>M365DomainForPWPolicyTest</maml:name>
-          <maml:description>
-            <maml:para>The domain name of the Microsoft 365 environment to test. This parameter is not mandatory and by default it will pass/fail all found domains as a group if a specific domain is not specified.</maml:para>
-          </maml:description>
-          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
-          <dev:type>
-            <maml:name>String</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>None</dev:defaultValue>
-        </command:parameter>
         <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
           <maml:name>NoModuleCheck</maml:name>
           <maml:description>
@@ -1642,14 +1358,62 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
-          <maml:name>ProgressAction</maml:name>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>DoNotConfirmConnections</maml:name>
           <maml:description>
-            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
+            <maml:para>If specified, the cmdlet will not prompt for confirmation before proceeding with established connections and will disconnect from all of them.</maml:para>
           </maml:description>
-          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
           <dev:type>
-            <maml:name>ActionPreference</maml:name>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="wi">
+          <maml:name>WhatIf</maml:name>
+          <maml:description>
+            <maml:para>Shows what would happen if the cmdlet runs. The cmdlet is not run.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="cf">
+          <maml:name>Confirm</maml:name>
+          <maml:description>
+            <maml:para>Prompts you for confirmation before running the cmdlet.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
+      </command:syntaxItem>
+      <command:syntaxItem>
+        <maml:name>Invoke-M365SecurityAudit</maml:name>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>TenantAdminUrl</maml:name>
+          <maml:description>
+            <maml:para>The URL of the tenant admin. If not specified, none of the SharePoint Online tests will run.</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
+          <dev:type>
+            <maml:name>String</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>DomainName</maml:name>
+          <maml:description>
+            <maml:para>The domain name of the Microsoft 365 environment to test. This parameter is not mandatory and by default it will pass/fail all found domains as a group if a specific domain is not specified.</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
+          <dev:type>
+            <maml:name>String</maml:name>
             <maml:uri />
           </dev:type>
           <dev:defaultValue>None</dev:defaultValue>
@@ -1667,21 +1431,42 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
           <dev:defaultValue>None</dev:defaultValue>
         </command:parameter>
         <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-          <maml:name>TenantAdminUrl</maml:name>
+          <maml:name>DoNotConnect</maml:name>
           <maml:description>
-            <maml:para>The URL of the tenant admin. If not specified, none of the SharePoint Online tests will run.</maml:para>
+            <maml:para>If specified, the cmdlet will not establish a connection to Microsoft 365 services.</maml:para>
           </maml:description>
-          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
           <dev:type>
-            <maml:name>String</maml:name>
+            <maml:name>SwitchParameter</maml:name>
             <maml:uri />
           </dev:type>
-          <dev:defaultValue>None</dev:defaultValue>
+          <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="cf">
-          <maml:name>Confirm</maml:name>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>DoNotDisconnect</maml:name>
           <maml:description>
-            <maml:para>Prompts you for confirmation before running the cmdlet.</maml:para>
+            <maml:para>If specified, the cmdlet will not disconnect from Microsoft 365 services after execution.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>NoModuleCheck</maml:name>
+          <maml:description>
+            <maml:para>If specified, the cmdlet will not check for the presence of required modules.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>DoNotConfirmConnections</maml:name>
+          <maml:description>
+            <maml:para>If specified, the cmdlet will not prompt for confirmation before proceeding with established connections and will disconnect from all of them.</maml:para>
           </maml:description>
           <dev:type>
             <maml:name>SwitchParameter</maml:name>
@@ -1700,44 +1485,43 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="cf">
+          <maml:name>Confirm</maml:name>
+          <maml:description>
+            <maml:para>Prompts you for confirmation before running the cmdlet.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
       </command:syntaxItem>
     </command:syntax>
     <command:parameters>
       <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-        <maml:name>DoNotConfirmConnections</maml:name>
+        <maml:name>TenantAdminUrl</maml:name>
         <maml:description>
-          <maml:para>If specified, the cmdlet will not prompt for confirmation before proceeding with established connections and will disconnect from all of them.</maml:para>
+          <maml:para>The URL of the tenant admin. If not specified, none of the SharePoint Online tests will run.</maml:para>
         </maml:description>
-        <command:parameterValue required="false" variableLength="false">SwitchParameter</command:parameterValue>
+        <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
         <dev:type>
-          <maml:name>SwitchParameter</maml:name>
+          <maml:name>String</maml:name>
           <maml:uri />
         </dev:type>
-        <dev:defaultValue>False</dev:defaultValue>
+        <dev:defaultValue>None</dev:defaultValue>
       </command:parameter>
       <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-        <maml:name>DoNotConnect</maml:name>
+        <maml:name>DomainName</maml:name>
         <maml:description>
-          <maml:para>If specified, the cmdlet will not establish a connection to Microsoft 365 services.</maml:para>
+          <maml:para>The domain name of the Microsoft 365 environment to test. This parameter is not mandatory and by default it will pass/fail all found domains as a group if a specific domain is not specified.</maml:para>
         </maml:description>
-        <command:parameterValue required="false" variableLength="false">SwitchParameter</command:parameterValue>
+        <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
         <dev:type>
-          <maml:name>SwitchParameter</maml:name>
+          <maml:name>String</maml:name>
           <maml:uri />
         </dev:type>
-        <dev:defaultValue>False</dev:defaultValue>
-      </command:parameter>
-      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-        <maml:name>DoNotDisconnect</maml:name>
-        <maml:description>
-          <maml:para>If specified, the cmdlet will not disconnect from Microsoft 365 services after execution.</maml:para>
-        </maml:description>
-        <command:parameterValue required="false" variableLength="false">SwitchParameter</command:parameterValue>
-        <dev:type>
-          <maml:name>SwitchParameter</maml:name>
-          <maml:uri />
-        </dev:type>
-        <dev:defaultValue>False</dev:defaultValue>
+        <dev:defaultValue>None</dev:defaultValue>
       </command:parameter>
       <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
         <maml:name>ELevel</maml:name>
@@ -1751,6 +1535,18 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
         </dev:type>
         <dev:defaultValue>None</dev:defaultValue>
       </command:parameter>
+      <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+        <maml:name>ProfileLevel</maml:name>
+        <maml:description>
+          <maml:para>Specifies the profile level (L1 or L2) for the audit. This parameter is optional and can be combined with the ELevel parameter.</maml:para>
+        </maml:description>
+        <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
+        <dev:type>
+          <maml:name>String</maml:name>
+          <maml:uri />
+        </dev:type>
+        <dev:defaultValue>None</dev:defaultValue>
+      </command:parameter>
       <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
         <maml:name>IncludeIG1</maml:name>
         <maml:description>
@@ -1799,54 +1595,6 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
         </dev:type>
         <dev:defaultValue>None</dev:defaultValue>
       </command:parameter>
-      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-        <maml:name>M365DomainForPWPolicyTest</maml:name>
-        <maml:description>
-          <maml:para>The domain name of the Microsoft 365 environment to test. This parameter is not mandatory and by default it will pass/fail all found domains as a group if a specific domain is not specified.</maml:para>
-        </maml:description>
-        <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
-        <dev:type>
-          <maml:name>String</maml:name>
-          <maml:uri />
-        </dev:type>
-        <dev:defaultValue>None</dev:defaultValue>
-      </command:parameter>
-      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-        <maml:name>NoModuleCheck</maml:name>
-        <maml:description>
-          <maml:para>If specified, the cmdlet will not check for the presence of required modules.</maml:para>
-        </maml:description>
-        <command:parameterValue required="false" variableLength="false">SwitchParameter</command:parameterValue>
-        <dev:type>
-          <maml:name>SwitchParameter</maml:name>
-          <maml:uri />
-        </dev:type>
-        <dev:defaultValue>False</dev:defaultValue>
-      </command:parameter>
-      <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-        <maml:name>ProfileLevel</maml:name>
-        <maml:description>
-          <maml:para>Specifies the profile level (L1 or L2) for the audit. This parameter is optional and can be combined with the ELevel parameter.</maml:para>
-        </maml:description>
-        <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
-        <dev:type>
-          <maml:name>String</maml:name>
-          <maml:uri />
-        </dev:type>
-        <dev:defaultValue>None</dev:defaultValue>
-      </command:parameter>
-      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
-        <maml:name>ProgressAction</maml:name>
-        <maml:description>
-          <maml:para>{{ Fill ProgressAction Description }}</maml:para>
-        </maml:description>
-        <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
-        <dev:type>
-          <maml:name>ActionPreference</maml:name>
-          <maml:uri />
-        </dev:type>
-        <dev:defaultValue>None</dev:defaultValue>
-      </command:parameter>
       <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
         <maml:name>SkipRecommendation</maml:name>
         <maml:description>
@@ -1860,21 +1608,45 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
         <dev:defaultValue>None</dev:defaultValue>
       </command:parameter>
       <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
-        <maml:name>TenantAdminUrl</maml:name>
+        <maml:name>DoNotConnect</maml:name>
         <maml:description>
-          <maml:para>The URL of the tenant admin. If not specified, none of the SharePoint Online tests will run.</maml:para>
+          <maml:para>If specified, the cmdlet will not establish a connection to Microsoft 365 services.</maml:para>
         </maml:description>
-        <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
+        <command:parameterValue required="false" variableLength="false">SwitchParameter</command:parameterValue>
         <dev:type>
-          <maml:name>String</maml:name>
+          <maml:name>SwitchParameter</maml:name>
           <maml:uri />
         </dev:type>
-        <dev:defaultValue>None</dev:defaultValue>
+        <dev:defaultValue>False</dev:defaultValue>
       </command:parameter>
-      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="cf">
-        <maml:name>Confirm</maml:name>
+      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+        <maml:name>DoNotDisconnect</maml:name>
         <maml:description>
-          <maml:para>Prompts you for confirmation before running the cmdlet.</maml:para>
+          <maml:para>If specified, the cmdlet will not disconnect from Microsoft 365 services after execution.</maml:para>
+        </maml:description>
+        <command:parameterValue required="false" variableLength="false">SwitchParameter</command:parameterValue>
+        <dev:type>
+          <maml:name>SwitchParameter</maml:name>
+          <maml:uri />
+        </dev:type>
+        <dev:defaultValue>False</dev:defaultValue>
+      </command:parameter>
+      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+        <maml:name>NoModuleCheck</maml:name>
+        <maml:description>
+          <maml:para>If specified, the cmdlet will not check for the presence of required modules.</maml:para>
+        </maml:description>
+        <command:parameterValue required="false" variableLength="false">SwitchParameter</command:parameterValue>
+        <dev:type>
+          <maml:name>SwitchParameter</maml:name>
+          <maml:uri />
+        </dev:type>
+        <dev:defaultValue>False</dev:defaultValue>
+      </command:parameter>
+      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+        <maml:name>DoNotConfirmConnections</maml:name>
+        <maml:description>
+          <maml:para>If specified, the cmdlet will not prompt for confirmation before proceeding with established connections and will disconnect from all of them.</maml:para>
         </maml:description>
         <command:parameterValue required="false" variableLength="false">SwitchParameter</command:parameterValue>
         <dev:type>
@@ -1895,6 +1667,18 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
         </dev:type>
         <dev:defaultValue>False</dev:defaultValue>
       </command:parameter>
+      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="cf">
+        <maml:name>Confirm</maml:name>
+        <maml:description>
+          <maml:para>Prompts you for confirmation before running the cmdlet.</maml:para>
+        </maml:description>
+        <command:parameterValue required="false" variableLength="false">SwitchParameter</command:parameterValue>
+        <dev:type>
+          <maml:name>SwitchParameter</maml:name>
+          <maml:uri />
+        </dev:type>
+        <dev:defaultValue>False</dev:defaultValue>
+      </command:parameter>
     </command:parameters>
     <command:inputTypes>
       <command:inputType>
@@ -2038,18 +1822,6 @@ PS&gt; $auditResults | Export-Csv -Path "auditResults.csv" -NoTypeInformation</d
           </dev:type>
           <dev:defaultValue>None</dev:defaultValue>
         </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
-          <maml:name>ProgressAction</maml:name>
-          <maml:description>
-            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
-          </maml:description>
-          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
-          <dev:type>
-            <maml:name>ActionPreference</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>None</dev:defaultValue>
-        </command:parameter>
       </command:syntaxItem>
     </command:syntax>
     <command:parameters>
@@ -2065,18 +1837,6 @@ PS&gt; $auditResults | Export-Csv -Path "auditResults.csv" -NoTypeInformation</d
         </dev:type>
         <dev:defaultValue>None</dev:defaultValue>
       </command:parameter>
-      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
-        <maml:name>ProgressAction</maml:name>
-        <maml:description>
-          <maml:para>{{ Fill ProgressAction Description }}</maml:para>
-        </maml:description>
-        <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
-        <dev:type>
-          <maml:name>ActionPreference</maml:name>
-          <maml:uri />
-        </dev:type>
-        <dev:defaultValue>None</dev:defaultValue>
-      </command:parameter>
       <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="2" aliases="none">
         <maml:name>WorksheetName</maml:name>
         <maml:description>
@@ -2160,33 +1920,9 @@ This command imports data from the "Sheet1" worksheet in the "Report.xlsx" file,
           </dev:type>
           <dev:defaultValue>None</dev:defaultValue>
         </command:parameter>
-        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
-          <maml:name>ProgressAction</maml:name>
-          <maml:description>
-            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
-          </maml:description>
-          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
-          <dev:type>
-            <maml:name>ActionPreference</maml:name>
-            <maml:uri />
-          </dev:type>
-          <dev:defaultValue>None</dev:defaultValue>
-        </command:parameter>
       </command:syntaxItem>
     </command:syntax>
     <command:parameters>
-      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="2" aliases="none">
-        <maml:name>CsvPath</maml:name>
-        <maml:description>
-          <maml:para>Specifies the path to the CSV file containing new data. This parameter is mandatory.</maml:para>
-        </maml:description>
-        <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
-        <dev:type>
-          <maml:name>String</maml:name>
-          <maml:uri />
-        </dev:type>
-        <dev:defaultValue>None</dev:defaultValue>
-      </command:parameter>
       <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="1" aliases="none">
         <maml:name>ExcelPath</maml:name>
         <maml:description>
@@ -2199,14 +1935,14 @@ This command imports data from the "Sheet1" worksheet in the "Report.xlsx" file,
         </dev:type>
         <dev:defaultValue>None</dev:defaultValue>
       </command:parameter>
-      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
-        <maml:name>ProgressAction</maml:name>
+      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="2" aliases="none">
+        <maml:name>CsvPath</maml:name>
         <maml:description>
-          <maml:para>{{ Fill ProgressAction Description }}</maml:para>
+          <maml:para>Specifies the path to the CSV file containing new data. This parameter is mandatory.</maml:para>
         </maml:description>
-        <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
+        <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
         <dev:type>
-          <maml:name>ActionPreference</maml:name>
+          <maml:name>String</maml:name>
           <maml:uri />
         </dev:type>
         <dev:defaultValue>None</dev:defaultValue>