diff --git a/src/app/tests/suites/certification/Test_TC_CGEN_2_1.yaml b/src/app/tests/suites/certification/Test_TC_CGEN_2_1.yaml
index 8e79a18eac9781..4a8cd4b7eb7ad0 100644
--- a/src/app/tests/suites/certification/Test_TC_CGEN_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CGEN_2_1.yaml
@@ -81,16 +81,18 @@ tests:
       command: "readAttribute"
       attribute: "BasicCommissioningInfo"
 
-    - label: "Step 6 TC-CGEN-2.1"
+    - label:
+          "Step 6 is implicitly validating the attribute(BasicCommissioningInfo)
+          constraints, as long as the payload is being parsed successfully"
       cluster: "LogCommands"
       command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value:
-                    "Step 6 is implicitly validating the
-                    attribute(BasicCommissioningInfo) constraints, as long as
-                    the payload is being parsed successfully"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label: "TH1 reads SupportsConcurrentConnection attribute from the DUT"
       PICS: CGEN.S.A0004
diff --git a/src/app/tests/suites/certification/Test_TC_FLW_2_2.yaml b/src/app/tests/suites/certification/Test_TC_FLW_2_2.yaml
index 2cd6e9863ec0f8..b703a89d44fcff 100644
--- a/src/app/tests/suites/certification/Test_TC_FLW_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_FLW_2_2.yaml
@@ -37,13 +37,15 @@ tests:
               type: uint16
 
     - label: "operate on DUT to change the flow significantly"
-      PICS: MANUAL_FLOW_CHANGE
       cluster: "LogCommands"
-      command: "Log"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value: "Operate on device to change the flow significantly"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label: "read the mandatory attribute: MeasuredValue"
       command: "readAttribute"
diff --git a/src/app/tests/suites/certification/Test_TC_I_2_3.yaml b/src/app/tests/suites/certification/Test_TC_I_2_3.yaml
index ef95f90c19ddc9..7fad95095a80c4 100644
--- a/src/app/tests/suites/certification/Test_TC_I_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_I_2_3.yaml
@@ -41,13 +41,16 @@ tests:
               - name: "EffectVariant"
                 value: 0
 
-    - label: "Manually check DUT executes a blink effect"
+    - label: "DUT executes a blink effect"
       cluster: "LogCommands"
       command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value: "DUT executes a blink effect"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label:
           "TH sends TriggerEffect command to DUT with the effect identifier
@@ -62,13 +65,16 @@ tests:
               - name: "EffectVariant"
                 value: 0
 
-    - label: "check DUT executes a breathe effect"
+    - label: "DUT executes a breathe effect"
       cluster: "LogCommands"
       command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value: "DUT executes a breathe effect"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label:
           "TH sends TriggerEffect command to DUT with the effect identifier
@@ -83,13 +89,16 @@ tests:
               - name: "EffectVariant"
                 value: 0
 
-    - label: "check DUT executes an okay effect"
+    - label: "DUT executes an okay effect"
       cluster: "LogCommands"
       command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value: "DUT executes an okay effect"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label:
           "TH sends TriggerEffect command to DUT with the effect identifier
@@ -104,13 +113,16 @@ tests:
               - name: "EffectVariant"
                 value: 0
 
-    - label: "check DUT executes a channel change effect"
+    - label: "DUT executes a channel change effect"
       cluster: "LogCommands"
       command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value: "DUT executes a channel change effect"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label:
           "TH sends TriggerEffect command to DUT with the effect identifier
@@ -125,13 +137,16 @@ tests:
               - name: "EffectVariant"
                 value: 0
 
-    - label: "check DUT executes a breathe effect"
+    - label: "DUT executes a breathe effect"
       cluster: "LogCommands"
       command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value: "DUT executes a breathe effect"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label:
           "TH sends TriggerEffect command to DUT with the effect identifier
@@ -146,18 +161,16 @@ tests:
               - name: "EffectVariant"
                 value: 0
 
-    - label:
-          "Manually check DUT stops the breathe effect after the current effect
-          sequence"
-      PICS: I.S.C40.Rsp
+    - label: "DUT stops the breathe effect after the current effect sequence"
       cluster: "LogCommands"
       command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value:
-                    "DUT stops the breathe effect after the current effect
-                    sequence"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label:
           "TH sends TriggerEffect command to DUT with the effect identifier
@@ -172,13 +185,16 @@ tests:
               - name: "EffectVariant"
                 value: 0
 
-    - label: "Manually check DUT executes a breathe effect"
+    - label: "DUT executes a breathe effect"
       cluster: "LogCommands"
       command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value: "DUT executes a breathe effect"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label:
           "TH sends TriggerEffect command to DUT with the effect identifier
@@ -193,13 +209,16 @@ tests:
               - name: "EffectVariant"
                 value: 0
 
-    - label: "Check DUT stops the breathe effect as soon as possible."
+    - label: "DUT stops the breathe effect as soon as possible."
       cluster: "LogCommands"
       command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value: "DUT stops the breathe effect as soon as possible"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label:
           "TH sends TriggerEffect command to DUT with the effect identifier
@@ -217,10 +236,13 @@ tests:
     - label: "Check DUT executes a blink effect."
       cluster: "LogCommands"
       command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value: "DUT executes a blink effect"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label:
           "TH sends TriggerEffect command to DUT with the effect identifier
@@ -236,13 +258,13 @@ tests:
                 value: 0
 
     - label:
-          "Check DUT stops any effect that may be still running as soon as
-          possible"
+          "DUT stops any effect that may be still running as soon as possible"
       cluster: "LogCommands"
       command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value:
-                    "DUT stops any effect that may be still running as soon as
-                    possible"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
diff --git a/src/app/tests/suites/certification/Test_TC_LVL_4_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_4_1.yaml
index d9e96394fe0b50..0d8bd0bd3eb0bc 100644
--- a/src/app/tests/suites/certification/Test_TC_LVL_4_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LVL_4_1.yaml
@@ -70,16 +70,19 @@ tests:
               - name: "optionOverride"
                 value: 1
 
-    - label: "user prompt message"
+    - label:
+          "Physically verify that the DUT moves at a rate of 32 units per second
+          or as close as possible to this rate and completes moving to its
+          maximum level"
       cluster: "LogCommands"
       command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value:
-                    "Physically verify that the DUT moves at a rate of 32 units
-                    per second or as close as possible to this rate and
-                    completes moving to its maximum level"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label: "Wait 9000ms"
       cluster: "DelayCommands"
@@ -109,16 +112,19 @@ tests:
               - name: "optionOverride"
                 value: 1
 
-    - label: "user prompt message"
+    - label:
+          "Physically verify that the DUT moves at a rate of 64 units per second
+          or as close as possible to this rate and complete moving to its
+          minimum level"
       cluster: "LogCommands"
       command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value:
-                    "Physically verify that the DUT moves at a rate of 64 units
-                    per second or as close as possible to this rate and complete
-                    moving to its minimum level"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label: "Wait 5000ms"
       cluster: "DelayCommands"
@@ -168,16 +174,18 @@ tests:
               - name: "ms"
                 value: 100
 
-    - label: "user prompt message"
+    - label:
+          "Physically verify that the device moves at the rate recorded in step
+          3a and completes moving to its maximum level"
       cluster: "LogCommands"
       command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value:
-                    "Physically verify that the device moves at the rate
-                    recorded in step 3a and completes moving to its maximum
-                    level."
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label: "Reset level to 254"
       command: "MoveToLevel"
diff --git a/src/app/tests/suites/certification/Test_TC_LVL_6_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_6_1.yaml
index 5260c0fa36c06a..b531492d6c00d3 100644
--- a/src/app/tests/suites/certification/Test_TC_LVL_6_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LVL_6_1.yaml
@@ -88,15 +88,16 @@ tests:
               - name: "optionOverride"
                 value: 0
 
-    - label: "user prompt message"
+    - label: "Physically verify that the device has stopped transitioning"
       cluster: "LogCommands"
       command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value:
-                    "Physically verify that the device has stopped
-                    transitioning."
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label: "Reads CurrentLevel attribute from DUT"
       command: "readAttribute"
@@ -137,15 +138,16 @@ tests:
               - name: "optionOverride"
                 value: 0
 
-    - label: "user prompt message"
+    - label: "Physically verify that the device has stopped transitioning"
       cluster: "LogCommands"
       command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value:
-                    "Physically verify that the device has stopped
-                    transitioning."
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label: "Reads CurrentLevel attribute from DUT"
       command: "readAttribute"
diff --git a/src/app/tests/suites/certification/Test_TC_OCC_2_2.yaml b/src/app/tests/suites/certification/Test_TC_OCC_2_2.yaml
index 6b881ada8976be..4a5027eac92fb9 100644
--- a/src/app/tests/suites/certification/Test_TC_OCC_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OCC_2_2.yaml
@@ -37,13 +37,15 @@ tests:
           saveAs: OccupancyValue
 
     - label: "Operate on DUT to change the occupancy status"
-      PICS: MANUAL_OCCUPANCY_CHANGE
       cluster: "LogCommands"
       command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value: "Operate on DUT to change the occupancy status"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label: "Reads back Occupancy attribute from DUT after few seconds"
       command: "readAttribute"
diff --git a/src/app/tests/suites/certification/Test_TC_OO_2_2.yaml b/src/app/tests/suites/certification/Test_TC_OO_2_2.yaml
index d416677b61c3f4..d0835ec9ccfe1e 100644
--- a/src/app/tests/suites/certification/Test_TC_OO_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OO_2_2.yaml
@@ -107,13 +107,16 @@ tests:
       response:
           value: 0
 
-    - label: "User prompt Set OnOff attribute manually to on"
+    - label: "Operate on device to set OnOff attribute manually to on"
       cluster: "LogCommands"
       command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value: "Operate on device to set OnOff attribute manually to on"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     # Skipped this step because the above test need manual input
     - label: "Check on/off attribute value is true after on command"
@@ -123,14 +126,16 @@ tests:
       response:
           value: 1
 
-    - label: "User prompt Set OnOff attribute manually to off"
+    - label: "Operate on device to set OnOff attribute manually to off"
       cluster: "LogCommands"
       command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value:
-                    "Operate on device to set OnOff attribute manually to off"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     # Skipped the step because the above test need manual input
     - label: "Check on/off attribute value is false after off command"
diff --git a/src/app/tests/suites/certification/Test_TC_RH_2_2.yaml b/src/app/tests/suites/certification/Test_TC_RH_2_2.yaml
index 8d79ec706b3420..465a6705e65bde 100644
--- a/src/app/tests/suites/certification/Test_TC_RH_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_RH_2_2.yaml
@@ -59,15 +59,15 @@ tests:
               maxValue: 10000
 
     - label: "Operate on device to change the relative humidity significantly"
-      PICS: MANUAL_RELATIVEHUMIDITY_CHANGE
       cluster: "LogCommands"
-      command: "Log"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value:
-                    "Operate on device to change the relative humidity
-                    significantly"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label: "Read the mandatory attribute: MeasuredValue"
       command: "readAttribute"
diff --git a/src/app/tests/suites/certification/Test_TC_TM_2_2.yaml b/src/app/tests/suites/certification/Test_TC_TM_2_2.yaml
index afb5382e5042ba..6e8aa869bd3b7d 100644
--- a/src/app/tests/suites/certification/Test_TC_TM_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TM_2_2.yaml
@@ -56,14 +56,15 @@ tests:
               type: uint16
 
     - label: "Operate on device to change the temperature significantly"
-      PICS: MANUAL_TEMPERATURE_CHANGE
       cluster: "LogCommands"
-      command: "Log"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value:
-                    "Operate on device to change the temperature significantly"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label: "Read the mandatory attribute: MeasuredValue"
       command: "readAttribute"
diff --git a/src/app/tests/suites/certification/Test_TC_TSUIC_2_2.yaml b/src/app/tests/suites/certification/Test_TC_TSUIC_2_2.yaml
index 12de356c78139d..e4542a229f76d7 100644
--- a/src/app/tests/suites/certification/Test_TC_TSUIC_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TSUIC_2_2.yaml
@@ -38,10 +38,13 @@ tests:
     - label: "Verify device temperature displayed in °C"
       cluster: "LogCommands"
       command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value: "Verify device temperature displayed in °C"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label: "TH reads the TemperatureDisplayMode attribute of DUT"
       command: "readAttribute"
@@ -60,10 +63,13 @@ tests:
     - label: "Verify device temperature displayed in °F"
       cluster: "LogCommands"
       command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value: "Verify device temperature displayed in °F"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label: "TH reads the TemperatureDisplayMode attribute of DUT"
       command: "readAttribute"
@@ -100,10 +106,13 @@ tests:
     - label: "Verify all device functionality available to the user"
       cluster: "LogCommands"
       command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value: "Verify all device functionality available to the user"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label: "TH reads the KeypadLockout attribute of DUT"
       command: "readAttribute"
@@ -122,10 +131,13 @@ tests:
     - label: "Verify device operates at Level 1 reduced functionality"
       cluster: "LogCommands"
       command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value: "Verify device operates at Level 1 reduced functionality"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label: "TH reads the KeypadLockout attribute of DUT"
       command: "readAttribute"
@@ -144,10 +156,13 @@ tests:
     - label: "Verify device operates at Level 2 reduced functionality"
       cluster: "LogCommands"
       command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value: "Verify device operates at Level 2 reduced functionality"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label: "TH reads the KeypadLockout attribute of DUT"
       command: "readAttribute"
@@ -166,10 +181,13 @@ tests:
     - label: "Verify device operates at Level 3 reduced functionality"
       cluster: "LogCommands"
       command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value: "Verify device operates at Level 3 reduced functionality"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label: "TH reads the KeypadLockout attribute of DUT"
       command: "readAttribute"
@@ -188,10 +206,13 @@ tests:
     - label: "Verify device operates at Level 4 reduced functionality"
       cluster: "LogCommands"
       command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value: "Verify device operates at Level 4 reduced functionality"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label: "TH reads the KeypadLockout attribute of DUT"
       command: "readAttribute"
@@ -210,10 +231,13 @@ tests:
     - label: "Verify device operates at least functionality level"
       cluster: "LogCommands"
       command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value: "Verify device operates at least functionality level"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label: "TH reads the KeypadLockout attribute of DUT"
       command: "readAttribute"
@@ -252,12 +276,13 @@ tests:
           thermostat"
       cluster: "LogCommands"
       command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value:
-                    "Verify local schedule programming functionality is enabled
-                    at the thermostat"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label: "TH reads the ScheduleProgrammingVisibility attribute of DUT"
       command: "readAttribute"
@@ -279,12 +304,13 @@ tests:
           thermostat"
       cluster: "LogCommands"
       command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
-                value:
-                    "Verify local schedule programming functionality is disabled
-                    at the thermostat"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label: "TH reads the ScheduleProgrammingVisibility attribute of DUT"
       command: "readAttribute"
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index c4bf101e02c23e..d384f1916ce37a 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -11349,13 +11349,15 @@ class Test_TC_CGEN_2_1Suite : public TestCommand
                                  GeneralCommissioning::Attributes::BasicCommissioningInfo::Id, true, chip::NullOptional);
         }
         case 7: {
-            LogStep(7, "Step 6 TC-CGEN-2.1");
+            LogStep(7,
+                    "Step 6 is implicitly validating the attribute(BasicCommissioningInfo) constraints, as long as the payload is "
+                    "being parsed successfully");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message =
-                chip::Span<const char>("Step 6 is implicitly validating the attribute(BasicCommissioningInfo) constraints, as long "
-                                       "as the payload is being parsed successfullygarbage: not in length on purpose",
-                                       134);
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
         case 8: {
@@ -12389,10 +12391,13 @@ class Test_TC_I_2_3Suite : public TestCommand
             );
         }
         case 2: {
-            LogStep(2, "Manually check DUT executes a blink effect");
+            LogStep(2, "DUT executes a blink effect");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("DUT executes a blink effectgarbage: not in length on purpose", 27);
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
         case 3: {
@@ -12410,10 +12415,13 @@ class Test_TC_I_2_3Suite : public TestCommand
             );
         }
         case 4: {
-            LogStep(4, "check DUT executes a breathe effect");
+            LogStep(4, "DUT executes a breathe effect");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("DUT executes a breathe effectgarbage: not in length on purpose", 29);
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
         case 5: {
@@ -12431,10 +12439,13 @@ class Test_TC_I_2_3Suite : public TestCommand
             );
         }
         case 6: {
-            LogStep(6, "check DUT executes an okay effect");
+            LogStep(6, "DUT executes an okay effect");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("DUT executes an okay effectgarbage: not in length on purpose", 27);
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
         case 7: {
@@ -12452,10 +12463,13 @@ class Test_TC_I_2_3Suite : public TestCommand
             );
         }
         case 8: {
-            LogStep(8, "check DUT executes a channel change effect");
+            LogStep(8, "DUT executes a channel change effect");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("DUT executes a channel change effectgarbage: not in length on purpose", 36);
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
         case 9: {
@@ -12473,10 +12487,13 @@ class Test_TC_I_2_3Suite : public TestCommand
             );
         }
         case 10: {
-            LogStep(10, "check DUT executes a breathe effect");
+            LogStep(10, "DUT executes a breathe effect");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("DUT executes a breathe effectgarbage: not in length on purpose", 29);
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
         case 11: {
@@ -12494,12 +12511,13 @@ class Test_TC_I_2_3Suite : public TestCommand
             );
         }
         case 12: {
-            LogStep(12, "Manually check DUT stops the breathe effect after the current effect sequence");
-            VerifyOrDo(!ShouldSkip("I.S.C40.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            LogStep(12, "DUT stops the breathe effect after the current effect sequence");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>(
-                "DUT stops the breathe effect after the current effect sequencegarbage: not in length on purpose", 62);
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
         case 13: {
@@ -12517,10 +12535,13 @@ class Test_TC_I_2_3Suite : public TestCommand
             );
         }
         case 14: {
-            LogStep(14, "Manually check DUT executes a breathe effect");
+            LogStep(14, "DUT executes a breathe effect");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("DUT executes a breathe effectgarbage: not in length on purpose", 29);
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
         case 15: {
@@ -12538,11 +12559,13 @@ class Test_TC_I_2_3Suite : public TestCommand
             );
         }
         case 16: {
-            LogStep(16, "Check DUT stops the breathe effect as soon as possible.");
+            LogStep(16, "DUT stops the breathe effect as soon as possible.");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message =
-                chip::Span<const char>("DUT stops the breathe effect as soon as possiblegarbage: not in length on purpose", 48);
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
         case 17: {
@@ -12561,9 +12584,12 @@ class Test_TC_I_2_3Suite : public TestCommand
         }
         case 18: {
             LogStep(18, "Check DUT executes a blink effect.");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("DUT executes a blink effectgarbage: not in length on purpose", 27);
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
         case 19: {
@@ -12581,11 +12607,13 @@ class Test_TC_I_2_3Suite : public TestCommand
             );
         }
         case 20: {
-            LogStep(20, "Check DUT stops any effect that may be still running as soon as possible");
+            LogStep(20, "DUT stops any effect that may be still running as soon as possible");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>(
-                "DUT stops any effect that may be still running as soon as possiblegarbage: not in length on purpose", 66);
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
         }
@@ -14296,13 +14324,15 @@ class Test_TC_LVL_4_1Suite : public TestCommand
             );
         }
         case 5: {
-            LogStep(5, "user prompt message");
+            LogStep(5,
+                    "Physically verify that the DUT moves at a rate of 32 units per second or as close as possible to this rate "
+                    "and completes moving to its maximum level");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>(
-                "Physically verify that the DUT moves at a rate of 32 units per second or as close as possible to this rate and "
-                "completes moving to its maximum levelgarbage: not in length on purpose",
-                148);
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
         case 6: {
@@ -14330,13 +14360,15 @@ class Test_TC_LVL_4_1Suite : public TestCommand
             );
         }
         case 9: {
-            LogStep(9, "user prompt message");
+            LogStep(9,
+                    "Physically verify that the DUT moves at a rate of 64 units per second or as close as possible to this rate "
+                    "and complete moving to its minimum level");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>(
-                "Physically verify that the DUT moves at a rate of 64 units per second or as close as possible to this rate and "
-                "complete moving to its minimum levelgarbage: not in length on purpose",
-                147);
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
         case 10: {
@@ -14378,12 +14410,15 @@ class Test_TC_LVL_4_1Suite : public TestCommand
             return WaitForMs(kIdentityAlpha, value);
         }
         case 15: {
-            LogStep(15, "user prompt message");
+            LogStep(15,
+                    "Physically verify that the device moves at the rate recorded in step 3a and completes moving to its maximum "
+                    "level");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("Physically verify that the device moves at the rate recorded in step 3a and "
-                                                   "completes moving to its maximum level.garbage: not in length on purpose",
-                                                   114);
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
         case 16: {
@@ -14826,11 +14861,13 @@ class Test_TC_LVL_6_1Suite : public TestCommand
             );
         }
         case 7: {
-            LogStep(7, "user prompt message");
+            LogStep(7, "Physically verify that the device has stopped transitioning");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>(
-                "Physically verify that the device has stopped transitioning.garbage: not in length on purpose", 60);
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
         case 8: {
@@ -14870,11 +14907,13 @@ class Test_TC_LVL_6_1Suite : public TestCommand
             );
         }
         case 12: {
-            LogStep(12, "user prompt message");
+            LogStep(12, "Physically verify that the device has stopped transitioning");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>(
-                "Physically verify that the device has stopped transitioning.garbage: not in length on purpose", 60);
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
         case 13: {
@@ -22325,11 +22364,13 @@ class Test_TC_OO_2_2Suite : public TestCommand
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 17: {
-            LogStep(17, "User prompt Set OnOff attribute manually to on");
+            LogStep(17, "Operate on device to set OnOff attribute manually to on");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>(
-                "Operate on device to set OnOff attribute manually to ongarbage: not in length on purpose", 55);
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
         case 18: {
@@ -22338,11 +22379,13 @@ class Test_TC_OO_2_2Suite : public TestCommand
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 19: {
-            LogStep(19, "User prompt Set OnOff attribute manually to off");
+            LogStep(19, "Operate on device to set OnOff attribute manually to off");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>(
-                "Operate on device to set OnOff attribute manually to offgarbage: not in length on purpose", 56);
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
         case 20: {
@@ -29650,10 +29693,12 @@ class Test_TC_TSUIC_2_2Suite : public TestCommand
         }
         case 2: {
             LogStep(2, "Verify device temperature displayed in °C");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message =
-                chip::Span<const char>("Verify device temperature displayed in °Cgarbage: not in length on purpose", 42);
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
         case 3: {
@@ -29675,10 +29720,12 @@ class Test_TC_TSUIC_2_2Suite : public TestCommand
         }
         case 5: {
             LogStep(5, "Verify device temperature displayed in °F");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message =
-                chip::Span<const char>("Verify device temperature displayed in °Fgarbage: not in length on purpose", 42);
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
         case 6: {
@@ -29717,10 +29764,12 @@ class Test_TC_TSUIC_2_2Suite : public TestCommand
         }
         case 10: {
             LogStep(10, "Verify all device functionality available to the user");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>(
-                "Verify all device functionality available to the usergarbage: not in length on purpose", 53);
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
         case 11: {
@@ -29741,10 +29790,12 @@ class Test_TC_TSUIC_2_2Suite : public TestCommand
         }
         case 13: {
             LogStep(13, "Verify device operates at Level 1 reduced functionality");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>(
-                "Verify device operates at Level 1 reduced functionalitygarbage: not in length on purpose", 55);
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
         case 14: {
@@ -29765,10 +29816,12 @@ class Test_TC_TSUIC_2_2Suite : public TestCommand
         }
         case 16: {
             LogStep(16, "Verify device operates at Level 2 reduced functionality");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>(
-                "Verify device operates at Level 2 reduced functionalitygarbage: not in length on purpose", 55);
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
         case 17: {
@@ -29789,10 +29842,12 @@ class Test_TC_TSUIC_2_2Suite : public TestCommand
         }
         case 19: {
             LogStep(19, "Verify device operates at Level 3 reduced functionality");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>(
-                "Verify device operates at Level 3 reduced functionalitygarbage: not in length on purpose", 55);
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
         case 20: {
@@ -29813,10 +29868,12 @@ class Test_TC_TSUIC_2_2Suite : public TestCommand
         }
         case 22: {
             LogStep(22, "Verify device operates at Level 4 reduced functionality");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>(
-                "Verify device operates at Level 4 reduced functionalitygarbage: not in length on purpose", 55);
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
         case 23: {
@@ -29837,10 +29894,12 @@ class Test_TC_TSUIC_2_2Suite : public TestCommand
         }
         case 25: {
             LogStep(25, "Verify device operates at least functionality level");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message =
-                chip::Span<const char>("Verify device operates at least functionality levelgarbage: not in length on purpose", 51);
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
         case 26: {
@@ -29877,11 +29936,12 @@ class Test_TC_TSUIC_2_2Suite : public TestCommand
         }
         case 30: {
             LogStep(30, "Verify local schedule programming functionality is enabled at the thermostat");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>(
-                "Verify local schedule programming functionality is enabled at the thermostatgarbage: not in length on purpose",
-                76);
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
         case 31: {
@@ -29903,11 +29963,12 @@ class Test_TC_TSUIC_2_2Suite : public TestCommand
         }
         case 33: {
             LogStep(33, "Verify local schedule programming functionality is disabled at the thermostat");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>(
-                "Verify local schedule programming functionality is disabled at the thermostatgarbage: not in length on purpose",
-                77);
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
         case 34: {
@@ -78318,12 +78379,13 @@ class Test_TC_FLW_2_2Suite : public TestCommand
         }
         case 2: {
             LogStep(2, "operate on DUT to change the flow significantly");
-            VerifyOrDo(!ShouldSkip("MANUAL_FLOW_CHANGE"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::Log::Type value;
-            value.message =
-                chip::Span<const char>("Operate on device to change the flow significantlygarbage: not in length on purpose", 50);
-            return Log(kIdentityAlpha, value);
+            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+            return UserPrompt(kIdentityAlpha, value);
         }
         case 3: {
             LogStep(3, "read the mandatory attribute: MeasuredValue");
@@ -78484,11 +78546,12 @@ class Test_TC_OCC_2_2Suite : public TestCommand
         }
         case 2: {
             LogStep(2, "Operate on DUT to change the occupancy status");
-            VerifyOrDo(!ShouldSkip("MANUAL_OCCUPANCY_CHANGE"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message =
-                chip::Span<const char>("Operate on DUT to change the occupancy statusgarbage: not in length on purpose", 45);
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
         case 3: {
@@ -84321,12 +84384,13 @@ class Test_TC_RH_2_2Suite : public TestCommand
         }
         case 4: {
             LogStep(4, "Operate on device to change the relative humidity significantly");
-            VerifyOrDo(!ShouldSkip("MANUAL_RELATIVEHUMIDITY_CHANGE"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::Log::Type value;
-            value.message = chip::Span<const char>(
-                "Operate on device to change the relative humidity significantlygarbage: not in length on purpose", 63);
-            return Log(kIdentityAlpha, value);
+            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+            return UserPrompt(kIdentityAlpha, value);
         }
         case 5: {
             LogStep(5, "Read the mandatory attribute: MeasuredValue");
@@ -84743,12 +84807,13 @@ class Test_TC_TM_2_2Suite : public TestCommand
         }
         case 4: {
             LogStep(4, "Operate on device to change the temperature significantly");
-            VerifyOrDo(!ShouldSkip("MANUAL_TEMPERATURE_CHANGE"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::Log::Type value;
-            value.message = chip::Span<const char>(
-                "Operate on device to change the temperature significantlygarbage: not in length on purpose", 57);
-            return Log(kIdentityAlpha, value);
+            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+            return UserPrompt(kIdentityAlpha, value);
         }
         case 5: {
             LogStep(5, "Read the mandatory attribute: MeasuredValue");
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
index 4c4e422c605aa0..d6f35ef98ad6cc 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -18691,8 +18691,14 @@ class Test_TC_CGEN_2_1 : public TestCommandBridge {
             err = TestTh1ReadsBasicCommissioningInfoAttributeFromDutAndVerifyThatTheBasicCommissioningInfoAttributeHasTheFollowingFieldFailSafeExpiryLengthSecondsFieldValueIsWithinADurationRangeOf0To65535_6();
             break;
         case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Step 6 TC-CGEN-2.1\n");
-            err = TestStep6TcCgen21_7();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 7 : Step 6 is implicitly validating the attribute(BasicCommissioningInfo) constraints, as long "
+                "as the payload is being parsed successfully\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestStep6IsImplicitlyValidatingTheAttributeBasicCommissioningInfoConstraintsAsLongAsThePayloadIsBeingParsedSuccessfully_7();
             break;
         case 8:
             ChipLogProgress(chipTool, " ***** Test Step 8 : TH1 reads SupportsConcurrentConnection attribute from the DUT\n");
@@ -18901,13 +18907,13 @@ class Test_TC_CGEN_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep6TcCgen21_7()
+    CHIP_ERROR
+    TestStep6IsImplicitlyValidatingTheAttributeBasicCommissioningInfoConstraintsAsLongAsThePayloadIsBeingParsedSuccessfully_7()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message
-            = chip::Span<const char>("Step 6 is implicitly validating the attribute(BasicCommissioningInfo) constraints, as long "
-                                     "as the payload is being parsed successfullygarbage: not in length on purpose",
-                134);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
 
@@ -20368,8 +20374,12 @@ class Test_TC_I_2_3 : public TestCommandBridge {
             err = TestThSendsTriggerEffectCommandToDutWithTheEffectIdentifierFieldSetTo0x00BlinkAndTheEffectVariantFieldSetTo0x00Default_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Manually check DUT executes a blink effect\n");
-            err = TestManuallyCheckDutExecutesABlinkEffect_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : DUT executes a blink effect\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestDutExecutesABlinkEffect_2();
             break;
         case 3:
             ChipLogProgress(chipTool,
@@ -20382,8 +20392,12 @@ class Test_TC_I_2_3 : public TestCommandBridge {
             err = TestThSendsTriggerEffectCommandToDutWithTheEffectIdentifierFieldSetTo0x01BreatheAndTheEffectVariantFieldSetTo0x00Default_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : check DUT executes a breathe effect\n");
-            err = TestCheckDutExecutesABreatheEffect_4();
+            ChipLogProgress(chipTool, " ***** Test Step 4 : DUT executes a breathe effect\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestDutExecutesABreatheEffect_4();
             break;
         case 5:
             ChipLogProgress(chipTool,
@@ -20396,8 +20410,12 @@ class Test_TC_I_2_3 : public TestCommandBridge {
             err = TestThSendsTriggerEffectCommandToDutWithTheEffectIdentifierFieldSetTo0x02OkayAndTheEffectVariantFieldSetTo0x00Default_5();
             break;
         case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : check DUT executes an okay effect\n");
-            err = TestCheckDutExecutesAnOkayEffect_6();
+            ChipLogProgress(chipTool, " ***** Test Step 6 : DUT executes an okay effect\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestDutExecutesAnOkayEffect_6();
             break;
         case 7:
             ChipLogProgress(chipTool,
@@ -20410,8 +20428,12 @@ class Test_TC_I_2_3 : public TestCommandBridge {
             err = TestThSendsTriggerEffectCommandToDutWithTheEffectIdentifierFieldSetTo0x0bChannelChangeAndTheEffectVariantFieldSetTo0x00Default_7();
             break;
         case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : check DUT executes a channel change effect\n");
-            err = TestCheckDutExecutesAChannelChangeEffect_8();
+            ChipLogProgress(chipTool, " ***** Test Step 8 : DUT executes a channel change effect\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestDutExecutesAChannelChangeEffect_8();
             break;
         case 9:
             ChipLogProgress(chipTool,
@@ -20424,8 +20446,12 @@ class Test_TC_I_2_3 : public TestCommandBridge {
             err = TestThSendsTriggerEffectCommandToDutWithTheEffectIdentifierFieldSetTo0x01BreatheAndTheEffectVariantFieldSetTo0x00Default_9();
             break;
         case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : check DUT executes a breathe effect\n");
-            err = TestCheckDutExecutesABreatheEffect_10();
+            ChipLogProgress(chipTool, " ***** Test Step 10 : DUT executes a breathe effect\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestDutExecutesABreatheEffect_10();
             break;
         case 11:
             ChipLogProgress(chipTool,
@@ -20438,13 +20464,12 @@ class Test_TC_I_2_3 : public TestCommandBridge {
             err = TestThSendsTriggerEffectCommandToDutWithTheEffectIdentifierFieldSetTo0xfeFinishEffectAndTheEffectVariantFieldSetTo0x00Default_11();
             break;
         case 12:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 12 : Manually check DUT stops the breathe effect after the current effect sequence\n");
-            if (ShouldSkip("I.S.C40.Rsp")) {
+            ChipLogProgress(chipTool, " ***** Test Step 12 : DUT stops the breathe effect after the current effect sequence\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
                 NextTest();
                 return;
             }
-            err = TestManuallyCheckDutStopsTheBreatheEffectAfterTheCurrentEffectSequence_12();
+            err = TestDutStopsTheBreatheEffectAfterTheCurrentEffectSequence_12();
             break;
         case 13:
             ChipLogProgress(chipTool,
@@ -20457,8 +20482,12 @@ class Test_TC_I_2_3 : public TestCommandBridge {
             err = TestThSendsTriggerEffectCommandToDutWithTheEffectIdentifierFieldSetTo0x01BreatheAndTheEffectVariantFieldSetTo0x00Default_13();
             break;
         case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : Manually check DUT executes a breathe effect\n");
-            err = TestManuallyCheckDutExecutesABreatheEffect_14();
+            ChipLogProgress(chipTool, " ***** Test Step 14 : DUT executes a breathe effect\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestDutExecutesABreatheEffect_14();
             break;
         case 15:
             ChipLogProgress(chipTool,
@@ -20471,8 +20500,12 @@ class Test_TC_I_2_3 : public TestCommandBridge {
             err = TestThSendsTriggerEffectCommandToDutWithTheEffectIdentifierFieldSetTo0xffStopEffectAndTheEffectVariantFieldSetTo0x00Default_15();
             break;
         case 16:
-            ChipLogProgress(chipTool, " ***** Test Step 16 : Check DUT stops the breathe effect as soon as possible.\n");
-            err = TestCheckDutStopsTheBreatheEffectAsSoonAsPossible_16();
+            ChipLogProgress(chipTool, " ***** Test Step 16 : DUT stops the breathe effect as soon as possible.\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestDutStopsTheBreatheEffectAsSoonAsPossible_16();
             break;
         case 17:
             ChipLogProgress(chipTool,
@@ -20486,6 +20519,10 @@ class Test_TC_I_2_3 : public TestCommandBridge {
             break;
         case 18:
             ChipLogProgress(chipTool, " ***** Test Step 18 : Check DUT executes a blink effect.\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
             err = TestCheckDutExecutesABlinkEffect_18();
             break;
         case 19:
@@ -20499,9 +20536,12 @@ class Test_TC_I_2_3 : public TestCommandBridge {
             err = TestThSendsTriggerEffectCommandToDutWithTheEffectIdentifierFieldSetTo0xffStopEffectAndTheEffectVariantFieldSetTo0x00Default_19();
             break;
         case 20:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 20 : Check DUT stops any effect that may be still running as soon as possible\n");
-            err = TestCheckDutStopsAnyEffectThatMayBeStillRunningAsSoonAsPossible_20();
+            ChipLogProgress(chipTool, " ***** Test Step 20 : DUT stops any effect that may be still running as soon as possible\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestDutStopsAnyEffectThatMayBeStillRunningAsSoonAsPossible_20();
             break;
         }
 
@@ -20628,10 +20668,12 @@ class Test_TC_I_2_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestManuallyCheckDutExecutesABlinkEffect_2()
+    CHIP_ERROR TestDutExecutesABlinkEffect_2()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("DUT executes a blink effectgarbage: not in length on purpose", 27);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
 
@@ -20659,10 +20701,12 @@ class Test_TC_I_2_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCheckDutExecutesABreatheEffect_4()
+    CHIP_ERROR TestDutExecutesABreatheEffect_4()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("DUT executes a breathe effectgarbage: not in length on purpose", 29);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
 
@@ -20690,10 +20734,12 @@ class Test_TC_I_2_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCheckDutExecutesAnOkayEffect_6()
+    CHIP_ERROR TestDutExecutesAnOkayEffect_6()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("DUT executes an okay effectgarbage: not in length on purpose", 27);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
 
@@ -20721,10 +20767,12 @@ class Test_TC_I_2_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCheckDutExecutesAChannelChangeEffect_8()
+    CHIP_ERROR TestDutExecutesAChannelChangeEffect_8()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("DUT executes a channel change effectgarbage: not in length on purpose", 36);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
 
@@ -20752,10 +20800,12 @@ class Test_TC_I_2_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCheckDutExecutesABreatheEffect_10()
+    CHIP_ERROR TestDutExecutesABreatheEffect_10()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("DUT executes a breathe effectgarbage: not in length on purpose", 29);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
 
@@ -20783,11 +20833,12 @@ class Test_TC_I_2_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestManuallyCheckDutStopsTheBreatheEffectAfterTheCurrentEffectSequence_12()
+    CHIP_ERROR TestDutStopsTheBreatheEffectAfterTheCurrentEffectSequence_12()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>(
-            "DUT stops the breathe effect after the current effect sequencegarbage: not in length on purpose", 62);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
 
@@ -20815,10 +20866,12 @@ class Test_TC_I_2_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestManuallyCheckDutExecutesABreatheEffect_14()
+    CHIP_ERROR TestDutExecutesABreatheEffect_14()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("DUT executes a breathe effectgarbage: not in length on purpose", 29);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
 
@@ -20846,11 +20899,12 @@ class Test_TC_I_2_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCheckDutStopsTheBreatheEffectAsSoonAsPossible_16()
+    CHIP_ERROR TestDutStopsTheBreatheEffectAsSoonAsPossible_16()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message
-            = chip::Span<const char>("DUT stops the breathe effect as soon as possiblegarbage: not in length on purpose", 48);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
 
@@ -20881,7 +20935,9 @@ class Test_TC_I_2_3 : public TestCommandBridge {
     CHIP_ERROR TestCheckDutExecutesABlinkEffect_18()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("DUT executes a blink effectgarbage: not in length on purpose", 27);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
 
@@ -20909,11 +20965,12 @@ class Test_TC_I_2_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCheckDutStopsAnyEffectThatMayBeStillRunningAsSoonAsPossible_20()
+    CHIP_ERROR TestDutStopsAnyEffectThatMayBeStillRunningAsSoonAsPossible_20()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>(
-            "DUT stops any effect that may be still running as soon as possiblegarbage: not in length on purpose", 66);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
 };
@@ -23723,8 +23780,14 @@ class Test_TC_LVL_4_1 : public TestCommandBridge {
             err = TestSendsAMoveUpCommand_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : user prompt message\n");
-            err = TestUserPromptMessage_5();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 5 : Physically verify that the DUT moves at a rate of 32 units per second or as close as "
+                "possible to this rate and completes moving to its maximum level\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestPhysicallyVerifyThatTheDutMovesAtARateOf32UnitsPerSecondOrAsCloseAsPossibleToThisRateAndCompletesMovingToItsMaximumLevel_5();
             break;
         case 6:
             ChipLogProgress(chipTool, " ***** Test Step 6 : Wait 9000ms\n");
@@ -23743,8 +23806,14 @@ class Test_TC_LVL_4_1 : public TestCommandBridge {
             err = TestSendsAMoveWithOnOffCommand_8();
             break;
         case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : user prompt message\n");
-            err = TestUserPromptMessage_9();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 9 : Physically verify that the DUT moves at a rate of 64 units per second or as close as "
+                "possible to this rate and complete moving to its minimum level\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestPhysicallyVerifyThatTheDutMovesAtARateOf64UnitsPerSecondOrAsCloseAsPossibleToThisRateAndCompleteMovingToItsMinimumLevel_9();
             break;
         case 10:
             ChipLogProgress(chipTool, " ***** Test Step 10 : Wait 5000ms\n");
@@ -23771,8 +23840,14 @@ class Test_TC_LVL_4_1 : public TestCommandBridge {
             err = TestWait100ms_14();
             break;
         case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : user prompt message\n");
-            err = TestUserPromptMessage_15();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 15 : Physically verify that the device moves at the rate recorded in step 3a and completes "
+                "moving to its maximum level\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestPhysicallyVerifyThatTheDeviceMovesAtTheRateRecordedInStep3aAndCompletesMovingToItsMaximumLevel_15();
             break;
         case 16:
             ChipLogProgress(chipTool, " ***** Test Step 16 : Reset level to 254\n");
@@ -23966,13 +24041,13 @@ class Test_TC_LVL_4_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestUserPromptMessage_5()
+    CHIP_ERROR
+    TestPhysicallyVerifyThatTheDutMovesAtARateOf32UnitsPerSecondOrAsCloseAsPossibleToThisRateAndCompletesMovingToItsMaximumLevel_5()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>(
-            "Physically verify that the DUT moves at a rate of 32 units per second or as close as possible to this rate and "
-            "completes moving to its maximum levelgarbage: not in length on purpose",
-            148);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
 
@@ -24026,13 +24101,13 @@ class Test_TC_LVL_4_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestUserPromptMessage_9()
+    CHIP_ERROR
+    TestPhysicallyVerifyThatTheDutMovesAtARateOf64UnitsPerSecondOrAsCloseAsPossibleToThisRateAndCompleteMovingToItsMinimumLevel_9()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>(
-            "Physically verify that the DUT moves at a rate of 64 units per second or as close as possible to this rate and "
-            "complete moving to its minimum levelgarbage: not in length on purpose",
-            147);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
 
@@ -24124,12 +24199,12 @@ class Test_TC_LVL_4_1 : public TestCommandBridge {
         return WaitForMs("alpha", value);
     }
 
-    CHIP_ERROR TestUserPromptMessage_15()
+    CHIP_ERROR TestPhysicallyVerifyThatTheDeviceMovesAtTheRateRecordedInStep3aAndCompletesMovingToItsMaximumLevel_15()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Physically verify that the device moves at the rate recorded in step 3a and "
-                                               "completes moving to its maximum level.garbage: not in length on purpose",
-            114);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
 
@@ -24594,8 +24669,12 @@ class Test_TC_LVL_6_1 : public TestCommandBridge {
             err = TestSendsStopCommandToDut_6();
             break;
         case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : user prompt message\n");
-            err = TestUserPromptMessage_7();
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Physically verify that the device has stopped transitioning\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestPhysicallyVerifyThatTheDeviceHasStoppedTransitioning_7();
             break;
         case 8:
             ChipLogProgress(chipTool, " ***** Test Step 8 : Reads CurrentLevel attribute from DUT\n");
@@ -24614,8 +24693,12 @@ class Test_TC_LVL_6_1 : public TestCommandBridge {
             err = TestSendsStopCommandToDut_11();
             break;
         case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : user prompt message\n");
-            err = TestUserPromptMessage_12();
+            ChipLogProgress(chipTool, " ***** Test Step 12 : Physically verify that the device has stopped transitioning\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestPhysicallyVerifyThatTheDeviceHasStoppedTransitioning_12();
             break;
         case 13:
             ChipLogProgress(chipTool, " ***** Test Step 13 : Reads CurrentLevel attribute from DUT\n");
@@ -24834,11 +24917,12 @@ class Test_TC_LVL_6_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestUserPromptMessage_7()
+    CHIP_ERROR TestPhysicallyVerifyThatTheDeviceHasStoppedTransitioning_7()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>(
-            "Physically verify that the device has stopped transitioning.garbage: not in length on purpose", 60);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
 
@@ -24914,11 +24998,12 @@ class Test_TC_LVL_6_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestUserPromptMessage_12()
+    CHIP_ERROR TestPhysicallyVerifyThatTheDeviceHasStoppedTransitioning_12()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>(
-            "Physically verify that the device has stopped transitioning.garbage: not in length on purpose", 60);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
 
@@ -35674,8 +35759,12 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
             err = TestCheckOnOffAttributeValueIsFalseAfterToggleCommand_16();
             break;
         case 17:
-            ChipLogProgress(chipTool, " ***** Test Step 17 : User prompt Set OnOff attribute manually to on\n");
-            err = TestUserPromptSetOnOffAttributeManuallyToOn_17();
+            ChipLogProgress(chipTool, " ***** Test Step 17 : Operate on device to set OnOff attribute manually to on\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestOperateOnDeviceToSetOnOffAttributeManuallyToOn_17();
             break;
         case 18:
             ChipLogProgress(chipTool, " ***** Test Step 18 : Check on/off attribute value is true after on command\n");
@@ -35686,8 +35775,12 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
             err = TestCheckOnOffAttributeValueIsTrueAfterOnCommand_18();
             break;
         case 19:
-            ChipLogProgress(chipTool, " ***** Test Step 19 : User prompt Set OnOff attribute manually to off\n");
-            err = TestUserPromptSetOnOffAttributeManuallyToOff_19();
+            ChipLogProgress(chipTool, " ***** Test Step 19 : Operate on device to set OnOff attribute manually to off\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestOperateOnDeviceToSetOnOffAttributeManuallyToOff_19();
             break;
         case 20:
             ChipLogProgress(chipTool, " ***** Test Step 20 : Check on/off attribute value is false after off command\n");
@@ -36099,11 +36192,12 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestUserPromptSetOnOffAttributeManuallyToOn_17()
+    CHIP_ERROR TestOperateOnDeviceToSetOnOffAttributeManuallyToOn_17()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>(
-            "Operate on device to set OnOff attribute manually to ongarbage: not in length on purpose", 55);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
 
@@ -36129,11 +36223,12 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestUserPromptSetOnOffAttributeManuallyToOff_19()
+    CHIP_ERROR TestOperateOnDeviceToSetOnOffAttributeManuallyToOff_19()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>(
-            "Operate on device to set OnOff attribute manually to offgarbage: not in length on purpose", 56);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
 
@@ -47781,6 +47876,10 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
             break;
         case 2:
             ChipLogProgress(chipTool, " ***** Test Step 2 : Verify device temperature displayed in °C\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
             err = TestVerifyDeviceTemperatureDisplayedInc_2();
             break;
         case 3:
@@ -47801,6 +47900,10 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
             break;
         case 5:
             ChipLogProgress(chipTool, " ***** Test Step 5 : Verify device temperature displayed in °F\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
             err = TestVerifyDeviceTemperatureDisplayedInf_5();
             break;
         case 6:
@@ -47838,6 +47941,10 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
             break;
         case 10:
             ChipLogProgress(chipTool, " ***** Test Step 10 : Verify all device functionality available to the user\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
             err = TestVerifyAllDeviceFunctionalityAvailableToTheUser_10();
             break;
         case 11:
@@ -47858,6 +47965,10 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
             break;
         case 13:
             ChipLogProgress(chipTool, " ***** Test Step 13 : Verify device operates at Level 1 reduced functionality\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
             err = TestVerifyDeviceOperatesAtLevel1ReducedFunctionality_13();
             break;
         case 14:
@@ -47878,6 +47989,10 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
             break;
         case 16:
             ChipLogProgress(chipTool, " ***** Test Step 16 : Verify device operates at Level 2 reduced functionality\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
             err = TestVerifyDeviceOperatesAtLevel2ReducedFunctionality_16();
             break;
         case 17:
@@ -47898,6 +48013,10 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
             break;
         case 19:
             ChipLogProgress(chipTool, " ***** Test Step 19 : Verify device operates at Level 3 reduced functionality\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
             err = TestVerifyDeviceOperatesAtLevel3ReducedFunctionality_19();
             break;
         case 20:
@@ -47918,6 +48037,10 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
             break;
         case 22:
             ChipLogProgress(chipTool, " ***** Test Step 22 : Verify device operates at Level 4 reduced functionality\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
             err = TestVerifyDeviceOperatesAtLevel4ReducedFunctionality_22();
             break;
         case 23:
@@ -47938,6 +48061,10 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
             break;
         case 25:
             ChipLogProgress(chipTool, " ***** Test Step 25 : Verify device operates at least functionality level\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
             err = TestVerifyDeviceOperatesAtLeastFunctionalityLevel_25();
             break;
         case 26:
@@ -47976,6 +48103,10 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         case 30:
             ChipLogProgress(
                 chipTool, " ***** Test Step 30 : Verify local schedule programming functionality is enabled at the thermostat\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
             err = TestVerifyLocalScheduleProgrammingFunctionalityIsEnabledAtTheThermostat_30();
             break;
         case 31:
@@ -47998,6 +48129,10 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         case 33:
             ChipLogProgress(
                 chipTool, " ***** Test Step 33 : Verify local schedule programming functionality is disabled at the thermostat\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
             err = TestVerifyLocalScheduleProgrammingFunctionalityIsDisabledAtTheThermostat_33();
             break;
         case 34:
@@ -48199,7 +48334,9 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
     CHIP_ERROR TestVerifyDeviceTemperatureDisplayedInc_2()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Verify device temperature displayed in °Cgarbage: not in length on purpose", 42);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
 
@@ -48246,7 +48383,9 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
     CHIP_ERROR TestVerifyDeviceTemperatureDisplayedInf_5()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Verify device temperature displayed in °Fgarbage: not in length on purpose", 42);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
 
@@ -48343,8 +48482,9 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
     CHIP_ERROR TestVerifyAllDeviceFunctionalityAvailableToTheUser_10()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message
-            = chip::Span<const char>("Verify all device functionality available to the usergarbage: not in length on purpose", 53);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
 
@@ -48395,8 +48535,9 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
     CHIP_ERROR TestVerifyDeviceOperatesAtLevel1ReducedFunctionality_13()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>(
-            "Verify device operates at Level 1 reduced functionalitygarbage: not in length on purpose", 55);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
 
@@ -48447,8 +48588,9 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
     CHIP_ERROR TestVerifyDeviceOperatesAtLevel2ReducedFunctionality_16()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>(
-            "Verify device operates at Level 2 reduced functionalitygarbage: not in length on purpose", 55);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
 
@@ -48499,8 +48641,9 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
     CHIP_ERROR TestVerifyDeviceOperatesAtLevel3ReducedFunctionality_19()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>(
-            "Verify device operates at Level 3 reduced functionalitygarbage: not in length on purpose", 55);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
 
@@ -48551,8 +48694,9 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
     CHIP_ERROR TestVerifyDeviceOperatesAtLevel4ReducedFunctionality_22()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>(
-            "Verify device operates at Level 4 reduced functionalitygarbage: not in length on purpose", 55);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
 
@@ -48603,8 +48747,9 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
     CHIP_ERROR TestVerifyDeviceOperatesAtLeastFunctionalityLevel_25()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message
-            = chip::Span<const char>("Verify device operates at least functionality levelgarbage: not in length on purpose", 51);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
 
@@ -48700,8 +48845,9 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
     CHIP_ERROR TestVerifyLocalScheduleProgrammingFunctionalityIsEnabledAtTheThermostat_30()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>(
-            "Verify local schedule programming functionality is enabled at the thermostatgarbage: not in length on purpose", 76);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
 
@@ -48755,8 +48901,9 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
     CHIP_ERROR TestVerifyLocalScheduleProgrammingFunctionalityIsDisabledAtTheThermostat_33()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>(
-            "Verify local schedule programming functionality is disabled at the thermostatgarbage: not in length on purpose", 77);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }