diff --git a/CompilerFolderHandling/New-BcCompilerFolder.ps1 b/CompilerFolderHandling/New-BcCompilerFolder.ps1
index ac398b433..f9adcc252 100644
--- a/CompilerFolderHandling/New-BcCompilerFolder.ps1
+++ b/CompilerFolderHandling/New-BcCompilerFolder.ps1
@@ -154,7 +154,7 @@ try {
                 Write-Host "App apps"
                 $appApps | ForEach-Object { Write-Host "- $($_.Name)" }
             }
-            'Microsoft_Tests-*.app','Microsoft_Performance Toolkit Samples*.app','Microsoft_Performance Toolkit Tests*.app','Microsoft_System Application Test Library*.app','Microsoft_TestRunner-Internal*.app','Microsoft_Business Foundation Test Libraries*.app','Microsoft_AI Test Toolkit*.app' | ForEach-Object {
+                'Microsoft_Tests-*.app', 'Microsoft_Performance Toolkit Samples*.app', 'Microsoft_Performance Toolkit Tests*.app', 'Microsoft_System Application Test Library*.app', 'Microsoft_TestRunner-Internal*.app', 'Microsoft_Business Foundation Test Libraries*.app', 'Microsoft_AI Test Toolkit*.app', 'Microsoft_* Tests.app', 'Microsoft_* Test Library.app' | ForEach-Object {
                 $appName = $_
                 $apps = $appApps | Where-Object { $_.Name -like $appName }
                 if (!$apps) {
diff --git a/HelperFunctions.ps1 b/HelperFunctions.ps1
index d914b9a0e..68c8fb059 100644
--- a/HelperFunctions.ps1
+++ b/HelperFunctions.ps1
@@ -446,9 +446,10 @@ function GetTestToolkitApps {
     
                 if (!$includeTestFrameworkOnly) {
                     # Add Test Libraries
-                    $apps += "Microsoft_System Application Test Library.app", "Microsoft_Business Foundation Test Libraries.app", "Microsoft_Tests-TestLibraries.app", 'Microsoft_AI Test Toolkit.app' | ForEach-Object {
+                    $apps += "Microsoft_System Application Test Library.app", "Microsoft_Business Foundation Test Libraries.app", "Microsoft_Tests-TestLibraries.app", 'Microsoft_AI Test Toolkit.app', 'Microsoft_Library Outlook REST API.app', 'Microsoft_Prevent Metadata Updates.app' | ForEach-Object {
                         @(get-childitem -Path "C:\Applications\*.*" -recurse -filter $_)
                     }
+                    $apps += gci "C:\Applications\*\Test Library" | gci -filter "*.app"
         
                     if (!$includeTestLibrariesOnly) {
                         # Add Tests
@@ -457,9 +458,19 @@ function GetTestToolkitApps {
                                 @(get-childitem -Path "C:\Applications\*.*" -recurse -filter $_)
                             }
                         }
-                        $apps += @(get-childitem -Path "C:\Applications\*.*" -recurse -filter "Microsoft_Tests-*.app") | Where-Object { $_ -notlike "*\Microsoft_Tests-TestLibraries.app" -and ($version.Major -ge 17 -or ($_ -notlike "*\Microsoft_Tests-Marketing.app")) -and $_ -notlike "*\Microsoft_Tests-SINGLESERVER.app" }
+                        $apps += @(get-childitem -Path "C:\Applications\*.*" -recurse) | ? { $_.name -like "Microsoft_Tests-*.app" -or $_.FullName -match '\\Test\\.*[ _]Test(?:s?| Automations).app' } | Where-Object { ($version.Major -ge 17 -or ($_ -notlike "*\Microsoft_Tests-Marketing.app")) }
                     }
                 }
+                # Always exclude these apps
+                $apps = $apps `
+                | Where-Object { $_.name -notlike "Microsoft_E-Document Connector - Avalara Tests.app" } `
+                | Where-Object { $_.name -notlike "Microsoft_E-Document Connector - B2Brouter Tests.app" } `
+                | Where-Object { $_.name -notlike "Microsoft_E-Document Connector - Logiq Tests.app" } `
+                | Where-Object { $_.name -notlike "Microsoft_E-Document Connector - Pagero Tests.app" } `
+                | Where-Object { $_.name -notlike "Microsoft_E-Document Connector - SignUp Tests.app" } `
+                | Where-Object { $_.name -notlike "Microsoft_Service Declaration Tests.app" } `
+                | Where-Object { $_.name -notlike "*Field Service Integration*.app" } `
+                | Where-Object { $_.name -notlike "Microsoft_Tests-SINGLESERVER.app" } 
             }
     
             if ($includePerformanceToolkit) {
@@ -469,13 +480,14 @@ function GetTestToolkitApps {
                 }
             }
     
-            $apps | ForEach-Object {
+            $apps = $apps | ForEach-Object {
                 $appFile = Get-ChildItem -path "c:\applications.*\*.*" -recurse -filter ($_.Name).Replace(".app", "_*.app")
                 if (!($appFile)) {
                     $appFile = $_
                 }
                 $appFile.FullName
             }
+            $apps | Select-Object -Unique
         } -argumentList $includeTestLibrariesOnly, $includeTestFrameworkOnly, $includeTestRunnerOnly, $includePerformanceToolkit
     }
 }
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index f02e81614..449a3814b 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,6 +1,7 @@
 6.1.7
 Issue 3952 Get-AlLanguageExtensionFromArtifacts fails on new BC artifacts
 Add support for TestType field when running tests
+Issue 3729 Missing Test Apps after Import-TestToolkitToBcContainer
 Issue 3943 Error downloading symbols for Microsoft_System
 Add support for RequiredTestIsolation field when running tests