diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_2_12.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_2_12.yaml
index 964e6a763c2435..2964d1c83b3bec 100644
--- a/src/app/tests/suites/certification/Test_TC_DRLK_2_12.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DRLK_2_12.yaml
@@ -15,7 +15,7 @@
 name: 121.3.2. [TC-DRLK-2.12] Verification for Ubolt Door command [DUT-Server]
 
 PICS:
-    - DRLK.S
+    - DRLK.S.F0c
 
 config:
     nodeId: 0x12344321
@@ -128,7 +128,7 @@ tests:
     - label:
           "Step 1: TH writes the RequirePINforRemoteOperation attribute value as
           False on the DUT"
-      PICS: DRLK.S.F0c && DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033.Write
+      PICS: DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033.Write
       command: "writeAttribute"
       attribute: "RequirePINforRemoteOperation"
       arguments:
@@ -137,7 +137,7 @@ tests:
     - label:
           "Step 1: TH writes the RequirePINforRemoteOperation attribute value as
           False on the DUT"
-      PICS: DRLK.S.F0c && DRLK.S.F07 && DRLK.S.F00 && !DRLK.S.A0033.Write
+      PICS: DRLK.S.F07 && DRLK.S.F00 && !DRLK.S.A0033.Write
       command: "writeAttribute"
       attribute: "RequirePINforRemoteOperation"
       arguments:
@@ -148,19 +148,19 @@ tests:
     - label:
           "Step 2: TH reads the RequirePINforRemoteOperation attribute from the
           DUT"
-      PICS: DRLK.S.F0c && DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033
+      PICS: DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033
       command: "readAttribute"
       attribute: "RequirePINforRemoteOperation"
       response:
           value: false
 
     - label: "Step 3: TH sends Ubolt Door Command to the DUT without PINCode"
-      PICS: DRLK.S.C27.Rsp && DRLK.S.F0c
+      PICS: DRLK.S.C27.Rsp
       command: "UnboltDoor"
       timedInteractionTimeoutMs: 1000
 
     - label: "Step 4: TH sends Ubolt Door Command to the DUT with PINCode"
-      PICS: DRLK.S.C27.Rsp && DRLK.S.F0c
+      PICS: DRLK.S.C27.Rsp
       command: "UnboltDoor"
       timedInteractionTimeoutMs: 1000
       arguments:
@@ -171,7 +171,7 @@ tests:
     - label:
           "Step 5: TH writes the RequirePINforRemoteOperation attribute value as
           true on the DUT"
-      PICS: DRLK.S.F0c && DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033.Write
+      PICS: DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033.Write
       command: "writeAttribute"
       attribute: "RequirePINforRemoteOperation"
       arguments:
@@ -180,7 +180,7 @@ tests:
     - label:
           "Step 5: TH writes the RequirePINforRemoteOperation attribute value as
           true on the DUT"
-      PICS: DRLK.S.F0c && DRLK.S.F07 && DRLK.S.F00 && !DRLK.S.A0033.Write
+      PICS: DRLK.S.F07 && DRLK.S.F00 && !DRLK.S.A0033.Write
       command: "writeAttribute"
       attribute: "RequirePINforRemoteOperation"
       arguments:
@@ -191,14 +191,14 @@ tests:
     - label:
           "Step 6: TH reads the RequirePINforRemoteOperation attribute from the
           DUT"
-      PICS: DRLK.S.F0c && DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033
+      PICS: DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033
       command: "readAttribute"
       attribute: "RequirePINforRemoteOperation"
       response:
           value: true
 
     - label: "Step 7: TH sends Ubolt Door Command to the DUT with valid PINCode"
-      PICS: DRLK.S.C27.Rsp && DRLK.S.F0c
+      PICS: DRLK.S.C27.Rsp
       command: "UnboltDoor"
       timedInteractionTimeoutMs: 1000
       arguments:
@@ -208,7 +208,7 @@ tests:
 
     - label:
           "Step 8: TH sends Unbolt Door Command to the DUT with Invalid PINCode"
-      PICS: DRLK.S.C27.Rsp && DRLK.S.F0c
+      PICS: DRLK.S.C27.Rsp
       command: "UnboltDoor"
       timedInteractionTimeoutMs: 1000
       arguments:
@@ -219,7 +219,7 @@ tests:
           error: FAILURE
 
     - label: "Step 9: TH sends Unbolt Door Command to the DUT without PINCode"
-      PICS: DRLK.S.C27.Rsp && DRLK.S.F0c
+      PICS: DRLK.S.C27.Rsp
       command: "UnboltDoor"
       timedInteractionTimeoutMs: 1000
       response:
@@ -228,7 +228,7 @@ tests:
     - label:
           "Step 10: TH writes WrongCodeEntryLimit attribute value as 3 on the
           DUT"
-      PICS: DRLK.S.F0c && ( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0030.Write
+      PICS: ( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0030.Write
       command: "writeAttribute"
       attribute: "WrongCodeEntryLimit"
       arguments:
@@ -237,7 +237,7 @@ tests:
     - label:
           "Step 10: TH writes WrongCodeEntryLimit attribute value as 3 on the
           DUT"
-      PICS: DRLK.S.F0c && ( DRLK.S.F00 || DRLK.S.F01 ) && !DRLK.S.A0030.Write
+      PICS: ( DRLK.S.F00 || DRLK.S.F01 ) && !DRLK.S.A0030.Write
       command: "writeAttribute"
       attribute: "WrongCodeEntryLimit"
       arguments:
@@ -248,7 +248,7 @@ tests:
     - label:
           "Step 11: TH writes UserCodeTemporaryDisableTime attribute value as 15
           Seconds on the DUT and Verify that the DUT sends Success response"
-      PICS: DRLK.S.F0c && ( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0031.Write
+      PICS: ( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0031.Write
       command: "writeAttribute"
       attribute: "UserCodeTemporaryDisableTime"
       arguments:
@@ -257,7 +257,7 @@ tests:
     - label:
           "Step 11: TH writes UserCodeTemporaryDisableTime attribute value as 15
           Seconds on the DUT and Verify that the DUT sends Success response"
-      PICS: DRLK.S.F0c && ( DRLK.S.F00 || DRLK.S.F01 ) && !DRLK.S.A0031.Write
+      PICS: ( DRLK.S.F00 || DRLK.S.F01 ) && !DRLK.S.A0031.Write
       command: "writeAttribute"
       attribute: "UserCodeTemporaryDisableTime"
       arguments:
@@ -319,7 +319,7 @@ tests:
 
     - label:
           "Step 13: TH reads UserCodedTemporaryDisableTime attribute from DUT"
-      PICS: DRLK.S.F0c && ( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0031
+      PICS: ( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0031
       command: "readAttribute"
       attribute: "UserCodeTemporaryDisableTime"
       response:
@@ -341,7 +341,7 @@ tests:
     - label: "Wait for UserCodeTemporaryDisableTime expires"
       cluster: "DelayCommands"
       command: "WaitForMs"
-      PICS: DRLK.S.F0c && ( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0031
+      PICS: ( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0031
       arguments:
           values:
               - name: "ms"
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index a06eeaa75b5ed5..4b9a15ec21729f 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -109698,7 +109698,7 @@ class Test_TC_DRLK_2_12Suite : public TestCommand
         }
         case 5: {
             LogStep(5, "Step 1: TH writes the RequirePINforRemoteOperation attribute value as False on the DUT");
-            VerifyOrDo(!ShouldSkip("DRLK.S.F0c && DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033.Write"),
+            VerifyOrDo(!ShouldSkip("DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033.Write"),
                        return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             bool value;
@@ -109709,7 +109709,7 @@ class Test_TC_DRLK_2_12Suite : public TestCommand
         }
         case 6: {
             LogStep(6, "Step 1: TH writes the RequirePINforRemoteOperation attribute value as False on the DUT");
-            VerifyOrDo(!ShouldSkip("DRLK.S.F0c && DRLK.S.F07 && DRLK.S.F00 && !DRLK.S.A0033.Write"),
+            VerifyOrDo(!ShouldSkip("DRLK.S.F07 && DRLK.S.F00 && !DRLK.S.A0033.Write"),
                        return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             bool value;
@@ -109720,14 +109720,13 @@ class Test_TC_DRLK_2_12Suite : public TestCommand
         }
         case 7: {
             LogStep(7, "Step 2: TH reads the RequirePINforRemoteOperation attribute from the DUT");
-            VerifyOrDo(!ShouldSkip("DRLK.S.F0c && DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033"),
-                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), DoorLock::Id,
                                  DoorLock::Attributes::RequirePINforRemoteOperation::Id, true, chip::NullOptional);
         }
         case 8: {
             LogStep(8, "Step 3: TH sends Ubolt Door Command to the DUT without PINCode");
-            VerifyOrDo(!ShouldSkip("DRLK.S.C27.Rsp && DRLK.S.F0c"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("DRLK.S.C27.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::UnboltDoor::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnboltDoor::Id, value,
@@ -109737,7 +109736,7 @@ class Test_TC_DRLK_2_12Suite : public TestCommand
         }
         case 9: {
             LogStep(9, "Step 4: TH sends Ubolt Door Command to the DUT with PINCode");
-            VerifyOrDo(!ShouldSkip("DRLK.S.C27.Rsp && DRLK.S.F0c"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("DRLK.S.C27.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::UnboltDoor::Type value;
             value.PINCode.Emplace();
@@ -109749,7 +109748,7 @@ class Test_TC_DRLK_2_12Suite : public TestCommand
         }
         case 10: {
             LogStep(10, "Step 5: TH writes the RequirePINforRemoteOperation attribute value as true on the DUT");
-            VerifyOrDo(!ShouldSkip("DRLK.S.F0c && DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033.Write"),
+            VerifyOrDo(!ShouldSkip("DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033.Write"),
                        return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             bool value;
@@ -109760,7 +109759,7 @@ class Test_TC_DRLK_2_12Suite : public TestCommand
         }
         case 11: {
             LogStep(11, "Step 5: TH writes the RequirePINforRemoteOperation attribute value as true on the DUT");
-            VerifyOrDo(!ShouldSkip("DRLK.S.F0c && DRLK.S.F07 && DRLK.S.F00 && !DRLK.S.A0033.Write"),
+            VerifyOrDo(!ShouldSkip("DRLK.S.F07 && DRLK.S.F00 && !DRLK.S.A0033.Write"),
                        return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             bool value;
@@ -109771,14 +109770,13 @@ class Test_TC_DRLK_2_12Suite : public TestCommand
         }
         case 12: {
             LogStep(12, "Step 6: TH reads the RequirePINforRemoteOperation attribute from the DUT");
-            VerifyOrDo(!ShouldSkip("DRLK.S.F0c && DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033"),
-                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), DoorLock::Id,
                                  DoorLock::Attributes::RequirePINforRemoteOperation::Id, true, chip::NullOptional);
         }
         case 13: {
             LogStep(13, "Step 7: TH sends Ubolt Door Command to the DUT with valid PINCode");
-            VerifyOrDo(!ShouldSkip("DRLK.S.C27.Rsp && DRLK.S.F0c"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("DRLK.S.C27.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::UnboltDoor::Type value;
             value.PINCode.Emplace();
@@ -109790,7 +109788,7 @@ class Test_TC_DRLK_2_12Suite : public TestCommand
         }
         case 14: {
             LogStep(14, "Step 8: TH sends Unbolt Door Command to the DUT with Invalid PINCode");
-            VerifyOrDo(!ShouldSkip("DRLK.S.C27.Rsp && DRLK.S.F0c"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("DRLK.S.C27.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::UnboltDoor::Type value;
             value.PINCode.Emplace();
@@ -109802,7 +109800,7 @@ class Test_TC_DRLK_2_12Suite : public TestCommand
         }
         case 15: {
             LogStep(15, "Step 9: TH sends Unbolt Door Command to the DUT without PINCode");
-            VerifyOrDo(!ShouldSkip("DRLK.S.C27.Rsp && DRLK.S.F0c"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("DRLK.S.C27.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::UnboltDoor::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnboltDoor::Id, value,
@@ -109812,7 +109810,7 @@ class Test_TC_DRLK_2_12Suite : public TestCommand
         }
         case 16: {
             LogStep(16, "Step 10: TH writes WrongCodeEntryLimit attribute value as 3 on the DUT");
-            VerifyOrDo(!ShouldSkip("DRLK.S.F0c && ( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0030.Write"),
+            VerifyOrDo(!ShouldSkip("( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0030.Write"),
                        return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             uint8_t value;
@@ -109822,7 +109820,7 @@ class Test_TC_DRLK_2_12Suite : public TestCommand
         }
         case 17: {
             LogStep(17, "Step 10: TH writes WrongCodeEntryLimit attribute value as 3 on the DUT");
-            VerifyOrDo(!ShouldSkip("DRLK.S.F0c && ( DRLK.S.F00 || DRLK.S.F01 ) && !DRLK.S.A0030.Write"),
+            VerifyOrDo(!ShouldSkip("( DRLK.S.F00 || DRLK.S.F01 ) && !DRLK.S.A0030.Write"),
                        return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             uint8_t value;
@@ -109834,7 +109832,7 @@ class Test_TC_DRLK_2_12Suite : public TestCommand
             LogStep(18,
                     "Step 11: TH writes UserCodeTemporaryDisableTime attribute value as 15 Seconds on the DUT and Verify that the "
                     "DUT sends Success response");
-            VerifyOrDo(!ShouldSkip("DRLK.S.F0c && ( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0031.Write"),
+            VerifyOrDo(!ShouldSkip("( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0031.Write"),
                        return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             uint8_t value;
@@ -109847,7 +109845,7 @@ class Test_TC_DRLK_2_12Suite : public TestCommand
             LogStep(19,
                     "Step 11: TH writes UserCodeTemporaryDisableTime attribute value as 15 Seconds on the DUT and Verify that the "
                     "DUT sends Success response");
-            VerifyOrDo(!ShouldSkip("DRLK.S.F0c && ( DRLK.S.F00 || DRLK.S.F01 ) && !DRLK.S.A0031.Write"),
+            VerifyOrDo(!ShouldSkip("( DRLK.S.F00 || DRLK.S.F01 ) && !DRLK.S.A0031.Write"),
                        return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             uint8_t value;
@@ -109906,8 +109904,7 @@ class Test_TC_DRLK_2_12Suite : public TestCommand
         }
         case 24: {
             LogStep(24, "Step 13: TH reads UserCodedTemporaryDisableTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("DRLK.S.F0c && ( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0031"),
-                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0031"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), DoorLock::Id,
                                  DoorLock::Attributes::UserCodeTemporaryDisableTime::Id, true, chip::NullOptional);
         }
@@ -109927,8 +109924,7 @@ class Test_TC_DRLK_2_12Suite : public TestCommand
         }
         case 26: {
             LogStep(26, "Wait for UserCodeTemporaryDisableTime expires");
-            VerifyOrDo(!ShouldSkip("DRLK.S.F0c && ( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0031"),
-                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0031"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
             value.ms = 15000UL;
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 bbbf13b631f17b..fcad5b306ce5ab 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -166673,7 +166673,7 @@ class Test_TC_DRLK_2_12 : public TestCommandBridge {
         case 5:
             ChipLogProgress(chipTool,
                 " ***** Test Step 5 : Step 1: TH writes the RequirePINforRemoteOperation attribute value as False on the DUT\n");
-            if (ShouldSkip("DRLK.S.F0c && DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033.Write")) {
+            if (ShouldSkip("DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033.Write")) {
                 NextTest();
                 return;
             }
@@ -166682,7 +166682,7 @@ class Test_TC_DRLK_2_12 : public TestCommandBridge {
         case 6:
             ChipLogProgress(chipTool,
                 " ***** Test Step 6 : Step 1: TH writes the RequirePINforRemoteOperation attribute value as False on the DUT\n");
-            if (ShouldSkip("DRLK.S.F0c && DRLK.S.F07 && DRLK.S.F00 && !DRLK.S.A0033.Write")) {
+            if (ShouldSkip("DRLK.S.F07 && DRLK.S.F00 && !DRLK.S.A0033.Write")) {
                 NextTest();
                 return;
             }
@@ -166691,7 +166691,7 @@ class Test_TC_DRLK_2_12 : public TestCommandBridge {
         case 7:
             ChipLogProgress(
                 chipTool, " ***** Test Step 7 : Step 2: TH reads the RequirePINforRemoteOperation attribute from the DUT\n");
-            if (ShouldSkip("DRLK.S.F0c && DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033")) {
+            if (ShouldSkip("DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033")) {
                 NextTest();
                 return;
             }
@@ -166699,7 +166699,7 @@ class Test_TC_DRLK_2_12 : public TestCommandBridge {
             break;
         case 8:
             ChipLogProgress(chipTool, " ***** Test Step 8 : Step 3: TH sends Ubolt Door Command to the DUT without PINCode\n");
-            if (ShouldSkip("DRLK.S.C27.Rsp && DRLK.S.F0c")) {
+            if (ShouldSkip("DRLK.S.C27.Rsp")) {
                 NextTest();
                 return;
             }
@@ -166707,7 +166707,7 @@ class Test_TC_DRLK_2_12 : public TestCommandBridge {
             break;
         case 9:
             ChipLogProgress(chipTool, " ***** Test Step 9 : Step 4: TH sends Ubolt Door Command to the DUT with PINCode\n");
-            if (ShouldSkip("DRLK.S.C27.Rsp && DRLK.S.F0c")) {
+            if (ShouldSkip("DRLK.S.C27.Rsp")) {
                 NextTest();
                 return;
             }
@@ -166716,7 +166716,7 @@ class Test_TC_DRLK_2_12 : public TestCommandBridge {
         case 10:
             ChipLogProgress(chipTool,
                 " ***** Test Step 10 : Step 5: TH writes the RequirePINforRemoteOperation attribute value as true on the DUT\n");
-            if (ShouldSkip("DRLK.S.F0c && DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033.Write")) {
+            if (ShouldSkip("DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033.Write")) {
                 NextTest();
                 return;
             }
@@ -166725,7 +166725,7 @@ class Test_TC_DRLK_2_12 : public TestCommandBridge {
         case 11:
             ChipLogProgress(chipTool,
                 " ***** Test Step 11 : Step 5: TH writes the RequirePINforRemoteOperation attribute value as true on the DUT\n");
-            if (ShouldSkip("DRLK.S.F0c && DRLK.S.F07 && DRLK.S.F00 && !DRLK.S.A0033.Write")) {
+            if (ShouldSkip("DRLK.S.F07 && DRLK.S.F00 && !DRLK.S.A0033.Write")) {
                 NextTest();
                 return;
             }
@@ -166734,7 +166734,7 @@ class Test_TC_DRLK_2_12 : public TestCommandBridge {
         case 12:
             ChipLogProgress(
                 chipTool, " ***** Test Step 12 : Step 6: TH reads the RequirePINforRemoteOperation attribute from the DUT\n");
-            if (ShouldSkip("DRLK.S.F0c && DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033")) {
+            if (ShouldSkip("DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033")) {
                 NextTest();
                 return;
             }
@@ -166742,7 +166742,7 @@ class Test_TC_DRLK_2_12 : public TestCommandBridge {
             break;
         case 13:
             ChipLogProgress(chipTool, " ***** Test Step 13 : Step 7: TH sends Ubolt Door Command to the DUT with valid PINCode\n");
-            if (ShouldSkip("DRLK.S.C27.Rsp && DRLK.S.F0c")) {
+            if (ShouldSkip("DRLK.S.C27.Rsp")) {
                 NextTest();
                 return;
             }
@@ -166751,7 +166751,7 @@ class Test_TC_DRLK_2_12 : public TestCommandBridge {
         case 14:
             ChipLogProgress(
                 chipTool, " ***** Test Step 14 : Step 8: TH sends Unbolt Door Command to the DUT with Invalid PINCode\n");
-            if (ShouldSkip("DRLK.S.C27.Rsp && DRLK.S.F0c")) {
+            if (ShouldSkip("DRLK.S.C27.Rsp")) {
                 NextTest();
                 return;
             }
@@ -166759,7 +166759,7 @@ class Test_TC_DRLK_2_12 : public TestCommandBridge {
             break;
         case 15:
             ChipLogProgress(chipTool, " ***** Test Step 15 : Step 9: TH sends Unbolt Door Command to the DUT without PINCode\n");
-            if (ShouldSkip("DRLK.S.C27.Rsp && DRLK.S.F0c")) {
+            if (ShouldSkip("DRLK.S.C27.Rsp")) {
                 NextTest();
                 return;
             }
@@ -166768,7 +166768,7 @@ class Test_TC_DRLK_2_12 : public TestCommandBridge {
         case 16:
             ChipLogProgress(
                 chipTool, " ***** Test Step 16 : Step 10: TH writes WrongCodeEntryLimit attribute value as 3 on the DUT\n");
-            if (ShouldSkip("DRLK.S.F0c && ( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0030.Write")) {
+            if (ShouldSkip("( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0030.Write")) {
                 NextTest();
                 return;
             }
@@ -166777,7 +166777,7 @@ class Test_TC_DRLK_2_12 : public TestCommandBridge {
         case 17:
             ChipLogProgress(
                 chipTool, " ***** Test Step 17 : Step 10: TH writes WrongCodeEntryLimit attribute value as 3 on the DUT\n");
-            if (ShouldSkip("DRLK.S.F0c && ( DRLK.S.F00 || DRLK.S.F01 ) && !DRLK.S.A0030.Write")) {
+            if (ShouldSkip("( DRLK.S.F00 || DRLK.S.F01 ) && !DRLK.S.A0030.Write")) {
                 NextTest();
                 return;
             }
@@ -166787,7 +166787,7 @@ class Test_TC_DRLK_2_12 : public TestCommandBridge {
             ChipLogProgress(chipTool,
                 " ***** Test Step 18 : Step 11: TH writes UserCodeTemporaryDisableTime attribute value as 15 Seconds on the DUT "
                 "and Verify that the DUT sends Success response\n");
-            if (ShouldSkip("DRLK.S.F0c && ( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0031.Write")) {
+            if (ShouldSkip("( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0031.Write")) {
                 NextTest();
                 return;
             }
@@ -166797,7 +166797,7 @@ class Test_TC_DRLK_2_12 : public TestCommandBridge {
             ChipLogProgress(chipTool,
                 " ***** Test Step 19 : Step 11: TH writes UserCodeTemporaryDisableTime attribute value as 15 Seconds on the DUT "
                 "and Verify that the DUT sends Success response\n");
-            if (ShouldSkip("DRLK.S.F0c && ( DRLK.S.F00 || DRLK.S.F01 ) && !DRLK.S.A0031.Write")) {
+            if (ShouldSkip("( DRLK.S.F00 || DRLK.S.F01 ) && !DRLK.S.A0031.Write")) {
                 NextTest();
                 return;
             }
@@ -166841,7 +166841,7 @@ class Test_TC_DRLK_2_12 : public TestCommandBridge {
             break;
         case 24:
             ChipLogProgress(chipTool, " ***** Test Step 24 : Step 13: TH reads UserCodedTemporaryDisableTime attribute from DUT\n");
-            if (ShouldSkip("DRLK.S.F0c && ( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0031")) {
+            if (ShouldSkip("( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0031")) {
                 NextTest();
                 return;
             }
@@ -166859,7 +166859,7 @@ class Test_TC_DRLK_2_12 : public TestCommandBridge {
             break;
         case 26:
             ChipLogProgress(chipTool, " ***** Test Step 26 : Wait for UserCodeTemporaryDisableTime expires\n");
-            if (ShouldSkip("DRLK.S.F0c && ( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0031")) {
+            if (ShouldSkip("( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0031")) {
                 NextTest();
                 return;
             }