diff --git a/src/powershell/tests/Test-Assessment.21784.ps1 b/src/powershell/tests/Test-Assessment.21784.ps1
index e7ae35bbf2..050ed7dfff 100644
--- a/src/powershell/tests/Test-Assessment.21784.ps1
+++ b/src/powershell/tests/Test-Assessment.21784.ps1
@@ -11,7 +11,7 @@ Pass/Fail Hook:
 
 function Test-Assessment-21784 {
     [ZtTest(
-    	Category = 'Access control; Credential management',
+    	Category = 'Access control, Credential management',
     	ImplementationCost = 'Medium',
     	MinimumLicense = ('P1'),
     	Pillar = 'Identity',
diff --git a/src/powershell/tests/Test-Assessment.21837.ps1 b/src/powershell/tests/Test-Assessment.21837.ps1
index 0aa830c73f..2dff95b7a4 100644
--- a/src/powershell/tests/Test-Assessment.21837.ps1
+++ b/src/powershell/tests/Test-Assessment.21837.ps1
@@ -5,7 +5,7 @@
 
 function Test-Assessment-21837{
     [ZtTest(
-    	Category = 'Devices',
+    	Category = 'Device',
     	ImplementationCost = 'Low',
     	MinimumLicense = ('Free'),
     	Pillar = 'Identity',
diff --git a/src/powershell/tests/Test-Assessment.21886.ps1 b/src/powershell/tests/Test-Assessment.21886.ps1
index 26ee9febbe..d682f865b8 100644
--- a/src/powershell/tests/Test-Assessment.21886.ps1
+++ b/src/powershell/tests/Test-Assessment.21886.ps1
@@ -5,7 +5,7 @@
 
 function Test-Assessment-21886 {
     [ZtTest(
-    	Category = 'Applications management',
+    	Category = 'Application management',
     	ImplementationCost = 'Medium',
     	MinimumLicense = ('P1'),
     	Pillar = 'Identity',
diff --git a/src/powershell/tests/Test-Assessment.21953.ps1 b/src/powershell/tests/Test-Assessment.21953.ps1
index 93c8920eb9..d6de23a298 100644
--- a/src/powershell/tests/Test-Assessment.21953.ps1
+++ b/src/powershell/tests/Test-Assessment.21953.ps1
@@ -5,7 +5,7 @@
 
 function Test-Assessment-21953{
     [ZtTest(
-    	Category = 'Devices',
+    	Category = 'Device',
     	ImplementationCost = 'Medium',
     	MinimumLicense = ('P1'),
     	Pillar = 'Identity',
diff --git a/src/powershell/tests/Test-Assessment.21954.ps1 b/src/powershell/tests/Test-Assessment.21954.ps1
index 46dab22a9e..cec3d2b88d 100644
--- a/src/powershell/tests/Test-Assessment.21954.ps1
+++ b/src/powershell/tests/Test-Assessment.21954.ps1
@@ -5,7 +5,7 @@
 
 function Test-Assessment-21954{
     [ZtTest(
-    	Category = 'Devices',
+    	Category = 'Device',
     	ImplementationCost = 'Low',
     	MinimumLicense = ('Free'),
     	Pillar = 'Identity',
diff --git a/src/powershell/tests/Test-Assessment.21955.ps1 b/src/powershell/tests/Test-Assessment.21955.ps1
index 1d83208e69..db1b52cf40 100644
--- a/src/powershell/tests/Test-Assessment.21955.ps1
+++ b/src/powershell/tests/Test-Assessment.21955.ps1
@@ -5,7 +5,7 @@
 
 function Test-Assessment-21955 {
     [ZtTest(
-    	Category = 'Devices',
+    	Category = 'Device',
     	ImplementationCost = 'Low',
     	MinimumLicense = ('P1'),
     	Pillar = 'Identity',
diff --git a/src/powershell/tests/Test-Assessment.35003.ps1 b/src/powershell/tests/Test-Assessment.35003.ps1
index 9433712922..7c3bfb8a95 100644
--- a/src/powershell/tests/Test-Assessment.35003.ps1
+++ b/src/powershell/tests/Test-Assessment.35003.ps1
@@ -14,7 +14,7 @@
 
 function Test-Assessment-35003 {
     [ZtTest(
-    	Category = 'sensitivity-labels',
+    	Category = 'Sensitivity Labels',
     	ImplementationCost = 'Medium',
     	MinimumLicense = ('Microsoft 365 E3'),
     	Service = ('SecurityCompliance'),
diff --git a/src/powershell/tests/Test-Assessment.35012.ps1 b/src/powershell/tests/Test-Assessment.35012.ps1
index 939260f0e3..f9071be1e0 100644
--- a/src/powershell/tests/Test-Assessment.35012.ps1
+++ b/src/powershell/tests/Test-Assessment.35012.ps1
@@ -10,14 +10,14 @@
 
 .NOTES
     Test ID: 35012
-    Category: Sensitivity Labels Configuration
+    Category: Sensitivity Labels
     Required APIs: Get-Label (Exchange PowerShell)
 #>
 
 function Test-Assessment-35012 {
 
     [ZtTest(
-        Category = 'Sensitivity Labels Configuration',
+        Category = 'Sensitivity Labels',
         ImplementationCost = 'Medium',
         Service = ('SecurityCompliance'),
         MinimumLicense = ('Microsoft 365 E5'),
diff --git a/src/powershell/tests/Test-Assessment.35013.ps1 b/src/powershell/tests/Test-Assessment.35013.ps1
index ecc421b2d2..7067f10cf6 100644
--- a/src/powershell/tests/Test-Assessment.35013.ps1
+++ b/src/powershell/tests/Test-Assessment.35013.ps1
@@ -10,14 +10,14 @@
 
 .NOTES
     Test ID: 35013
-    Category: Sensitivity Labels Configuration
+    Category: Sensitivity Labels
     Required Module: ExchangeOnlineManagement v3.5.1+
     Required Connection: Connect-IPPSSession
 #>
 
 function Test-Assessment-35013 {
     [ZtTest(
-        Category = 'Sensitivity Labels Configuration',
+        Category = 'Sensitivity Labels',
         ImplementationCost = 'Medium',
         Service = ('SecurityCompliance'),
         MinimumLicense = 'Microsoft 365 E3',
diff --git a/src/powershell/tests/Test-Assessment.35015.ps1 b/src/powershell/tests/Test-Assessment.35015.ps1
index 6c2e13dc3c..335a0b8a07 100644
--- a/src/powershell/tests/Test-Assessment.35015.ps1
+++ b/src/powershell/tests/Test-Assessment.35015.ps1
@@ -13,7 +13,7 @@
 
 function Test-Assessment-35015 {
     [ZtTest(
-    	Category = 'sensitivity-labels',
+    	Category = 'Sensitivity Labels',
     	ImplementationCost = 'Medium',
     	MinimumLicense = ('Microsoft 365 E3'),
     	Service = ('SecurityCompliance'),
diff --git a/src/powershell/tests/Test-Assessment.35024.ps1 b/src/powershell/tests/Test-Assessment.35024.ps1
index fb2202a0c9..dd63b848db 100644
--- a/src/powershell/tests/Test-Assessment.35024.ps1
+++ b/src/powershell/tests/Test-Assessment.35024.ps1
@@ -17,7 +17,7 @@
 
 function Test-Assessment-35024 {
     [ZtTest(
-    	Category = 'Rights Management Service',
+    	Category = 'Rights Management Service (RMS)',
     	ImplementationCost = 'Low',
     	MinimumLicense = ('Microsoft 365 E3'),
     	Service = ('ExchangeOnline'),