change: refactored test output and created new functions

source/Private/Invoke-TestFunction.ps1

@@ -0,0 +1,34 @@
+function Invoke-TestFunction {
+    param (
+        [Parameter(Mandatory = $true)]
+        [PSObject]$FunctionFile,
+
+        [Parameter(Mandatory = $true)]
+        [string]$DomainName
+    )
+
+    $functionName = $FunctionFile.BaseName
+    $functionCmd = Get-Command -Name $functionName
+
+    # Check if the test function needs DomainName parameter
+    $paramList = @{}
+    if ('DomainName' -in $functionCmd.Parameters.Keys) {
+        $paramList.DomainName = $DomainName
+    }
+
+    # Use splatting to pass parameters
+    Write-Host "Running $functionName..."
+    try {
+        $result = & $functionName @paramList
+        # Assuming each function returns an array of CISAuditResult or a single CISAuditResult
+        return $result
+    }
+    catch {
+        Write-Error "An error occurred during the test: $_"
+        $script:FailedTests.Add([PSCustomObject]@{ Test = $functionName; Error = $_ })
+
+        # Call Initialize-CISAuditResult with error parameters
+        $auditResult = Initialize-CISAuditResult -Rec $functionName -Failure
+        return $auditResult
+    }
+}

source/Private/Measure-AuditResult.ps1

@@ -0,0 +1,31 @@
+function Measure-AuditResult {
+    param (
+        [Parameter(Mandatory = $true)]
+        [System.Collections.ArrayList]$AllAuditResults,
+
+        [Parameter(Mandatory = $false)]
+        [System.Collections.ArrayList]$FailedTests
+    )
+
+    # Calculate the total number of tests
+    $totalTests = $AllAuditResults.Count
+
+    # Calculate the number of passed tests
+    $passedTests = $AllAuditResults.ToArray() | Where-Object { $_.Result -eq $true } | Measure-Object | Select-Object -ExpandProperty Count
+
+    # Calculate the pass percentage
+    $passPercentage = if ($totalTests -eq 0) { 0 } else { [math]::Round(($passedTests / $totalTests) * 100, 2) }
+
+    # Display the pass percentage to the user
+    Write-Host "Audit completed. $passedTests out of $totalTests tests passed." -ForegroundColor Cyan
+    Write-Host "Your passing percentage is $passPercentage%."
+
+    # Display details of failed tests
+    if ($FailedTests.Count -gt 0) {
+        Write-Host "The following tests failed to complete:" -ForegroundColor Red
+        foreach ($failedTest in $FailedTests) {
+            Write-Host "Test: $($failedTest.Test)" -ForegroundColor Yellow
+            Write-Host "Error: $($failedTest.Error)" -ForegroundColor Yellow
+        }
+    }
+}

source/Public/Invoke-M365SecurityAudit.ps1

@@ -1,64 +1,3 @@
-<#
-    .SYNOPSIS
-    Invokes a security audit for Microsoft 365 environments.
-    .DESCRIPTION
-    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. This parameter is mandatory.
-    .PARAMETER DomainName
-    The domain name of the Microsoft 365 environment. This parameter is mandatory.
-    .PARAMETER ELevel
-    Specifies the E-Level (E3 or E5) for the audit. This parameter is optional and can be combined with the ProfileLevel parameter.
-    .PARAMETER ProfileLevel
-    Specifies the profile level (L1 or L2) for the audit. This parameter is optional and can be combined with the ELevel parameter.
-    .PARAMETER IncludeIG1
-    If specified, includes tests where IG1 is true.
-    .PARAMETER IncludeIG2
-    If specified, includes tests where IG2 is true.
-    .PARAMETER IncludeIG3
-    If specified, includes tests where IG3 is true.
-    .PARAMETER IncludeRecommendation
-    Specifies specific recommendations to include in the audit. Accepts an array of recommendation numbers.
-    .PARAMETER SkipRecommendation
-    Specifies specific recommendations to exclude from the audit. Accepts an array of recommendation numbers.
-    .PARAMETER DoNotConnect
-    If specified, the cmdlet will not establish a connection to Microsoft 365 services.
-    .PARAMETER DoNotDisconnect
-    If specified, the cmdlet will not disconnect from Microsoft 365 services after execution.
-    .PARAMETER NoModuleCheck
-    If specified, the cmdlet will not check for the presence of required modules.
-    .EXAMPLE
-    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.
-    .EXAMPLE
-    PS> Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -DomainName "contoso.com" -IncludeIG1
-
-    Performs an audit including all tests where IG1 is true.
-    .EXAMPLE
-    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.
-    .EXAMPLE
-    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.
-    .INPUTS
-    None. You cannot pipe objects to Invoke-M365SecurityAudit.
-    .OUTPUTS
-    CISAuditResult[]
-    The cmdlet returns an array of CISAuditResult objects representing the results of the security audit.
-    .NOTES
-        - This module is based on CIS benchmarks.
-        - Governed by the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License.
-        - Commercial use is not permitted. This module cannot be sold or used for commercial purposes.
-        - Modifications and sharing are allowed under the same license.
-        - For full license details, visit: https://creativecommons.org/licenses/by-nc-sa/4.0/deed.en
-        - Register for CIS Benchmarks at: https://www.cisecurity.org/cis-benchmarks
-    .LINK
-    https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Invoke-M365SecurityAudit
-#>
 function Invoke-M365SecurityAudit {
     [CmdletBinding(SupportsShouldProcess = $true, DefaultParameterSetName = 'Default')]
     [OutputType([CISAuditResult[]])]
@@ -92,12 +31,12 @@ function Invoke-M365SecurityAudit {
         [Parameter(Mandatory = $true, ParameterSetName = 'RecFilter')]
         [ValidateSet(
             '1.1.1', '1.1.3', '1.2.1', '1.2.2', '1.3.1', '1.3.3', '1.3.6', '2.1.1', '2.1.2', `
-                '2.1.3', '2.1.4', '2.1.5', '2.1.6', '2.1.7', '2.1.9', '3.1.1', '5.1.2.3', `
+            '2.1.3', '2.1.4', '2.1.5', '2.1.6', '2.1.7', '2.1.9', '3.1.1', '5.1.2.3', `
-                '5.1.8.1', '6.1.1', '6.1.2', '6.1.3', '6.2.1', '6.2.2', '6.2.3', '6.3.1', `
+            '5.1.8.1', '6.1.1', '6.1.2', '6.1.3', '6.2.1', '6.2.2', '6.2.3', '6.3.1', `
-                '6.5.1', '6.5.2', '6.5.3', '7.2.1', '7.2.10', '7.2.2', '7.2.3', '7.2.4', `
+            '6.5.1', '6.5.2', '6.5.3', '7.2.1', '7.2.10', '7.2.2', '7.2.3', '7.2.4', `
-                '7.2.5', '7.2.6', '7.2.7', '7.2.9', '7.3.1', '7.3.2', '7.3.4', '8.1.1', `
+            '7.2.5', '7.2.6', '7.2.7', '7.2.9', '7.3.1', '7.3.2', '7.3.4', '8.1.1', `
-                '8.1.2', '8.2.1', '8.5.1', '8.5.2', '8.5.3', '8.5.4', '8.5.5', '8.5.6', `
+            '8.1.2', '8.2.1', '8.5.1', '8.5.2', '8.5.3', '8.5.4', '8.5.5', '8.5.6', `
-                '8.5.7', '8.6.1'
+            '8.5.7', '8.6.1'
         )]
         [string[]]$IncludeRecommendation,
 
@@ -105,12 +44,12 @@ function Invoke-M365SecurityAudit {
         [Parameter(Mandatory = $true, ParameterSetName = 'SkipRecFilter')]
         [ValidateSet(
             '1.1.1', '1.1.3', '1.2.1', '1.2.2', '1.3.1', '1.3.3', '1.3.6', '2.1.1', '2.1.2', `
-                '2.1.3', '2.1.4', '2.1.5', '2.1.6', '2.1.7', '2.1.9', '3.1.1', '5.1.2.3', `
+            '2.1.3', '2.1.4', '2.1.5', '2.1.6', '2.1.7', '2.1.9', '3.1.1', '5.1.2.3', `
-                '5.1.8.1', '6.1.1', '6.1.2', '6.1.3', '6.2.1', '6.2.2', '6.2.3', '6.3.1', `
+            '5.1.8.1', '6.1.1', '6.1.2', '6.1.3', '6.2.1', '6.2.2', '6.2.3', '6.3.1', `
-                '6.5.1', '6.5.2', '6.5.3', '7.2.1', '7.2.10', '7.2.2', '7.2.3', '7.2.4', `
+            '6.5.1', '6.5.2', '6.5.3', '7.2.1', '7.2.10', '7.2.2', '7.2.3', '7.2.4', `
-                '7.2.5', '7.2.6', '7.2.7', '7.2.9', '7.3.1', '7.3.2', '7.3.4', '8.1.1', `
+            '7.2.5', '7.2.6', '7.2.7', '7.2.9', '7.3.1', '7.3.2', '7.3.4', '8.1.1', `
-                '8.1.2', '8.2.1', '8.5.1', '8.5.2', '8.5.3', '8.5.4', '8.5.5', '8.5.6', `
+            '8.1.2', '8.2.1', '8.5.1', '8.5.2', '8.5.3', '8.5.4', '8.5.5', '8.5.6', `
-                '8.5.7', '8.6.1'
+            '8.5.7', '8.6.1'
         )]
         [string[]]$SkipRecommendation,
 
@@ -120,14 +59,11 @@ function Invoke-M365SecurityAudit {
         [switch]$NoModuleCheck
     )
 
-
-
     Begin {
         if ($script:MaximumFunctionCount -lt 8192) {
             $script:MaximumFunctionCount = 8192
         }
         # Ensure required modules are installed
-        # Define the required modules and versions in a hashtable
         if (!($NoModuleCheck)) {
             $requiredModules = @(
                 @{ ModuleName = "ExchangeOnlineManagement"; RequiredVersion = "3.3.0" },
@@ -147,16 +83,12 @@ function Invoke-M365SecurityAudit {
             }
         }
 
-
-        # Loop through each required module and assert its availability
-
-        # Establishing connections
-
         # Load test definitions from CSV
         $testDefinitionsPath = Join-Path -Path $PSScriptRoot -ChildPath "helper\TestDefinitions.csv"
         $testDefinitions = Import-Csv -Path $testDefinitionsPath
         # Load the Test Definitions into the script scope for use in other functions
         $script:TestDefinitionsObject = $testDefinitions
+
         # Apply filters based on parameter sets
         $params = @{
             TestDefinitions       = $testDefinitions
@@ -167,7 +99,7 @@ function Invoke-M365SecurityAudit {
             SkipRecommendation    = $SkipRecommendation
         }
         $testDefinitions = Get-TestDefinitionsObject @params
-        # End switch ($PSCmdlet.ParameterSetName)
+
         # Extract unique connections needed
         $requiredConnections = $testDefinitions.Connection | Sort-Object -Unique
 
@@ -175,17 +107,19 @@ function Invoke-M365SecurityAudit {
         if (!($DoNotConnect)) {
             Connect-M365Suite -TenantAdminUrl $TenantAdminUrl -RequiredConnections $requiredConnections
         }
+
         # Determine which test files to load based on filtering
         $testsToLoad = $testDefinitions.TestFileName | ForEach-Object { $_ -replace '.ps1$', '' }
 
-        # Display the tests that would be loaded if the function is called with -WhatIf
-
         Write-Verbose "The $(($testsToLoad).count) test/s that would be loaded based on filter criteria:"
         $testsToLoad | ForEach-Object { Write-Verbose " $_" }
+
+        # Initialize a collection to hold failed test details
+        $script:FailedTests = [System.Collections.ArrayList]::new()
     } # End Begin
 
     Process {
-        $allAuditResults = [System.Collections.ArrayList]::new() #@()  # Initialize a collection to hold all results
+        $allAuditResults = [System.Collections.ArrayList]::new() # Initialize a collection to hold all results
 
         # Dynamically dot-source the test scripts
         $testsFolderPath = Join-Path -Path $PSScriptRoot -ChildPath "tests"
@@ -199,26 +133,16 @@ function Invoke-M365SecurityAudit {
             }
             Catch {
                 Write-Error "Failed to load test function $($_.Name): $_"
+                $script:FailedTests.Add([PSCustomObject]@{ Test = $_.Name; Error = $_ })
             }
         }
 
         # Execute each test function from the prepared list
         foreach ($testFunction in $testFiles) {
             $functionName = $testFunction.BaseName
-            $functionCmd = Get-Command -Name $functionName
-
-            # Check if the test function needs DomainName parameter
-            $paramList = @{}
-            if ('DomainName' -in $functionCmd.Parameters.Keys) {
-                $paramList.DomainName = $DomainName
-            }
-
-            # Use splatting to pass parameters
             if ($PSCmdlet.ShouldProcess($functionName, "Execute test")) {
-                Write-Host "Running $functionName..."
+                $auditResult = Invoke-TestFunction -FunctionFile $testFunction -DomainName $DomainName
-                $result = & $functionName @paramList
+                [void]$allAuditResults.Add($auditResult)
-                # Assuming each function returns an array of CISAuditResult or a single CISAuditResult
-                [void]($allAuditResults.add($Result))
             }
         }
     }
@@ -228,20 +152,11 @@ function Invoke-M365SecurityAudit {
             # Clean up sessions
             Disconnect-M365Suite -RequiredConnections $requiredConnections
         }
-        # Calculate the total number of tests
-        $totalTests = $allAuditResults.Count
 
-        # Calculate the number of passed tests
+        # Call the private function to calculate and display results
-        $passedTests = $allAuditResults.ToArray() | Where-Object { $_.Result -eq $true } | Measure-Object | Select-Object -ExpandProperty Count
+        Measure-AuditResult -AllAuditResults $allAuditResults -FailedTests $script:FailedTests
 
-        # Calculate the pass percentage
-        $passPercentage = if ($totalTests -eq 0) { 0 } else { [math]::Round(($passedTests / $totalTests) * 100, 2) }
-
-        # Display the pass percentage to the user
-        Write-Host "Audit completed. $passedTests out of $totalTests tests passed." -ForegroundColor Cyan
-        Write-Host "Your passing percentage is $passPercentage%."
         # Return all collected audit results
         return $allAuditResults.ToArray()
-        # Check if the Disconnect switch is present
     }
-}
+}

source/tests/Test-AdministrativeAccountCompliance.ps1

@@ -79,6 +79,12 @@ function Test-AdministrativeAccountCompliance {
         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
         }

source/tests/Test-AntiPhishingPolicy.ps1

@@ -76,6 +76,13 @@ function Test-AntiPhishingPolicy {
         }
         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
         }

source/tests/Test-AuditDisabledFalse.ps1

@@ -48,6 +48,13 @@ function Test-AuditDisabledFalse {
         }
         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
         }

source/tests/Test-AuditLogSearch.ps1

@@ -49,6 +49,12 @@ function Test-AuditLogSearch {
         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
         }

source/tests/Test-BlockChannelEmails.ps1

@@ -49,6 +49,12 @@ function Test-BlockChannelEmails {
         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
         }

source/tests/Test-BlockMailForwarding.ps1

@@ -49,6 +49,12 @@ function Test-BlockMailForwarding {
         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
         }

source/tests/Test-BlockSharedMailboxSignIn.ps1

@@ -51,6 +51,12 @@ function Test-BlockSharedMailboxSignIn {
         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
         }

source/tests/Test-CommonAttachmentFilter.ps1

@@ -48,6 +48,12 @@ function Test-CommonAttachmentFilter {
         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
         }

source/tests/Test-CustomerLockbox.ps1

@@ -49,6 +49,12 @@ function Test-CustomerLockbox {
         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
         }

source/tests/Test-DialInBypassLobby.ps1

@@ -49,6 +49,12 @@ function Test-DialInBypassLobby {
         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
         }

source/tests/Test-DisallowInfectedFilesDownload.ps1

@@ -50,6 +50,12 @@ function Test-DisallowInfectedFilesDownload {
         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
         }

source/tests/Test-EnableDKIM.ps1

@@ -50,6 +50,12 @@ function Test-EnableDKIM {
         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
         }

source/tests/Test-ExternalNoControl.ps1

@@ -50,6 +50,12 @@ function Test-ExternalNoControl {
         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
         }

source/tests/Test-ExternalSharingCalendars.ps1

@@ -59,6 +59,12 @@ function Test-ExternalSharingCalendars {
         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
         }

source/tests/Test-GlobalAdminsCount.ps1

@@ -50,6 +50,12 @@ function Test-GlobalAdminsCount {
         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
         }

source/tests/Test-GuestAccessExpiration.ps1

@@ -45,6 +45,12 @@ function Test-GuestAccessExpiration {
         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
         }

source/tests/Test-GuestUsersBiweeklyReview.ps1

@@ -51,6 +51,12 @@ function Test-GuestUsersBiweeklyReview {
         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
         }

source/tests/Test-IdentifyExternalEmail.ps1

@@ -45,6 +45,12 @@ function Test-IdentifyExternalEmail {
         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
         }

source/tests/Test-LinkSharingRestrictions.ps1

@@ -45,6 +45,12 @@ function Test-LinkSharingRestrictions {
         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
         }

source/tests/Test-MailTipsEnabled.ps1

@@ -51,6 +51,12 @@ function Test-MailTipsEnabled {
         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
         }

source/tests/Test-MailboxAuditingE3.ps1

@@ -82,6 +82,12 @@ 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
         }

source/tests/Test-MailboxAuditingE5.ps1

@@ -88,6 +88,12 @@ 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
         }

source/tests/Test-ManagedApprovedPublicGroups.ps1

@@ -48,6 +48,12 @@ function Test-ManagedApprovedPublicGroups {
         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
         }

source/tests/Test-MeetingChatNoAnonymous.ps1

@@ -45,6 +45,12 @@ function Test-MeetingChatNoAnonymous {
         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
         }

source/tests/Test-ModernAuthExchangeOnline.ps1

@@ -43,6 +43,12 @@ function Test-ModernAuthExchangeOnline {
         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
         }

source/tests/Test-ModernAuthSharePoint.ps1

@@ -41,6 +41,12 @@ function Test-ModernAuthSharePoint {
         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
         }

source/tests/Test-NoAnonymousMeetingJoin.ps1

@@ -14,39 +14,45 @@ function Test-NoAnonymousMeetingJoin {
 
     process {
         try {
-        # 8.5.1 (L2) Ensure anonymous users can't join a meeting
+            # 8.5.1 (L2) Ensure anonymous users can't join a meeting
 
-        # Connect to Teams PowerShell using Connect-MicrosoftTeams
+            # Connect to Teams PowerShell using Connect-MicrosoftTeams
 
-        $teamsMeetingPolicy = Get-CsTeamsMeetingPolicy -Identity Global
+            $teamsMeetingPolicy = Get-CsTeamsMeetingPolicy -Identity Global
-        $allowAnonymousUsersToJoinMeeting = $teamsMeetingPolicy.AllowAnonymousUsersToJoinMeeting
+            $allowAnonymousUsersToJoinMeeting = $teamsMeetingPolicy.AllowAnonymousUsersToJoinMeeting
 
-        # Prepare failure reasons and details based on compliance
+            # Prepare failure reasons and details based on compliance
-        $failureReasons = if ($allowAnonymousUsersToJoinMeeting) {
+            $failureReasons = if ($allowAnonymousUsersToJoinMeeting) {
-            "Anonymous users are allowed to join meetings"
+                "Anonymous users are allowed to join meetings"
+            }
+            else {
+                "N/A"
+            }
+
+            $details = "AllowAnonymousUsersToJoinMeeting is set to $allowAnonymousUsersToJoinMeeting"
+
+            # Create and populate the CISAuditResult object
+            $params = @{
+                Rec           = $recnum
+                Result        = -not $allowAnonymousUsersToJoinMeeting
+                Status        = if (-not $allowAnonymousUsersToJoinMeeting) { "Pass" } else { "Fail" }
+                Details       = $details
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-        else {
+        catch {
-            "N/A"
+            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
         }
-
-        $details = "AllowAnonymousUsersToJoinMeeting is set to $allowAnonymousUsersToJoinMeeting"
-
-        # Create and populate the CISAuditResult object
-        $params = @{
-            Rec            = $recnum
-            Result         = -not $allowAnonymousUsersToJoinMeeting
-            Status         = if (-not $allowAnonymousUsersToJoinMeeting) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
-    }
-    catch {
-        Write-Error "An error occurred during the test: $_"
-
-        # Call Initialize-CISAuditResult with error parameters
-        $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
-    }
     }
 
     end {

source/tests/Test-NoAnonymousMeetingStart.ps1

@@ -44,6 +44,12 @@ function Test-NoAnonymousMeetingStart {
         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
         }

source/tests/Test-NoWhitelistDomains.ps1

@@ -48,6 +48,12 @@ function Test-NoWhitelistDomains {
         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
         }

source/tests/Test-NotifyMalwareInternal.ps1

@@ -14,52 +14,58 @@ function Test-NotifyMalwareInternal {
 
     process {
         try {
-        # 2.1.3 Ensure notifications for internal users sending malware is Enabled
+            # 2.1.3 Ensure notifications for internal users sending malware is Enabled
 
-        # Retrieve all 'Custom' malware filter policies and check notification settings
+            # Retrieve all 'Custom' malware filter policies and check notification settings
-        $malwareNotifications = Get-MalwareFilterPolicy | Where-Object { $_.RecommendedPolicyType -eq 'Custom' }
+            $malwareNotifications = Get-MalwareFilterPolicy | Where-Object { $_.RecommendedPolicyType -eq 'Custom' }
-        $policiesToReport = @()
+            $policiesToReport = @()
 
-        foreach ($policy in $malwareNotifications) {
+            foreach ($policy in $malwareNotifications) {
-            if ($policy.EnableInternalSenderAdminNotifications -ne $true) {
+                if ($policy.EnableInternalSenderAdminNotifications -ne $true) {
-                $policiesToReport += "$($policy.Identity): Notifications Disabled"
+                    $policiesToReport += "$($policy.Identity): Notifications Disabled"
+                }
             }
-        }
 
-        # Determine the result based on the presence of custom policies without notifications
+            # Determine the result based on the presence of custom policies without notifications
-        $result = $policiesToReport.Count -eq 0
+            $result = $policiesToReport.Count -eq 0
 
-        # Prepare failure reasons and details based on compliance
+            # Prepare failure reasons and details based on compliance
-        $failureReasons = if ($result) {
+            $failureReasons = if ($result) {
-            "N/A"
+                "N/A"
-        }
+            }
-        else {
+            else {
-            "Some custom policies do not have notifications for internal users sending malware enabled."
+                "Some custom policies do not have notifications for internal users sending malware enabled."
-        }
+            }
 
-        $details = if ($result) {
+            $details = if ($result) {
-            "All custom malware policies have notifications enabled."
+                "All custom malware policies have notifications enabled."
-        }
+            }
-        else {
+            else {
-            "Misconfigured Policies: $($policiesToReport -join ', ')"
+                "Misconfigured Policies: $($policiesToReport -join ', ')"
-        }
+            }
 
-        # Create and populate the CISAuditResult object
+            # Create and populate the CISAuditResult object
-        $params = @{
+            $params = @{
-            Rec            = $recnum
+                Rec           = $recnum
-            Result         = $result
+                Result        = $result
-            Status         = if ($result) { "Pass" } else { "Fail" }
+                Status        = if ($result) { "Pass" } else { "Fail" }
-            Details        = $details
+                Details       = $details
-            FailureReason  = $failureReasons
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-        $auditResult = Initialize-CISAuditResult @params
+        catch {
-    }
+            Write-Error "An error occurred during the test: $_"
-    catch {
-        Write-Error "An error occurred during the test: $_"
 
-        # Call Initialize-CISAuditResult with error parameters
+            # Retrieve the description from the test definitions
-        $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $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
+        }
     }
 
     end {

source/tests/Test-OneDriveContentRestrictions.ps1

@@ -48,6 +48,12 @@ function Test-OneDriveContentRestrictions {
         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
         }

source/tests/Test-OneDriveSyncRestrictions.ps1

@@ -48,6 +48,12 @@ function Test-OneDriveSyncRestrictions {
         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
         }

source/tests/Test-OrgOnlyBypassLobby.ps1

@@ -50,6 +50,12 @@ function Test-OrgOnlyBypassLobby {
         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
         }

source/tests/Test-OrganizersPresent.ps1

@@ -14,45 +14,51 @@ function Test-OrganizersPresent {
 
     process {
         try {
-        # 8.5.6 (L2) Ensure only organizers and co-organizers can present
+            # 8.5.6 (L2) Ensure only organizers and co-organizers can present
 
-        # Connect to Teams PowerShell using Connect-MicrosoftTeams
+            # Connect to Teams PowerShell using Connect-MicrosoftTeams
 
-        # Retrieve the Teams meeting policy for presenters
+            # Retrieve the Teams meeting policy for presenters
-        $CsTeamsMeetingPolicyPresenters = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property DesignatedPresenterRoleMode
+            $CsTeamsMeetingPolicyPresenters = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property DesignatedPresenterRoleMode
-        $presenterRoleRestricted = $CsTeamsMeetingPolicyPresenters.DesignatedPresenterRoleMode -eq 'OrganizerOnlyUserOverride'
+            $presenterRoleRestricted = $CsTeamsMeetingPolicyPresenters.DesignatedPresenterRoleMode -eq 'OrganizerOnlyUserOverride'
 
-        # Prepare failure reasons and details based on compliance
+            # Prepare failure reasons and details based on compliance
-        $failureReasons = if (-not $presenterRoleRestricted) {
+            $failureReasons = if (-not $presenterRoleRestricted) {
-            "Others besides organizers and co-organizers can present"
+                "Others besides organizers and co-organizers can present"
-        }
+            }
-        else {
+            else {
-            "N/A"
+                "N/A"
+            }
+
+            $details = if ($presenterRoleRestricted) {
+                "Only organizers and co-organizers can present."
+            }
+            else {
+                "DesignatedPresenterRoleMode is set to $($CsTeamsMeetingPolicyPresenters.DesignatedPresenterRoleMode)"
+            }
+
+            # Create and populate the CISAuditResult object
+            $params = @{
+                Rec           = $recnum
+                Result        = $presenterRoleRestricted
+                Status        = if ($presenterRoleRestricted) { "Pass" } else { "Fail" }
+                Details       = $details
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
+        catch {
+            Write-Error "An error occurred during the test: $_"
 
-        $details = if ($presenterRoleRestricted) {
+            # Retrieve the description from the test definitions
-            "Only organizers and co-organizers can present."
+            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-        }
+            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-        else {
-            "DesignatedPresenterRoleMode is set to $($CsTeamsMeetingPolicyPresenters.DesignatedPresenterRoleMode)"
-        }
 
-        # Create and populate the CISAuditResult object
+            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-        $params = @{
-            Rec            = $recnum
-            Result         = $presenterRoleRestricted
-            Status         = if ($presenterRoleRestricted) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
-    }
-    catch {
-        Write-Error "An error occurred during the test: $_"
 
-        # Call Initialize-CISAuditResult with error parameters
+            # Call Initialize-CISAuditResult with error parameters
-        $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
-    }
+        }
     }
 
     end {

source/tests/Test-PasswordHashSync.ps1

@@ -14,39 +14,45 @@ function Test-PasswordHashSync {
 
     process {
         try {
-        # 5.1.8.1 (L1) Ensure password hash sync is enabled for hybrid deployments
+            # 5.1.8.1 (L1) Ensure password hash sync is enabled for hybrid deployments
-        # Pass if OnPremisesSyncEnabled is True. Fail otherwise.
+            # Pass if OnPremisesSyncEnabled is True. Fail otherwise.
 
-        # Retrieve password hash sync status
+            # Retrieve password hash sync status
-        $passwordHashSync = Get-MgOrganization | Select-Object -ExpandProperty OnPremisesSyncEnabled
+            $passwordHashSync = Get-MgOrganization | Select-Object -ExpandProperty OnPremisesSyncEnabled
-        $hashSyncResult = $passwordHashSync
+            $hashSyncResult = $passwordHashSync
 
-        # Prepare failure reasons and details based on compliance
+            # Prepare failure reasons and details based on compliance
-        $failureReasons = if (-not $hashSyncResult) {
+            $failureReasons = if (-not $hashSyncResult) {
-            "Password hash sync for hybrid deployments is not enabled"
+                "Password hash sync for hybrid deployments is not enabled"
+            }
+            else {
+                "N/A"
+            }
+
+            $details = "OnPremisesSyncEnabled: $($passwordHashSync)"
+
+            # Create and populate the CISAuditResult object
+            $params = @{
+                Rec           = $recnum
+                Result        = $hashSyncResult
+                Status        = if ($hashSyncResult) { "Pass" } else { "Fail" }
+                Details       = $details
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-        else {
+        catch {
-            "N/A"
+            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
         }
-
-        $details = "OnPremisesSyncEnabled: $($passwordHashSync)"
-
-        # Create and populate the CISAuditResult object
-        $params = @{
-            Rec            = $recnum
-            Result         = $hashSyncResult
-            Status         = if ($hashSyncResult) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
-    }
-    catch {
-        Write-Error "An error occurred during the test: $_"
-
-        # Call Initialize-CISAuditResult with error parameters
-        $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
-    }
     }
 
     end {

source/tests/Test-PasswordNeverExpirePolicy.ps1

@@ -44,6 +44,12 @@ function Test-PasswordNeverExpirePolicy {
         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
         }

source/tests/Test-ReauthWithCode.ps1

@@ -43,6 +43,12 @@ function Test-ReauthWithCode {
         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
         }

source/tests/Test-ReportSecurityInTeams.ps1

@@ -53,6 +53,12 @@ function Test-ReportSecurityInTeams {
         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
         }

source/tests/Test-RestrictCustomScripts.ps1

@@ -58,6 +58,12 @@ function Test-RestrictCustomScripts {
         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
         }

source/tests/Test-RestrictExternalSharing.ps1

@@ -43,6 +43,12 @@ function Test-RestrictExternalSharing {
         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
         }

source/tests/Test-RestrictOutlookAddins.ps1

@@ -75,6 +75,12 @@ function Test-RestrictOutlookAddins {
         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
         }

source/tests/Test-RestrictStorageProvidersOutlook.ps1

@@ -14,46 +14,52 @@ function Test-RestrictStorageProvidersOutlook {
 
     process {
         try {
-        # 6.5.3 (L2) Ensure additional storage providers are restricted in Outlook on the web
+            # 6.5.3 (L2) Ensure additional storage providers are restricted in Outlook on the web
 
-        # Retrieve all OwaMailbox policies
+            # Retrieve all OwaMailbox policies
-        $owaPolicies = Get-OwaMailboxPolicy
+            $owaPolicies = Get-OwaMailboxPolicy
-        $nonCompliantPolicies = $owaPolicies | Where-Object { $_.AdditionalStorageProvidersAvailable }
+            $nonCompliantPolicies = $owaPolicies | Where-Object { $_.AdditionalStorageProvidersAvailable }
 
-        # Determine compliance
+            # Determine compliance
-        $allPoliciesRestricted = $nonCompliantPolicies.Count -eq 0
+            $allPoliciesRestricted = $nonCompliantPolicies.Count -eq 0
 
-        # Prepare failure reasons and details based on compliance
+            # Prepare failure reasons and details based on compliance
-        $failureReasons = if ($allPoliciesRestricted) {
+            $failureReasons = if ($allPoliciesRestricted) {
-            "N/A"
+                "N/A"
-        }
+            }
-        else {
+            else {
-            "One or more OwaMailbox policies allow AdditionalStorageProvidersAvailable."
+                "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
+                Result        = $allPoliciesRestricted
+                Status        = if ($allPoliciesRestricted) { "Pass" } else { "Fail" }
+                Details       = $details
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
+        catch {
+            Write-Error "An error occurred during the test: $_"
 
-        $details = if ($allPoliciesRestricted) {
+            # Retrieve the description from the test definitions
-            "All OwaMailbox policies restrict AdditionalStorageProvidersAvailable"
+            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-        }
+            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-        else {
-            "Non-compliant OwaMailbox policies: $($nonCompliantPolicies.Name -join ', ')"
-        }
 
-        # Create and populate the CISAuditResult object
+            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-        $params = @{
-            Rec            = $recnum
-            Result         = $allPoliciesRestricted
-            Status         = if ($allPoliciesRestricted) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
-    }
-    catch {
-        Write-Error "An error occurred during the test: $_"
 
-        # Call Initialize-CISAuditResult with error parameters
+            # Call Initialize-CISAuditResult with error parameters
-        $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
-    }
+        }
     }
 
     end {

source/tests/Test-RestrictTenantCreation.ps1

@@ -43,6 +43,12 @@ function Test-RestrictTenantCreation {
         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
         }

source/tests/Test-SafeAttachmentsPolicy.ps1

@@ -48,6 +48,12 @@ 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
         }

source/tests/Test-SafeAttachmentsTeams.ps1

@@ -55,6 +55,12 @@ 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
         }

source/tests/Test-SafeLinksOfficeApps.ps1

@@ -62,6 +62,12 @@ 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
         }

source/tests/Test-SharePointAADB2B.ps1

@@ -32,6 +32,12 @@ function Test-SharePointAADB2B {
         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
         }

source/tests/Test-SharePointExternalSharingDomains.ps1

@@ -33,6 +33,12 @@ function Test-SharePointExternalSharingDomains {
         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
         }

source/tests/Test-SharePointGuestsItemSharing.ps1

@@ -33,6 +33,12 @@ function Test-SharePointGuestsItemSharing {
         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
         }

source/tests/Test-SpamPolicyAdminNotify.ps1

@@ -48,6 +48,12 @@ function Test-SpamPolicyAdminNotify {
         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
         }

source/tests/Test-TeamsExternalAccess.ps1

@@ -43,6 +43,12 @@ function Test-TeamsExternalAccess {
         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
         }

source/tests/Test-TeamsExternalFileSharing.ps1

@@ -47,6 +47,12 @@ function Test-TeamsExternalFileSharing {
         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
         }

tests/Unit/Private/Invoke-TestFunction.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'
+            }
+        }
+    }
+}
+

tests/Unit/Private/Measure-AuditResult.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'
+            }
+        }
+    }
+}
+