diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index 08654daa2cb2be..c1ae52856668ac 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -60720,7 +60720,7 @@ class DL_LockUnlockSuite : public TestCommand
                                  chip::NullOptional);
         }
         case 3: {
-            LogStep(3, "Try to unlock the door without a PIN");
+            LogStep(3, "Try to lock the door without a PIN");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::LockDoor::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::LockDoor::Id, value,
@@ -60946,7 +60946,7 @@ class DL_SchedulesSuite : public TestCommand
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
             break;
         case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 11:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
@@ -61045,7 +61045,7 @@ class DL_SchedulesSuite : public TestCommand
 
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 2U));
 
-                VerifyOrReturn(CheckValue("status", value.status, 139));
+                VerifyOrReturn(CheckValue("status", value.status, 1));
             }
             break;
         case 26:
@@ -61061,10 +61061,10 @@ class DL_SchedulesSuite : public TestCommand
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
             break;
         case 30:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 31:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_COMMAND));
             break;
         case 32:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -61136,7 +61136,7 @@ class DL_SchedulesSuite : public TestCommand
 
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 2U));
 
-                VerifyOrReturn(CheckValue("status", value.status, 139));
+                VerifyOrReturn(CheckValue("status", value.status, 1));
             }
             break;
         case 38:
@@ -61268,7 +61268,7 @@ class DL_SchedulesSuite : public TestCommand
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
             break;
         case 55:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 56:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -61347,7 +61347,7 @@ class DL_SchedulesSuite : public TestCommand
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
             break;
         case 63:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 64:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -61840,7 +61840,7 @@ class DL_SchedulesSuite : public TestCommand
 
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
 
-                VerifyOrReturn(CheckValue("status", value.status, 139));
+                VerifyOrReturn(CheckValue("status", value.status, 1));
             }
             break;
         case 104:
@@ -61852,7 +61852,7 @@ class DL_SchedulesSuite : public TestCommand
 
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
 
-                VerifyOrReturn(CheckValue("status", value.status, 139));
+                VerifyOrReturn(CheckValue("status", value.status, 1));
             }
             break;
         case 105:
@@ -61864,7 +61864,7 @@ class DL_SchedulesSuite : public TestCommand
 
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 2U));
 
-                VerifyOrReturn(CheckValue("status", value.status, 139));
+                VerifyOrReturn(CheckValue("status", value.status, 1));
             }
             break;
         case 106:
@@ -61876,7 +61876,7 @@ class DL_SchedulesSuite : public TestCommand
 
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 2U));
 
-                VerifyOrReturn(CheckValue("status", value.status, 139));
+                VerifyOrReturn(CheckValue("status", value.status, 1));
             }
             break;
         case 107:
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 aab1ca7cc3f9df..88ae93460df05d 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -95830,8 +95830,8 @@ class DL_LockUnlock : public TestCommandBridge {
             err = TestVerifyThatLockStateAttributeValueIsSetToUnlocked_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Try to unlock the door without a PIN\n");
-            err = TestTryToUnlockTheDoorWithoutAPin_3();
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Try to lock the door without a PIN\n");
+            err = TestTryToLockTheDoorWithoutAPin_3();
             break;
         case 4:
             ChipLogProgress(chipTool, " ***** Test Step 4 : Verify that lock state attribute value is set to Locked\n");
@@ -96002,7 +96002,7 @@ class DL_LockUnlock : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTryToUnlockTheDoorWithoutAPin_3()
+    CHIP_ERROR TestTryToLockTheDoorWithoutAPin_3()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -96011,7 +96011,7 @@ class DL_LockUnlock : public TestCommandBridge {
         __auto_type * params = [[CHIPDoorLockClusterLockDoorParams alloc] init];
         [cluster lockDoorWithParams:params
                   completionHandler:^(NSError * _Nullable err) {
-                      NSLog(@"Try to unlock the door without a PIN Error: %@", err);
+                      NSLog(@"Try to lock the door without a PIN Error: %@", err);
 
                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -96880,7 +96880,7 @@ class DL_Schedules : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
             break;
         case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 11:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
@@ -96940,10 +96940,10 @@ class DL_Schedules : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
             break;
         case 30:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 31:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_COMMAND));
             break;
         case 32:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -97015,7 +97015,7 @@ class DL_Schedules : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
             break;
         case 55:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 56:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -97039,7 +97039,7 @@ class DL_Schedules : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
             break;
         case 63:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 64:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -97529,7 +97529,7 @@ class DL_Schedules : public TestCommandBridge {
                             completionHandler:^(NSError * _Nullable err) {
                                 NSLog(@"Create Week Day schedule for non-existing user Error: %@", err);
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_NOT_FOUND));
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_FAILURE));
                                 NextTest();
                             }];
 
@@ -97978,7 +97978,7 @@ class DL_Schedules : public TestCommandBridge {
 
                                 {
                                     id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
+                                    VerifyOrReturn(CheckValue("status", actualValue, 1));
                                 }
 
                                 NextTest();
@@ -98090,7 +98090,7 @@ class DL_Schedules : public TestCommandBridge {
                             completionHandler:^(NSError * _Nullable err) {
                                 NSLog(@"Create Year Day schedule for non-existing user Error: %@", err);
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_NOT_FOUND));
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_FAILURE));
                                 NextTest();
                             }];
 
@@ -98112,7 +98112,7 @@ class DL_Schedules : public TestCommandBridge {
                             completionHandler:^(NSError * _Nullable err) {
                                 NSLog(@"Create Year Day schedule with start hour later that end hour Error: %@", err);
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                                 NextTest();
                             }];
 
@@ -98334,7 +98334,7 @@ class DL_Schedules : public TestCommandBridge {
 
                                 {
                                     id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
+                                    VerifyOrReturn(CheckValue("status", actualValue, 1));
                                 }
 
                                 NextTest();
@@ -98845,7 +98845,7 @@ class DL_Schedules : public TestCommandBridge {
                               completionHandler:^(NSError * _Nullable err) {
                                   NSLog(@"Clear Week Day schedule with non-existing user Error: %@", err);
 
-                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_NOT_FOUND));
+                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_FAILURE));
                                   NextTest();
                               }];
 
@@ -99100,7 +99100,7 @@ class DL_Schedules : public TestCommandBridge {
                               completionHandler:^(NSError * _Nullable err) {
                                   NSLog(@"Clear Year Day schedule with non-existing user Error: %@", err);
 
-                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_NOT_FOUND));
+                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_FAILURE));
                                   NextTest();
                               }];
 
@@ -100599,7 +100599,7 @@ class DL_Schedules : public TestCommandBridge {
 
                                 {
                                     id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
+                                    VerifyOrReturn(CheckValue("status", actualValue, 1));
                                 }
 
                                 NextTest();
@@ -100636,7 +100636,7 @@ class DL_Schedules : public TestCommandBridge {
 
                                 {
                                     id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
+                                    VerifyOrReturn(CheckValue("status", actualValue, 1));
                                 }
 
                                 NextTest();
@@ -100673,7 +100673,7 @@ class DL_Schedules : public TestCommandBridge {
 
                                 {
                                     id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
+                                    VerifyOrReturn(CheckValue("status", actualValue, 1));
                                 }
 
                                 NextTest();
@@ -100710,7 +100710,7 @@ class DL_Schedules : public TestCommandBridge {
 
                                 {
                                     id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
+                                    VerifyOrReturn(CheckValue("status", actualValue, 1));
                                 }
 
                                 NextTest();