diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/large_all_clusters_app/cpp-app/callback-stub.cpp b/scripts/py_matter_idl/matter_idl/tests/outputs/large_all_clusters_app/cpp-app/callback-stub.cpp
index 6b8e07b967cabe..74735c9fe8036e 100644
--- a/scripts/py_matter_idl/matter_idl/tests/outputs/large_all_clusters_app/cpp-app/callback-stub.cpp
+++ b/scripts/py_matter_idl/matter_idl/tests/outputs/large_all_clusters_app/cpp-app/callback-stub.cpp
@@ -1,209 +1,6 @@
 #include <app-common/zap-generated/callback.h>
-#include <app-common/zap-generated/ids/Clusters.h>
-#include <lib/support/Span.h>
-#include <protocols/interaction_model/Constants.h>
 
 using namespace chip;
-
-// Cluster Init Functions
-void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
-{
-    switch (clusterId)
-    {
-    case app::Clusters::AccessControl::Id:
-        emberAfAccessControlClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::AccountLogin::Id:
-        emberAfAccountLoginClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::Actions::Id:
-        emberAfActionsClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::AdministratorCommissioning::Id:
-        emberAfAdministratorCommissioningClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::ApplicationBasic::Id:
-        emberAfApplicationBasicClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::ApplicationLauncher::Id:
-        emberAfApplicationLauncherClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::AudioOutput::Id:
-        emberAfAudioOutputClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::BarrierControl::Id:
-        emberAfBarrierControlClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::BasicInformation::Id:
-        emberAfBasicInformationClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::BinaryInputBasic::Id:
-        emberAfBinaryInputBasicClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::Binding::Id:
-        emberAfBindingClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::BooleanState::Id:
-        emberAfBooleanStateClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::Channel::Id:
-        emberAfChannelClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::ColorControl::Id:
-        emberAfColorControlClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::ContentLauncher::Id:
-        emberAfContentLauncherClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::Descriptor::Id:
-        emberAfDescriptorClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::DiagnosticLogs::Id:
-        emberAfDiagnosticLogsClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::DoorLock::Id:
-        emberAfDoorLockClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::ElectricalMeasurement::Id:
-        emberAfElectricalMeasurementClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::EthernetNetworkDiagnostics::Id:
-        emberAfEthernetNetworkDiagnosticsClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::FanControl::Id:
-        emberAfFanControlClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::FaultInjection::Id:
-        emberAfFaultInjectionClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::FixedLabel::Id:
-        emberAfFixedLabelClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::FlowMeasurement::Id:
-        emberAfFlowMeasurementClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::GeneralCommissioning::Id:
-        emberAfGeneralCommissioningClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::GeneralDiagnostics::Id:
-        emberAfGeneralDiagnosticsClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::GroupKeyManagement::Id:
-        emberAfGroupKeyManagementClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::Groups::Id:
-        emberAfGroupsClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::Identify::Id:
-        emberAfIdentifyClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::IlluminanceMeasurement::Id:
-        emberAfIlluminanceMeasurementClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::KeypadInput::Id:
-        emberAfKeypadInputClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::LevelControl::Id:
-        emberAfLevelControlClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::LocalizationConfiguration::Id:
-        emberAfLocalizationConfigurationClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::LowPower::Id:
-        emberAfLowPowerClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::MatterScenes::Id:
-        emberAfMatterScenesClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::MediaInput::Id:
-        emberAfMediaInputClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::MediaPlayback::Id:
-        emberAfMediaPlaybackClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::ModeSelect::Id:
-        emberAfModeSelectClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::NetworkCommissioning::Id:
-        emberAfNetworkCommissioningClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::OccupancySensing::Id:
-        emberAfOccupancySensingClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::OnOff::Id:
-        emberAfOnOffClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::OnOffSwitchConfiguration::Id:
-        emberAfOnOffSwitchConfigurationClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::OperationalCredentials::Id:
-        emberAfOperationalCredentialsClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::OtaSoftwareUpdateRequestor::Id:
-        emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::PowerSource::Id:
-        emberAfPowerSourceClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::PowerSourceConfiguration::Id:
-        emberAfPowerSourceConfigurationClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::PressureMeasurement::Id:
-        emberAfPressureMeasurementClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::PumpConfigurationAndControl::Id:
-        emberAfPumpConfigurationAndControlClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::RelativeHumidityMeasurement::Id:
-        emberAfRelativeHumidityMeasurementClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::SoftwareDiagnostics::Id:
-        emberAfSoftwareDiagnosticsClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::Switch::Id:
-        emberAfSwitchClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::TargetNavigator::Id:
-        emberAfTargetNavigatorClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::TemperatureMeasurement::Id:
-        emberAfTemperatureMeasurementClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::Thermostat::Id:
-        emberAfThermostatClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::ThermostatUserInterfaceConfiguration::Id:
-        emberAfThermostatUserInterfaceConfigurationClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::ThreadNetworkDiagnostics::Id:
-        emberAfThreadNetworkDiagnosticsClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::TimeFormatLocalization::Id:
-        emberAfTimeFormatLocalizationClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::UnitLocalization::Id:
-        emberAfUnitLocalizationClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::UnitTesting::Id:
-        emberAfUnitTestingClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::UserLabel::Id:
-        emberAfUserLabelClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::WakeOnLan::Id:
-        emberAfWakeOnLanClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::WiFiNetworkDiagnostics::Id:
-        emberAfWiFiNetworkDiagnosticsClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::WindowCovering::Id:
-        emberAfWindowCoveringClusterInitCallback(endpoint);
-        break;
-    default:
-        // Unrecognized cluster ID
-        break;
-    }
-}
 void __attribute__((weak)) emberAfAccessControlClusterInitCallback(EndpointId endpoint)
 {
     // To prevent warning
diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/large_all_clusters_app/cpp-app/cluster-init-callback.cpp b/scripts/py_matter_idl/matter_idl/tests/outputs/large_all_clusters_app/cpp-app/cluster-init-callback.cpp
new file mode 100644
index 00000000000000..8144c53c404e9f
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/tests/outputs/large_all_clusters_app/cpp-app/cluster-init-callback.cpp
@@ -0,0 +1,206 @@
+#include <app-common/zap-generated/callback.h>
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <lib/support/Span.h>
+#include <protocols/interaction_model/Constants.h>
+
+using namespace chip;
+
+// Cluster Init Functions
+void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
+{
+    switch (clusterId)
+    {
+    case app::Clusters::AccessControl::Id:
+        emberAfAccessControlClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::AccountLogin::Id:
+        emberAfAccountLoginClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::Actions::Id:
+        emberAfActionsClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::AdministratorCommissioning::Id:
+        emberAfAdministratorCommissioningClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::ApplicationBasic::Id:
+        emberAfApplicationBasicClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::ApplicationLauncher::Id:
+        emberAfApplicationLauncherClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::AudioOutput::Id:
+        emberAfAudioOutputClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::BarrierControl::Id:
+        emberAfBarrierControlClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::BasicInformation::Id:
+        emberAfBasicInformationClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::BinaryInputBasic::Id:
+        emberAfBinaryInputBasicClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::Binding::Id:
+        emberAfBindingClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::BooleanState::Id:
+        emberAfBooleanStateClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::Channel::Id:
+        emberAfChannelClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::ColorControl::Id:
+        emberAfColorControlClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::ContentLauncher::Id:
+        emberAfContentLauncherClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::Descriptor::Id:
+        emberAfDescriptorClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::DiagnosticLogs::Id:
+        emberAfDiagnosticLogsClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::DoorLock::Id:
+        emberAfDoorLockClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::ElectricalMeasurement::Id:
+        emberAfElectricalMeasurementClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::EthernetNetworkDiagnostics::Id:
+        emberAfEthernetNetworkDiagnosticsClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::FanControl::Id:
+        emberAfFanControlClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::FaultInjection::Id:
+        emberAfFaultInjectionClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::FixedLabel::Id:
+        emberAfFixedLabelClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::FlowMeasurement::Id:
+        emberAfFlowMeasurementClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::GeneralCommissioning::Id:
+        emberAfGeneralCommissioningClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::GeneralDiagnostics::Id:
+        emberAfGeneralDiagnosticsClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::GroupKeyManagement::Id:
+        emberAfGroupKeyManagementClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::Groups::Id:
+        emberAfGroupsClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::Identify::Id:
+        emberAfIdentifyClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::IlluminanceMeasurement::Id:
+        emberAfIlluminanceMeasurementClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::KeypadInput::Id:
+        emberAfKeypadInputClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::LevelControl::Id:
+        emberAfLevelControlClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::LocalizationConfiguration::Id:
+        emberAfLocalizationConfigurationClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::LowPower::Id:
+        emberAfLowPowerClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::MatterScenes::Id:
+        emberAfMatterScenesClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::MediaInput::Id:
+        emberAfMediaInputClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::MediaPlayback::Id:
+        emberAfMediaPlaybackClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::ModeSelect::Id:
+        emberAfModeSelectClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::NetworkCommissioning::Id:
+        emberAfNetworkCommissioningClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::OccupancySensing::Id:
+        emberAfOccupancySensingClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::OnOff::Id:
+        emberAfOnOffClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::OnOffSwitchConfiguration::Id:
+        emberAfOnOffSwitchConfigurationClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::OperationalCredentials::Id:
+        emberAfOperationalCredentialsClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::OtaSoftwareUpdateRequestor::Id:
+        emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::PowerSource::Id:
+        emberAfPowerSourceClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::PowerSourceConfiguration::Id:
+        emberAfPowerSourceConfigurationClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::PressureMeasurement::Id:
+        emberAfPressureMeasurementClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::PumpConfigurationAndControl::Id:
+        emberAfPumpConfigurationAndControlClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::RelativeHumidityMeasurement::Id:
+        emberAfRelativeHumidityMeasurementClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::SoftwareDiagnostics::Id:
+        emberAfSoftwareDiagnosticsClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::Switch::Id:
+        emberAfSwitchClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::TargetNavigator::Id:
+        emberAfTargetNavigatorClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::TemperatureMeasurement::Id:
+        emberAfTemperatureMeasurementClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::Thermostat::Id:
+        emberAfThermostatClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::ThermostatUserInterfaceConfiguration::Id:
+        emberAfThermostatUserInterfaceConfigurationClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::ThreadNetworkDiagnostics::Id:
+        emberAfThreadNetworkDiagnosticsClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::TimeFormatLocalization::Id:
+        emberAfTimeFormatLocalizationClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::UnitLocalization::Id:
+        emberAfUnitLocalizationClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::UnitTesting::Id:
+        emberAfUnitTestingClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::UserLabel::Id:
+        emberAfUserLabelClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::WakeOnLan::Id:
+        emberAfWakeOnLanClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::WiFiNetworkDiagnostics::Id:
+        emberAfWiFiNetworkDiagnosticsClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::WindowCovering::Id:
+        emberAfWindowCoveringClusterInitCallback(endpoint);
+        break;
+    default:
+        // Unrecognized cluster ID
+        break;
+    }
+}
diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/large_lighting_app/cpp-app/callback-stub.cpp b/scripts/py_matter_idl/matter_idl/tests/outputs/large_lighting_app/cpp-app/callback-stub.cpp
index e499c4521f7a7d..7de5c1a519e855 100644
--- a/scripts/py_matter_idl/matter_idl/tests/outputs/large_lighting_app/cpp-app/callback-stub.cpp
+++ b/scripts/py_matter_idl/matter_idl/tests/outputs/large_lighting_app/cpp-app/callback-stub.cpp
@@ -1,98 +1,6 @@
 #include <app-common/zap-generated/callback.h>
-#include <app-common/zap-generated/ids/Clusters.h>
-#include <lib/support/Span.h>
-#include <protocols/interaction_model/Constants.h>
 
 using namespace chip;
-
-// Cluster Init Functions
-void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
-{
-    switch (clusterId)
-    {
-    case app::Clusters::AccessControl::Id:
-        emberAfAccessControlClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::AdministratorCommissioning::Id:
-        emberAfAdministratorCommissioningClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::BasicInformation::Id:
-        emberAfBasicInformationClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::ColorControl::Id:
-        emberAfColorControlClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::Descriptor::Id:
-        emberAfDescriptorClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::DiagnosticLogs::Id:
-        emberAfDiagnosticLogsClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::EthernetNetworkDiagnostics::Id:
-        emberAfEthernetNetworkDiagnosticsClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::FixedLabel::Id:
-        emberAfFixedLabelClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::GeneralCommissioning::Id:
-        emberAfGeneralCommissioningClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::GeneralDiagnostics::Id:
-        emberAfGeneralDiagnosticsClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::GroupKeyManagement::Id:
-        emberAfGroupKeyManagementClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::Groups::Id:
-        emberAfGroupsClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::Identify::Id:
-        emberAfIdentifyClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::LevelControl::Id:
-        emberAfLevelControlClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::LocalizationConfiguration::Id:
-        emberAfLocalizationConfigurationClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::NetworkCommissioning::Id:
-        emberAfNetworkCommissioningClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::OccupancySensing::Id:
-        emberAfOccupancySensingClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::OnOff::Id:
-        emberAfOnOffClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::OperationalCredentials::Id:
-        emberAfOperationalCredentialsClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::OtaSoftwareUpdateRequestor::Id:
-        emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::SoftwareDiagnostics::Id:
-        emberAfSoftwareDiagnosticsClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::Switch::Id:
-        emberAfSwitchClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::ThreadNetworkDiagnostics::Id:
-        emberAfThreadNetworkDiagnosticsClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::TimeFormatLocalization::Id:
-        emberAfTimeFormatLocalizationClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::UserLabel::Id:
-        emberAfUserLabelClusterInitCallback(endpoint);
-        break;
-    case app::Clusters::WiFiNetworkDiagnostics::Id:
-        emberAfWiFiNetworkDiagnosticsClusterInitCallback(endpoint);
-        break;
-    default:
-        // Unrecognized cluster ID
-        break;
-    }
-}
 void __attribute__((weak)) emberAfAccessControlClusterInitCallback(EndpointId endpoint)
 {
     // To prevent warning
diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/large_lighting_app/cpp-app/cluster-init-callback.cpp b/scripts/py_matter_idl/matter_idl/tests/outputs/large_lighting_app/cpp-app/cluster-init-callback.cpp
new file mode 100644
index 00000000000000..92f13dd159d9b2
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/tests/outputs/large_lighting_app/cpp-app/cluster-init-callback.cpp
@@ -0,0 +1,95 @@
+#include <app-common/zap-generated/callback.h>
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <lib/support/Span.h>
+#include <protocols/interaction_model/Constants.h>
+
+using namespace chip;
+
+// Cluster Init Functions
+void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
+{
+    switch (clusterId)
+    {
+    case app::Clusters::AccessControl::Id:
+        emberAfAccessControlClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::AdministratorCommissioning::Id:
+        emberAfAdministratorCommissioningClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::BasicInformation::Id:
+        emberAfBasicInformationClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::ColorControl::Id:
+        emberAfColorControlClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::Descriptor::Id:
+        emberAfDescriptorClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::DiagnosticLogs::Id:
+        emberAfDiagnosticLogsClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::EthernetNetworkDiagnostics::Id:
+        emberAfEthernetNetworkDiagnosticsClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::FixedLabel::Id:
+        emberAfFixedLabelClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::GeneralCommissioning::Id:
+        emberAfGeneralCommissioningClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::GeneralDiagnostics::Id:
+        emberAfGeneralDiagnosticsClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::GroupKeyManagement::Id:
+        emberAfGroupKeyManagementClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::Groups::Id:
+        emberAfGroupsClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::Identify::Id:
+        emberAfIdentifyClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::LevelControl::Id:
+        emberAfLevelControlClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::LocalizationConfiguration::Id:
+        emberAfLocalizationConfigurationClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::NetworkCommissioning::Id:
+        emberAfNetworkCommissioningClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::OccupancySensing::Id:
+        emberAfOccupancySensingClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::OnOff::Id:
+        emberAfOnOffClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::OperationalCredentials::Id:
+        emberAfOperationalCredentialsClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::OtaSoftwareUpdateRequestor::Id:
+        emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::SoftwareDiagnostics::Id:
+        emberAfSoftwareDiagnosticsClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::Switch::Id:
+        emberAfSwitchClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::ThreadNetworkDiagnostics::Id:
+        emberAfThreadNetworkDiagnosticsClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::TimeFormatLocalization::Id:
+        emberAfTimeFormatLocalizationClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::UserLabel::Id:
+        emberAfUserLabelClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::WiFiNetworkDiagnostics::Id:
+        emberAfWiFiNetworkDiagnosticsClusterInitCallback(endpoint);
+        break;
+    default:
+        // Unrecognized cluster ID
+        break;
+    }
+}
diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/cpp-app/callback-stub.cpp b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/cpp-app/callback-stub.cpp
index 5cab502755042d..251c8ef90edcab 100644
--- a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/cpp-app/callback-stub.cpp
+++ b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/cpp-app/callback-stub.cpp
@@ -1,23 +1,6 @@
 #include <app-common/zap-generated/callback.h>
-#include <app-common/zap-generated/ids/Clusters.h>
-#include <lib/support/Span.h>
-#include <protocols/interaction_model/Constants.h>
 
 using namespace chip;
-
-// Cluster Init Functions
-void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
-{
-    switch (clusterId)
-    {
-    case app::Clusters::Third::Id:
-        emberAfThirdClusterInitCallback(endpoint);
-        break;
-    default:
-        // Unrecognized cluster ID
-        break;
-    }
-}
 void __attribute__((weak)) emberAfThirdClusterInitCallback(EndpointId endpoint)
 {
     // To prevent warning
diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/cpp-app/cluster-init-callback.cpp b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/cpp-app/cluster-init-callback.cpp
new file mode 100644
index 00000000000000..98d3f81fcab067
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/cpp-app/cluster-init-callback.cpp
@@ -0,0 +1,20 @@
+#include <app-common/zap-generated/callback.h>
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <lib/support/Span.h>
+#include <protocols/interaction_model/Constants.h>
+
+using namespace chip;
+
+// Cluster Init Functions
+void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
+{
+    switch (clusterId)
+    {
+    case app::Clusters::Third::Id:
+        emberAfThirdClusterInitCallback(endpoint);
+        break;
+    default:
+        // Unrecognized cluster ID
+        break;
+    }
+}