diff --git a/build/projects/System Application Modules/.AL-Go/settings.json b/build/projects/System Application Modules/.AL-Go/settings.json
index e2dd41d0ec7..28784f35e56 100644
--- a/build/projects/System Application Modules/.AL-Go/settings.json	
+++ b/build/projects/System Application Modules/.AL-Go/settings.json	
@@ -3,13 +3,26 @@
   "projectName": "System Application Modules",
   "appFolders": [
     "../../../src/System Application/App/*",
-    "../../../src/Business Foundation/App/*"
+    "../../../src/System Application/App",
+    "../../../src/Business Foundation/App/*",
+    "../../../src/Business Foundation/App"
   ],
   "testFolders": [
     "../../../src/System Application/Test/*",
     "../../../src/System Application/Test Library/*",
+    "../../../src/System Application/Test",
+    "../../../src/System Application/Test Library",
+    "../../../src/System Application/Partner Test",
+    "../../../src/System Application/Partner Test/AI",
     "../../../src/Business Foundation/Test/*",
-    "../../../src/Business Foundation/Test Library/*"
+    "../../../src/Business Foundation/Test Library/*",
+    "../../../src/Business Foundation/Test",
+    "../../../src/Business Foundation/Test Library",
+    "../../../src/Tools/Performance Toolkit/App",
+    "../../../src/Tools/Performance Toolkit/Test",
+    "../../../src/Tools/AI Test Toolkit",
+    "../../../src/Tools/Test Framework/Test Libraries/*",
+    "../../../src/Tools/Test Framework/*"
   ],
   "doNotPublishApps": true,
   "rulesetFile": "../../../src/rulesets/internal.module.ruleset.json",
diff --git a/src/Tools/Performance Toolkit/Test/src/BCPTSetupCardTest.Codeunit.al b/src/Tools/Performance Toolkit/Test/src/BCPTSetupCardTest.Codeunit.al
index 0b402417a3c..7c1a054b5ec 100644
--- a/src/Tools/Performance Toolkit/Test/src/BCPTSetupCardTest.Codeunit.al	
+++ b/src/Tools/Performance Toolkit/Test/src/BCPTSetupCardTest.Codeunit.al	
@@ -131,6 +131,7 @@ codeunit 144741 "BCPT Setup Card Test"
         BCPTSetupCard: TestPage "BCPT Setup Card";
         ActualNoOfIterations: Integer;
         UnexpectedNoOfSqlStmtsLbl: Label 'Unexpected value in %1. Expected %2, Actual %3', Locked = true;
+        OrValueLbl: Label '%1 or %2', Locked = true;
     begin
         Initialize();
 
@@ -152,7 +153,7 @@ codeunit 144741 "BCPT Setup Card Test"
         // counts 2 extra SQL statements from system tables. Therefore the total is either ActualNoOfIterations or ActualNoOfIterations + 2.
         Assert.IsTrue(
             BCPTSetupCard.BCPTLines.NoOfSQLStmts.AsInteger() in [ActualNoOfIterations, ActualNoOfIterations + 2],
-            StrSubstNo(UnexpectedNoOfSqlStmtsLbl, BCPTLogEntry.FieldCaption("No. of SQL Statements"), StrSubstNo('%1 or %2', ActualNoOfIterations, ActualNoOfIterations + 2), BCPTSetupCard.BCPTLines.NoOfSQLStmts.AsInteger()));
+            StrSubstNo(UnexpectedNoOfSqlStmtsLbl, BCPTLogEntry.FieldCaption("No. of SQL Statements"), StrSubstNo(OrValueLbl, ActualNoOfIterations, ActualNoOfIterations + 2), BCPTSetupCard.BCPTLines.NoOfSQLStmts.AsInteger()));
         BCPTSetupCard.BCPTLines.AvgSQLStmts.AssertEquals(1);
         BCPTSetupCard.Close();
     end;