From d78d7420aa67bde9367ddf6bc5669749a7e1dc99 Mon Sep 17 00:00:00 2001
From: Erika Gressi <erikag@microsoft.com>
Date: Sat, 4 Nov 2023 14:17:33 +0100
Subject: [PATCH 1/3] defaults

---
 .../server/tests/e2e/{min => defaults}/main.test.bicep            | 0
 .../service/tests/e2e/{min => defaults}/main.test.bicep           | 0
 .../tests/e2e/{min => defaults}/main.test.bicep                   | 0
 .../container-app/tests/e2e/{min => defaults}/dependencies.bicep  | 0
 .../app/container-app/tests/e2e/{min => defaults}/main.test.bicep | 0
 modules/app/job/tests/e2e/{min => defaults}/dependencies.bicep    | 0
 modules/app/job/tests/e2e/{min => defaults}/main.test.bicep       | 0
 .../tests/e2e/{min => defaults}/dependencies.bicep                | 0
 .../tests/e2e/{min => defaults}/main.test.bicep                   | 0
 .../tests/e2e/{min => defaults}/main.test.bicep                   | 0
 .../batch-account/tests/e2e/{min => defaults}/dependencies.bicep  | 0
 .../batch-account/tests/e2e/{min => defaults}/main.test.bicep     | 0
 .../redis-enterprise/tests/e2e/{min => defaults}/main.test.bicep  | 0
 modules/cache/redis/tests/e2e/{min => defaults}/main.test.bicep   | 0
 .../account/tests/e2e/{min => defaults}/main.test.bicep           | 0
 .../availability-set/tests/e2e/{min => defaults}/main.test.bicep  | 0
 modules/compute/disk/tests/e2e/{min => defaults}/main.test.bicep  | 0
 .../compute/gallery/tests/e2e/{min => defaults}/main.test.bicep   | 0
 .../tests/e2e/{min => defaults}/main.test.bicep                   | 0
 .../ssh-public-key/tests/e2e/{min => defaults}/main.test.bicep    | 0
 .../budget/tests/e2e/{min => defaults}/main.test.bicep            | 0
 .../container-group/tests/e2e/{min => defaults}/main.test.bicep   | 0
 .../registry/tests/e2e/{min => defaults}/main.test.bicep          | 0
 .../managed-cluster/tests/e2e/{min => defaults}/main.test.bicep   | 0
 .../factory/tests/e2e/{min => defaults}/main.test.bicep           | 0
 .../backup-vault/tests/e2e/{min => defaults}/main.test.bicep      | 0
 .../access-connector/tests/e2e/{min => defaults}/main.test.bicep  | 0
 .../workspace/tests/e2e/{min => defaults}/main.test.bicep         | 0
 .../flexible-server/tests/e2e/{min => defaults}/main.test.bicep   | 0
 .../flexible-server/tests/e2e/{min => defaults}/main.test.bicep   | 0
 .../tests/e2e/{min => defaults}/dependencies.bicep                | 0
 .../application-group/tests/e2e/{min => defaults}/main.test.bicep | 0
 .../host-pool/tests/e2e/{min => defaults}/main.test.bicep         | 0
 .../scaling-plan/tests/e2e/{min => defaults}/main.test.bicep      | 0
 .../workspace/tests/e2e/{min => defaults}/main.test.bicep         | 0
 .../dev-test-lab/lab/tests/e2e/{min => defaults}/main.test.bicep  | 0
 .../tests/e2e/{min => defaults}/main.test.bicep                   | 0
 .../event-grid/domain/tests/e2e/{min => defaults}/main.test.bicep | 0
 .../system-topic/tests/e2e/{min => defaults}/dependencies.bicep   | 0
 .../system-topic/tests/e2e/{min => defaults}/main.test.bicep      | 0
 .../event-grid/topic/tests/e2e/{min => defaults}/main.test.bicep  | 0
 .../namespace/tests/e2e/{min => defaults}/main.test.bicep         | 0
 .../health-bot/tests/e2e/{min => defaults}/main.test.bicep        | 0
 .../workspace/tests/e2e/{min => defaults}/main.test.bicep         | 0
 .../action-group/tests/e2e/{min => defaults}/main.test.bicep      | 0
 .../component/tests/e2e/{min => defaults}/dependencies.bicep      | 0
 .../component/tests/e2e/{min => defaults}/main.test.bicep         | 0
 .../tests/e2e/{min => defaults}/main.test.bicep                   | 0
 .../tests/e2e/{min => defaults}/main.test.bicep                   | 0
 .../tests/e2e/{min => defaults}/main.test.bicep                   | 0
 .../webtest/tests/e2e/{min => defaults}/dependencies.bicep        | 0
 .../insights/webtest/tests/e2e/{min => defaults}/main.test.bicep  | 0
 .../key-vault/vault/tests/e2e/{min => defaults}/main.test.bicep   | 0
 .../extension/tests/e2e/{min => defaults}/dependencies.bicep      | 0
 .../extension/tests/e2e/{min => defaults}/main.test.bicep         | 0
 .../tests/e2e/{min => defaults}/dependencies.bicep                | 0
 .../tests/e2e/{min => defaults}/main.test.bicep                   | 0
 .../workspace/tests/e2e/{min => defaults}/dependencies.bicep      | 0
 .../workspace/tests/e2e/{min => defaults}/main.test.bicep         | 0
 .../tests/e2e/{min => defaults}/main.test.bicep                   | 0
 .../tests/e2e/{min => defaults}/main.test.bicep                   | 0
 .../management-group/tests/e2e/{min => defaults}/main.test.bicep  | 0
 .../net-app-account/tests/e2e/{min => defaults}/main.test.bicep   | 0
 .../azure-firewall/tests/e2e/{min => defaults}/dependencies.bicep | 0
 .../azure-firewall/tests/e2e/{min => defaults}/main.test.bicep    | 0
 .../bastion-host/tests/e2e/{min => defaults}/dependencies.bicep   | 0
 .../bastion-host/tests/e2e/{min => defaults}/main.test.bicep      | 0
 .../tests/e2e/{min => defaults}/main.test.bicep                   | 0
 .../tests/e2e/{min => defaults}/dependencies.bicep                | 0
 .../tests/e2e/{min => defaults}/main.test.bicep                   | 0
 .../network/dns-zone/tests/e2e/{min => defaults}/main.test.bicep  | 0
 .../tests/e2e/{min => defaults}/main.test.bicep                   | 0
 .../tests/e2e/{min => defaults}/dependencies.bicep                | 0
 .../tests/e2e/{min => defaults}/main.test.bicep                   | 0
 .../firewall-policy/tests/e2e/{min => defaults}/main.test.bicep   | 0
 .../tests/e2e/{min => defaults}/main.test.bicep                   | 0
 .../front-door/tests/e2e/{min => defaults}/main.test.bicep        | 0
 .../network/ip-group/tests/e2e/{min => defaults}/main.test.bicep  | 0
 .../load-balancer/tests/e2e/{min => defaults}/dependencies.bicep  | 0
 .../load-balancer/tests/e2e/{min => defaults}/main.test.bicep     | 0
 .../tests/e2e/{min => defaults}/main.test.bicep                   | 0
 .../tests/e2e/{min => defaults}/dependencies.bicep                | 0
 .../network-interface/tests/e2e/{min => defaults}/main.test.bicep | 0
 .../tests/e2e/{min => defaults}/main.test.bicep                   | 0
 .../network-watcher/tests/e2e/{min => defaults}/main.test.bicep   | 0
 .../private-dns-zone/tests/e2e/{min => defaults}/main.test.bicep  | 0
 .../tests/e2e/{min => defaults}/dependencies.bicep                | 0
 .../private-endpoint/tests/e2e/{min => defaults}/main.test.bicep  | 0
 .../tests/e2e/{min => defaults}/dependencies.bicep                | 0
 .../tests/e2e/{min => defaults}/main.test.bicep                   | 0
 .../public-ip-address/tests/e2e/{min => defaults}/main.test.bicep | 0
 .../public-ip-prefix/tests/e2e/{min => defaults}/main.test.bicep  | 0
 .../route-table/tests/e2e/{min => defaults}/main.test.bicep       | 0
 .../tests/e2e/{min => defaults}/main.test.bicep                   | 0
 .../tests/e2e/{min => defaults}/main.test.bicep                   | 0
 .../virtual-hub/tests/e2e/{min => defaults}/dependencies.bicep    | 0
 .../virtual-hub/tests/e2e/{min => defaults}/main.test.bicep       | 0
 .../virtual-network/tests/e2e/{min => defaults}/main.test.bicep   | 0
 .../virtual-wan/tests/e2e/{min => defaults}/main.test.bicep       | 0
 .../vpn-gateway/tests/e2e/{min => defaults}/dependencies.bicep    | 0
 .../vpn-gateway/tests/e2e/{min => defaults}/main.test.bicep       | 0
 .../vpn-site/tests/e2e/{min => defaults}/dependencies.bicep       | 0
 .../network/vpn-site/tests/e2e/{min => defaults}/main.test.bicep  | 0
 .../workspace/tests/e2e/{min => defaults}/main.test.bicep         | 0
 .../solution/tests/e2e/{min => defaults}/dependencies.bicep       | 0
 .../solution/tests/e2e/{min => defaults}/main.test.bicep          | 0
 .../capacity/tests/e2e/{min => defaults}/dependencies.bicep       | 0
 .../capacity/tests/e2e/{min => defaults}/main.test.bicep          | 0
 .../purview/account/tests/e2e/{min => defaults}/main.test.bicep   | 0
 .../vault/tests/e2e/{min => defaults}/main.test.bicep             | 0
 .../relay/namespace/tests/e2e/{min => defaults}/main.test.bicep   | 0
 .../query/tests/e2e/{min => defaults}/main.test.bicep             | 0
 .../resource-group/tests/e2e/{min => defaults}/main.test.bicep    | 0
 .../resources/tags/tests/e2e/{min => defaults}/main.test.bicep    | 0
 .../search-service/tests/e2e/{min => defaults}/main.test.bicep    | 0
 .../namespace/tests/e2e/{min => defaults}/main.test.bicep         | 0
 .../cluster/tests/e2e/{min => defaults}/main.test.bicep           | 0
 .../signal-r/tests/e2e/{min => defaults}/main.test.bicep          | 0
 .../web-pub-sub/tests/e2e/{min => defaults}/main.test.bicep       | 0
 .../tests/e2e/{min => defaults}/dependencies.bicep                | 0
 .../managed-instance/tests/e2e/{min => defaults}/main.test.bicep  | 0
 .../storage-account/tests/e2e/{min => defaults}/main.test.bicep   | 0
 .../private-link-hub/tests/e2e/{min => defaults}/main.test.bicep  | 0
 .../workspace/tests/e2e/{min => defaults}/dependencies.bicep      | 0
 .../synapse/workspace/tests/e2e/{min => defaults}/main.test.bicep | 0
 .../image-template/tests/e2e/{min => defaults}/dependencies.bicep | 0
 .../image-template/tests/e2e/{min => defaults}/main.test.bicep    | 0
 .../web/static-site/tests/e2e/{min => defaults}/main.test.bicep   | 0
 128 files changed, 0 insertions(+), 0 deletions(-)
 rename modules/analysis-services/server/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/api-management/service/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/app-configuration/configuration-store/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/app/container-app/tests/e2e/{min => defaults}/dependencies.bicep (100%)
 rename modules/app/container-app/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/app/job/tests/e2e/{min => defaults}/dependencies.bicep (100%)
 rename modules/app/job/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/app/managed-environment/tests/e2e/{min => defaults}/dependencies.bicep (100%)
 rename modules/app/managed-environment/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/automation/automation-account/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/batch/batch-account/tests/e2e/{min => defaults}/dependencies.bicep (100%)
 rename modules/batch/batch-account/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/cache/redis-enterprise/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/cache/redis/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/cognitive-services/account/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/compute/availability-set/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/compute/disk/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/compute/gallery/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/compute/proximity-placement-group/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/compute/ssh-public-key/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/consumption/budget/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/container-instance/container-group/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/container-registry/registry/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/container-service/managed-cluster/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/data-factory/factory/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/data-protection/backup-vault/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/databricks/access-connector/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/databricks/workspace/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/db-for-my-sql/flexible-server/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/db-for-postgre-sql/flexible-server/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/desktop-virtualization/application-group/tests/e2e/{min => defaults}/dependencies.bicep (100%)
 rename modules/desktop-virtualization/application-group/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/desktop-virtualization/host-pool/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/desktop-virtualization/scaling-plan/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/desktop-virtualization/workspace/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/dev-test-lab/lab/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/digital-twins/digital-twins-instance/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/event-grid/domain/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/event-grid/system-topic/tests/e2e/{min => defaults}/dependencies.bicep (100%)
 rename modules/event-grid/system-topic/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/event-grid/topic/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/event-hub/namespace/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/health-bot/health-bot/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/healthcare-apis/workspace/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/insights/action-group/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/insights/component/tests/e2e/{min => defaults}/dependencies.bicep (100%)
 rename modules/insights/component/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/insights/data-collection-endpoint/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/insights/data-collection-rule/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/insights/private-link-scope/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/insights/webtest/tests/e2e/{min => defaults}/dependencies.bicep (100%)
 rename modules/insights/webtest/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/key-vault/vault/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/kubernetes-configuration/extension/tests/e2e/{min => defaults}/dependencies.bicep (100%)
 rename modules/kubernetes-configuration/extension/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/kubernetes-configuration/flux-configuration/tests/e2e/{min => defaults}/dependencies.bicep (100%)
 rename modules/kubernetes-configuration/flux-configuration/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/machine-learning-services/workspace/tests/e2e/{min => defaults}/dependencies.bicep (100%)
 rename modules/machine-learning-services/workspace/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/maintenance/maintenance-configuration/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/managed-identity/user-assigned-identity/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/management/management-group/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/net-app/net-app-account/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/network/azure-firewall/tests/e2e/{min => defaults}/dependencies.bicep (100%)
 rename modules/network/azure-firewall/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/network/bastion-host/tests/e2e/{min => defaults}/dependencies.bicep (100%)
 rename modules/network/bastion-host/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/network/ddos-protection-plan/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/network/dns-forwarding-ruleset/tests/e2e/{min => defaults}/dependencies.bicep (100%)
 rename modules/network/dns-forwarding-ruleset/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/network/dns-zone/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/network/express-route-circuit/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/network/express-route-gateway/tests/e2e/{min => defaults}/dependencies.bicep (100%)
 rename modules/network/express-route-gateway/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/network/firewall-policy/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/network/front-door-web-application-firewall-policy/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/network/front-door/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/network/ip-group/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/network/load-balancer/tests/e2e/{min => defaults}/dependencies.bicep (100%)
 rename modules/network/load-balancer/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/network/local-network-gateway/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/network/network-interface/tests/e2e/{min => defaults}/dependencies.bicep (100%)
 rename modules/network/network-interface/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/network/network-security-group/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/network/network-watcher/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/network/private-dns-zone/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/network/private-endpoint/tests/e2e/{min => defaults}/dependencies.bicep (100%)
 rename modules/network/private-endpoint/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/network/private-link-service/tests/e2e/{min => defaults}/dependencies.bicep (100%)
 rename modules/network/private-link-service/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/network/public-ip-address/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/network/public-ip-prefix/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/network/route-table/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/network/service-endpoint-policy/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/network/trafficmanagerprofile/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/network/virtual-hub/tests/e2e/{min => defaults}/dependencies.bicep (100%)
 rename modules/network/virtual-hub/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/network/virtual-network/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/network/virtual-wan/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/network/vpn-gateway/tests/e2e/{min => defaults}/dependencies.bicep (100%)
 rename modules/network/vpn-gateway/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/network/vpn-site/tests/e2e/{min => defaults}/dependencies.bicep (100%)
 rename modules/network/vpn-site/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/operational-insights/workspace/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/operations-management/solution/tests/e2e/{min => defaults}/dependencies.bicep (100%)
 rename modules/operations-management/solution/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/power-bi-dedicated/capacity/tests/e2e/{min => defaults}/dependencies.bicep (100%)
 rename modules/power-bi-dedicated/capacity/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/purview/account/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/recovery-services/vault/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/relay/namespace/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/resource-graph/query/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/resources/resource-group/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/resources/tags/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/search/search-service/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/service-bus/namespace/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/service-fabric/cluster/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/signal-r-service/signal-r/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/signal-r-service/web-pub-sub/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/sql/managed-instance/tests/e2e/{min => defaults}/dependencies.bicep (100%)
 rename modules/sql/managed-instance/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/storage/storage-account/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/synapse/private-link-hub/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/synapse/workspace/tests/e2e/{min => defaults}/dependencies.bicep (100%)
 rename modules/synapse/workspace/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/virtual-machine-images/image-template/tests/e2e/{min => defaults}/dependencies.bicep (100%)
 rename modules/virtual-machine-images/image-template/tests/e2e/{min => defaults}/main.test.bicep (100%)
 rename modules/web/static-site/tests/e2e/{min => defaults}/main.test.bicep (100%)

diff --git a/modules/analysis-services/server/tests/e2e/min/main.test.bicep b/modules/analysis-services/server/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/analysis-services/server/tests/e2e/min/main.test.bicep
rename to modules/analysis-services/server/tests/e2e/defaults/main.test.bicep
diff --git a/modules/api-management/service/tests/e2e/min/main.test.bicep b/modules/api-management/service/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/api-management/service/tests/e2e/min/main.test.bicep
rename to modules/api-management/service/tests/e2e/defaults/main.test.bicep
diff --git a/modules/app-configuration/configuration-store/tests/e2e/min/main.test.bicep b/modules/app-configuration/configuration-store/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/app-configuration/configuration-store/tests/e2e/min/main.test.bicep
rename to modules/app-configuration/configuration-store/tests/e2e/defaults/main.test.bicep
diff --git a/modules/app/container-app/tests/e2e/min/dependencies.bicep b/modules/app/container-app/tests/e2e/defaults/dependencies.bicep
similarity index 100%
rename from modules/app/container-app/tests/e2e/min/dependencies.bicep
rename to modules/app/container-app/tests/e2e/defaults/dependencies.bicep
diff --git a/modules/app/container-app/tests/e2e/min/main.test.bicep b/modules/app/container-app/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/app/container-app/tests/e2e/min/main.test.bicep
rename to modules/app/container-app/tests/e2e/defaults/main.test.bicep
diff --git a/modules/app/job/tests/e2e/min/dependencies.bicep b/modules/app/job/tests/e2e/defaults/dependencies.bicep
similarity index 100%
rename from modules/app/job/tests/e2e/min/dependencies.bicep
rename to modules/app/job/tests/e2e/defaults/dependencies.bicep
diff --git a/modules/app/job/tests/e2e/min/main.test.bicep b/modules/app/job/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/app/job/tests/e2e/min/main.test.bicep
rename to modules/app/job/tests/e2e/defaults/main.test.bicep
diff --git a/modules/app/managed-environment/tests/e2e/min/dependencies.bicep b/modules/app/managed-environment/tests/e2e/defaults/dependencies.bicep
similarity index 100%
rename from modules/app/managed-environment/tests/e2e/min/dependencies.bicep
rename to modules/app/managed-environment/tests/e2e/defaults/dependencies.bicep
diff --git a/modules/app/managed-environment/tests/e2e/min/main.test.bicep b/modules/app/managed-environment/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/app/managed-environment/tests/e2e/min/main.test.bicep
rename to modules/app/managed-environment/tests/e2e/defaults/main.test.bicep
diff --git a/modules/automation/automation-account/tests/e2e/min/main.test.bicep b/modules/automation/automation-account/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/automation/automation-account/tests/e2e/min/main.test.bicep
rename to modules/automation/automation-account/tests/e2e/defaults/main.test.bicep
diff --git a/modules/batch/batch-account/tests/e2e/min/dependencies.bicep b/modules/batch/batch-account/tests/e2e/defaults/dependencies.bicep
similarity index 100%
rename from modules/batch/batch-account/tests/e2e/min/dependencies.bicep
rename to modules/batch/batch-account/tests/e2e/defaults/dependencies.bicep
diff --git a/modules/batch/batch-account/tests/e2e/min/main.test.bicep b/modules/batch/batch-account/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/batch/batch-account/tests/e2e/min/main.test.bicep
rename to modules/batch/batch-account/tests/e2e/defaults/main.test.bicep
diff --git a/modules/cache/redis-enterprise/tests/e2e/min/main.test.bicep b/modules/cache/redis-enterprise/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/cache/redis-enterprise/tests/e2e/min/main.test.bicep
rename to modules/cache/redis-enterprise/tests/e2e/defaults/main.test.bicep
diff --git a/modules/cache/redis/tests/e2e/min/main.test.bicep b/modules/cache/redis/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/cache/redis/tests/e2e/min/main.test.bicep
rename to modules/cache/redis/tests/e2e/defaults/main.test.bicep
diff --git a/modules/cognitive-services/account/tests/e2e/min/main.test.bicep b/modules/cognitive-services/account/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/cognitive-services/account/tests/e2e/min/main.test.bicep
rename to modules/cognitive-services/account/tests/e2e/defaults/main.test.bicep
diff --git a/modules/compute/availability-set/tests/e2e/min/main.test.bicep b/modules/compute/availability-set/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/compute/availability-set/tests/e2e/min/main.test.bicep
rename to modules/compute/availability-set/tests/e2e/defaults/main.test.bicep
diff --git a/modules/compute/disk/tests/e2e/min/main.test.bicep b/modules/compute/disk/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/compute/disk/tests/e2e/min/main.test.bicep
rename to modules/compute/disk/tests/e2e/defaults/main.test.bicep
diff --git a/modules/compute/gallery/tests/e2e/min/main.test.bicep b/modules/compute/gallery/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/compute/gallery/tests/e2e/min/main.test.bicep
rename to modules/compute/gallery/tests/e2e/defaults/main.test.bicep
diff --git a/modules/compute/proximity-placement-group/tests/e2e/min/main.test.bicep b/modules/compute/proximity-placement-group/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/compute/proximity-placement-group/tests/e2e/min/main.test.bicep
rename to modules/compute/proximity-placement-group/tests/e2e/defaults/main.test.bicep
diff --git a/modules/compute/ssh-public-key/tests/e2e/min/main.test.bicep b/modules/compute/ssh-public-key/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/compute/ssh-public-key/tests/e2e/min/main.test.bicep
rename to modules/compute/ssh-public-key/tests/e2e/defaults/main.test.bicep
diff --git a/modules/consumption/budget/tests/e2e/min/main.test.bicep b/modules/consumption/budget/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/consumption/budget/tests/e2e/min/main.test.bicep
rename to modules/consumption/budget/tests/e2e/defaults/main.test.bicep
diff --git a/modules/container-instance/container-group/tests/e2e/min/main.test.bicep b/modules/container-instance/container-group/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/container-instance/container-group/tests/e2e/min/main.test.bicep
rename to modules/container-instance/container-group/tests/e2e/defaults/main.test.bicep
diff --git a/modules/container-registry/registry/tests/e2e/min/main.test.bicep b/modules/container-registry/registry/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/container-registry/registry/tests/e2e/min/main.test.bicep
rename to modules/container-registry/registry/tests/e2e/defaults/main.test.bicep
diff --git a/modules/container-service/managed-cluster/tests/e2e/min/main.test.bicep b/modules/container-service/managed-cluster/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/container-service/managed-cluster/tests/e2e/min/main.test.bicep
rename to modules/container-service/managed-cluster/tests/e2e/defaults/main.test.bicep
diff --git a/modules/data-factory/factory/tests/e2e/min/main.test.bicep b/modules/data-factory/factory/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/data-factory/factory/tests/e2e/min/main.test.bicep
rename to modules/data-factory/factory/tests/e2e/defaults/main.test.bicep
diff --git a/modules/data-protection/backup-vault/tests/e2e/min/main.test.bicep b/modules/data-protection/backup-vault/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/data-protection/backup-vault/tests/e2e/min/main.test.bicep
rename to modules/data-protection/backup-vault/tests/e2e/defaults/main.test.bicep
diff --git a/modules/databricks/access-connector/tests/e2e/min/main.test.bicep b/modules/databricks/access-connector/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/databricks/access-connector/tests/e2e/min/main.test.bicep
rename to modules/databricks/access-connector/tests/e2e/defaults/main.test.bicep
diff --git a/modules/databricks/workspace/tests/e2e/min/main.test.bicep b/modules/databricks/workspace/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/databricks/workspace/tests/e2e/min/main.test.bicep
rename to modules/databricks/workspace/tests/e2e/defaults/main.test.bicep
diff --git a/modules/db-for-my-sql/flexible-server/tests/e2e/min/main.test.bicep b/modules/db-for-my-sql/flexible-server/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/db-for-my-sql/flexible-server/tests/e2e/min/main.test.bicep
rename to modules/db-for-my-sql/flexible-server/tests/e2e/defaults/main.test.bicep
diff --git a/modules/db-for-postgre-sql/flexible-server/tests/e2e/min/main.test.bicep b/modules/db-for-postgre-sql/flexible-server/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/db-for-postgre-sql/flexible-server/tests/e2e/min/main.test.bicep
rename to modules/db-for-postgre-sql/flexible-server/tests/e2e/defaults/main.test.bicep
diff --git a/modules/desktop-virtualization/application-group/tests/e2e/min/dependencies.bicep b/modules/desktop-virtualization/application-group/tests/e2e/defaults/dependencies.bicep
similarity index 100%
rename from modules/desktop-virtualization/application-group/tests/e2e/min/dependencies.bicep
rename to modules/desktop-virtualization/application-group/tests/e2e/defaults/dependencies.bicep
diff --git a/modules/desktop-virtualization/application-group/tests/e2e/min/main.test.bicep b/modules/desktop-virtualization/application-group/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/desktop-virtualization/application-group/tests/e2e/min/main.test.bicep
rename to modules/desktop-virtualization/application-group/tests/e2e/defaults/main.test.bicep
diff --git a/modules/desktop-virtualization/host-pool/tests/e2e/min/main.test.bicep b/modules/desktop-virtualization/host-pool/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/desktop-virtualization/host-pool/tests/e2e/min/main.test.bicep
rename to modules/desktop-virtualization/host-pool/tests/e2e/defaults/main.test.bicep
diff --git a/modules/desktop-virtualization/scaling-plan/tests/e2e/min/main.test.bicep b/modules/desktop-virtualization/scaling-plan/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/desktop-virtualization/scaling-plan/tests/e2e/min/main.test.bicep
rename to modules/desktop-virtualization/scaling-plan/tests/e2e/defaults/main.test.bicep
diff --git a/modules/desktop-virtualization/workspace/tests/e2e/min/main.test.bicep b/modules/desktop-virtualization/workspace/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/desktop-virtualization/workspace/tests/e2e/min/main.test.bicep
rename to modules/desktop-virtualization/workspace/tests/e2e/defaults/main.test.bicep
diff --git a/modules/dev-test-lab/lab/tests/e2e/min/main.test.bicep b/modules/dev-test-lab/lab/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/dev-test-lab/lab/tests/e2e/min/main.test.bicep
rename to modules/dev-test-lab/lab/tests/e2e/defaults/main.test.bicep
diff --git a/modules/digital-twins/digital-twins-instance/tests/e2e/min/main.test.bicep b/modules/digital-twins/digital-twins-instance/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/digital-twins/digital-twins-instance/tests/e2e/min/main.test.bicep
rename to modules/digital-twins/digital-twins-instance/tests/e2e/defaults/main.test.bicep
diff --git a/modules/event-grid/domain/tests/e2e/min/main.test.bicep b/modules/event-grid/domain/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/event-grid/domain/tests/e2e/min/main.test.bicep
rename to modules/event-grid/domain/tests/e2e/defaults/main.test.bicep
diff --git a/modules/event-grid/system-topic/tests/e2e/min/dependencies.bicep b/modules/event-grid/system-topic/tests/e2e/defaults/dependencies.bicep
similarity index 100%
rename from modules/event-grid/system-topic/tests/e2e/min/dependencies.bicep
rename to modules/event-grid/system-topic/tests/e2e/defaults/dependencies.bicep
diff --git a/modules/event-grid/system-topic/tests/e2e/min/main.test.bicep b/modules/event-grid/system-topic/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/event-grid/system-topic/tests/e2e/min/main.test.bicep
rename to modules/event-grid/system-topic/tests/e2e/defaults/main.test.bicep
diff --git a/modules/event-grid/topic/tests/e2e/min/main.test.bicep b/modules/event-grid/topic/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/event-grid/topic/tests/e2e/min/main.test.bicep
rename to modules/event-grid/topic/tests/e2e/defaults/main.test.bicep
diff --git a/modules/event-hub/namespace/tests/e2e/min/main.test.bicep b/modules/event-hub/namespace/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/event-hub/namespace/tests/e2e/min/main.test.bicep
rename to modules/event-hub/namespace/tests/e2e/defaults/main.test.bicep
diff --git a/modules/health-bot/health-bot/tests/e2e/min/main.test.bicep b/modules/health-bot/health-bot/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/health-bot/health-bot/tests/e2e/min/main.test.bicep
rename to modules/health-bot/health-bot/tests/e2e/defaults/main.test.bicep
diff --git a/modules/healthcare-apis/workspace/tests/e2e/min/main.test.bicep b/modules/healthcare-apis/workspace/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/healthcare-apis/workspace/tests/e2e/min/main.test.bicep
rename to modules/healthcare-apis/workspace/tests/e2e/defaults/main.test.bicep
diff --git a/modules/insights/action-group/tests/e2e/min/main.test.bicep b/modules/insights/action-group/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/insights/action-group/tests/e2e/min/main.test.bicep
rename to modules/insights/action-group/tests/e2e/defaults/main.test.bicep
diff --git a/modules/insights/component/tests/e2e/min/dependencies.bicep b/modules/insights/component/tests/e2e/defaults/dependencies.bicep
similarity index 100%
rename from modules/insights/component/tests/e2e/min/dependencies.bicep
rename to modules/insights/component/tests/e2e/defaults/dependencies.bicep
diff --git a/modules/insights/component/tests/e2e/min/main.test.bicep b/modules/insights/component/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/insights/component/tests/e2e/min/main.test.bicep
rename to modules/insights/component/tests/e2e/defaults/main.test.bicep
diff --git a/modules/insights/data-collection-endpoint/tests/e2e/min/main.test.bicep b/modules/insights/data-collection-endpoint/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/insights/data-collection-endpoint/tests/e2e/min/main.test.bicep
rename to modules/insights/data-collection-endpoint/tests/e2e/defaults/main.test.bicep
diff --git a/modules/insights/data-collection-rule/tests/e2e/min/main.test.bicep b/modules/insights/data-collection-rule/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/insights/data-collection-rule/tests/e2e/min/main.test.bicep
rename to modules/insights/data-collection-rule/tests/e2e/defaults/main.test.bicep
diff --git a/modules/insights/private-link-scope/tests/e2e/min/main.test.bicep b/modules/insights/private-link-scope/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/insights/private-link-scope/tests/e2e/min/main.test.bicep
rename to modules/insights/private-link-scope/tests/e2e/defaults/main.test.bicep
diff --git a/modules/insights/webtest/tests/e2e/min/dependencies.bicep b/modules/insights/webtest/tests/e2e/defaults/dependencies.bicep
similarity index 100%
rename from modules/insights/webtest/tests/e2e/min/dependencies.bicep
rename to modules/insights/webtest/tests/e2e/defaults/dependencies.bicep
diff --git a/modules/insights/webtest/tests/e2e/min/main.test.bicep b/modules/insights/webtest/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/insights/webtest/tests/e2e/min/main.test.bicep
rename to modules/insights/webtest/tests/e2e/defaults/main.test.bicep
diff --git a/modules/key-vault/vault/tests/e2e/min/main.test.bicep b/modules/key-vault/vault/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/key-vault/vault/tests/e2e/min/main.test.bicep
rename to modules/key-vault/vault/tests/e2e/defaults/main.test.bicep
diff --git a/modules/kubernetes-configuration/extension/tests/e2e/min/dependencies.bicep b/modules/kubernetes-configuration/extension/tests/e2e/defaults/dependencies.bicep
similarity index 100%
rename from modules/kubernetes-configuration/extension/tests/e2e/min/dependencies.bicep
rename to modules/kubernetes-configuration/extension/tests/e2e/defaults/dependencies.bicep
diff --git a/modules/kubernetes-configuration/extension/tests/e2e/min/main.test.bicep b/modules/kubernetes-configuration/extension/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/kubernetes-configuration/extension/tests/e2e/min/main.test.bicep
rename to modules/kubernetes-configuration/extension/tests/e2e/defaults/main.test.bicep
diff --git a/modules/kubernetes-configuration/flux-configuration/tests/e2e/min/dependencies.bicep b/modules/kubernetes-configuration/flux-configuration/tests/e2e/defaults/dependencies.bicep
similarity index 100%
rename from modules/kubernetes-configuration/flux-configuration/tests/e2e/min/dependencies.bicep
rename to modules/kubernetes-configuration/flux-configuration/tests/e2e/defaults/dependencies.bicep
diff --git a/modules/kubernetes-configuration/flux-configuration/tests/e2e/min/main.test.bicep b/modules/kubernetes-configuration/flux-configuration/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/kubernetes-configuration/flux-configuration/tests/e2e/min/main.test.bicep
rename to modules/kubernetes-configuration/flux-configuration/tests/e2e/defaults/main.test.bicep
diff --git a/modules/machine-learning-services/workspace/tests/e2e/min/dependencies.bicep b/modules/machine-learning-services/workspace/tests/e2e/defaults/dependencies.bicep
similarity index 100%
rename from modules/machine-learning-services/workspace/tests/e2e/min/dependencies.bicep
rename to modules/machine-learning-services/workspace/tests/e2e/defaults/dependencies.bicep
diff --git a/modules/machine-learning-services/workspace/tests/e2e/min/main.test.bicep b/modules/machine-learning-services/workspace/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/machine-learning-services/workspace/tests/e2e/min/main.test.bicep
rename to modules/machine-learning-services/workspace/tests/e2e/defaults/main.test.bicep
diff --git a/modules/maintenance/maintenance-configuration/tests/e2e/min/main.test.bicep b/modules/maintenance/maintenance-configuration/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/maintenance/maintenance-configuration/tests/e2e/min/main.test.bicep
rename to modules/maintenance/maintenance-configuration/tests/e2e/defaults/main.test.bicep
diff --git a/modules/managed-identity/user-assigned-identity/tests/e2e/min/main.test.bicep b/modules/managed-identity/user-assigned-identity/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/managed-identity/user-assigned-identity/tests/e2e/min/main.test.bicep
rename to modules/managed-identity/user-assigned-identity/tests/e2e/defaults/main.test.bicep
diff --git a/modules/management/management-group/tests/e2e/min/main.test.bicep b/modules/management/management-group/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/management/management-group/tests/e2e/min/main.test.bicep
rename to modules/management/management-group/tests/e2e/defaults/main.test.bicep
diff --git a/modules/net-app/net-app-account/tests/e2e/min/main.test.bicep b/modules/net-app/net-app-account/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/net-app/net-app-account/tests/e2e/min/main.test.bicep
rename to modules/net-app/net-app-account/tests/e2e/defaults/main.test.bicep
diff --git a/modules/network/azure-firewall/tests/e2e/min/dependencies.bicep b/modules/network/azure-firewall/tests/e2e/defaults/dependencies.bicep
similarity index 100%
rename from modules/network/azure-firewall/tests/e2e/min/dependencies.bicep
rename to modules/network/azure-firewall/tests/e2e/defaults/dependencies.bicep
diff --git a/modules/network/azure-firewall/tests/e2e/min/main.test.bicep b/modules/network/azure-firewall/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/network/azure-firewall/tests/e2e/min/main.test.bicep
rename to modules/network/azure-firewall/tests/e2e/defaults/main.test.bicep
diff --git a/modules/network/bastion-host/tests/e2e/min/dependencies.bicep b/modules/network/bastion-host/tests/e2e/defaults/dependencies.bicep
similarity index 100%
rename from modules/network/bastion-host/tests/e2e/min/dependencies.bicep
rename to modules/network/bastion-host/tests/e2e/defaults/dependencies.bicep
diff --git a/modules/network/bastion-host/tests/e2e/min/main.test.bicep b/modules/network/bastion-host/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/network/bastion-host/tests/e2e/min/main.test.bicep
rename to modules/network/bastion-host/tests/e2e/defaults/main.test.bicep
diff --git a/modules/network/ddos-protection-plan/tests/e2e/min/main.test.bicep b/modules/network/ddos-protection-plan/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/network/ddos-protection-plan/tests/e2e/min/main.test.bicep
rename to modules/network/ddos-protection-plan/tests/e2e/defaults/main.test.bicep
diff --git a/modules/network/dns-forwarding-ruleset/tests/e2e/min/dependencies.bicep b/modules/network/dns-forwarding-ruleset/tests/e2e/defaults/dependencies.bicep
similarity index 100%
rename from modules/network/dns-forwarding-ruleset/tests/e2e/min/dependencies.bicep
rename to modules/network/dns-forwarding-ruleset/tests/e2e/defaults/dependencies.bicep
diff --git a/modules/network/dns-forwarding-ruleset/tests/e2e/min/main.test.bicep b/modules/network/dns-forwarding-ruleset/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/network/dns-forwarding-ruleset/tests/e2e/min/main.test.bicep
rename to modules/network/dns-forwarding-ruleset/tests/e2e/defaults/main.test.bicep
diff --git a/modules/network/dns-zone/tests/e2e/min/main.test.bicep b/modules/network/dns-zone/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/network/dns-zone/tests/e2e/min/main.test.bicep
rename to modules/network/dns-zone/tests/e2e/defaults/main.test.bicep
diff --git a/modules/network/express-route-circuit/tests/e2e/min/main.test.bicep b/modules/network/express-route-circuit/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/network/express-route-circuit/tests/e2e/min/main.test.bicep
rename to modules/network/express-route-circuit/tests/e2e/defaults/main.test.bicep
diff --git a/modules/network/express-route-gateway/tests/e2e/min/dependencies.bicep b/modules/network/express-route-gateway/tests/e2e/defaults/dependencies.bicep
similarity index 100%
rename from modules/network/express-route-gateway/tests/e2e/min/dependencies.bicep
rename to modules/network/express-route-gateway/tests/e2e/defaults/dependencies.bicep
diff --git a/modules/network/express-route-gateway/tests/e2e/min/main.test.bicep b/modules/network/express-route-gateway/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/network/express-route-gateway/tests/e2e/min/main.test.bicep
rename to modules/network/express-route-gateway/tests/e2e/defaults/main.test.bicep
diff --git a/modules/network/firewall-policy/tests/e2e/min/main.test.bicep b/modules/network/firewall-policy/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/network/firewall-policy/tests/e2e/min/main.test.bicep
rename to modules/network/firewall-policy/tests/e2e/defaults/main.test.bicep
diff --git a/modules/network/front-door-web-application-firewall-policy/tests/e2e/min/main.test.bicep b/modules/network/front-door-web-application-firewall-policy/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/network/front-door-web-application-firewall-policy/tests/e2e/min/main.test.bicep
rename to modules/network/front-door-web-application-firewall-policy/tests/e2e/defaults/main.test.bicep
diff --git a/modules/network/front-door/tests/e2e/min/main.test.bicep b/modules/network/front-door/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/network/front-door/tests/e2e/min/main.test.bicep
rename to modules/network/front-door/tests/e2e/defaults/main.test.bicep
diff --git a/modules/network/ip-group/tests/e2e/min/main.test.bicep b/modules/network/ip-group/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/network/ip-group/tests/e2e/min/main.test.bicep
rename to modules/network/ip-group/tests/e2e/defaults/main.test.bicep
diff --git a/modules/network/load-balancer/tests/e2e/min/dependencies.bicep b/modules/network/load-balancer/tests/e2e/defaults/dependencies.bicep
similarity index 100%
rename from modules/network/load-balancer/tests/e2e/min/dependencies.bicep
rename to modules/network/load-balancer/tests/e2e/defaults/dependencies.bicep
diff --git a/modules/network/load-balancer/tests/e2e/min/main.test.bicep b/modules/network/load-balancer/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/network/load-balancer/tests/e2e/min/main.test.bicep
rename to modules/network/load-balancer/tests/e2e/defaults/main.test.bicep
diff --git a/modules/network/local-network-gateway/tests/e2e/min/main.test.bicep b/modules/network/local-network-gateway/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/network/local-network-gateway/tests/e2e/min/main.test.bicep
rename to modules/network/local-network-gateway/tests/e2e/defaults/main.test.bicep
diff --git a/modules/network/network-interface/tests/e2e/min/dependencies.bicep b/modules/network/network-interface/tests/e2e/defaults/dependencies.bicep
similarity index 100%
rename from modules/network/network-interface/tests/e2e/min/dependencies.bicep
rename to modules/network/network-interface/tests/e2e/defaults/dependencies.bicep
diff --git a/modules/network/network-interface/tests/e2e/min/main.test.bicep b/modules/network/network-interface/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/network/network-interface/tests/e2e/min/main.test.bicep
rename to modules/network/network-interface/tests/e2e/defaults/main.test.bicep
diff --git a/modules/network/network-security-group/tests/e2e/min/main.test.bicep b/modules/network/network-security-group/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/network/network-security-group/tests/e2e/min/main.test.bicep
rename to modules/network/network-security-group/tests/e2e/defaults/main.test.bicep
diff --git a/modules/network/network-watcher/tests/e2e/min/main.test.bicep b/modules/network/network-watcher/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/network/network-watcher/tests/e2e/min/main.test.bicep
rename to modules/network/network-watcher/tests/e2e/defaults/main.test.bicep
diff --git a/modules/network/private-dns-zone/tests/e2e/min/main.test.bicep b/modules/network/private-dns-zone/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/network/private-dns-zone/tests/e2e/min/main.test.bicep
rename to modules/network/private-dns-zone/tests/e2e/defaults/main.test.bicep
diff --git a/modules/network/private-endpoint/tests/e2e/min/dependencies.bicep b/modules/network/private-endpoint/tests/e2e/defaults/dependencies.bicep
similarity index 100%
rename from modules/network/private-endpoint/tests/e2e/min/dependencies.bicep
rename to modules/network/private-endpoint/tests/e2e/defaults/dependencies.bicep
diff --git a/modules/network/private-endpoint/tests/e2e/min/main.test.bicep b/modules/network/private-endpoint/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/network/private-endpoint/tests/e2e/min/main.test.bicep
rename to modules/network/private-endpoint/tests/e2e/defaults/main.test.bicep
diff --git a/modules/network/private-link-service/tests/e2e/min/dependencies.bicep b/modules/network/private-link-service/tests/e2e/defaults/dependencies.bicep
similarity index 100%
rename from modules/network/private-link-service/tests/e2e/min/dependencies.bicep
rename to modules/network/private-link-service/tests/e2e/defaults/dependencies.bicep
diff --git a/modules/network/private-link-service/tests/e2e/min/main.test.bicep b/modules/network/private-link-service/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/network/private-link-service/tests/e2e/min/main.test.bicep
rename to modules/network/private-link-service/tests/e2e/defaults/main.test.bicep
diff --git a/modules/network/public-ip-address/tests/e2e/min/main.test.bicep b/modules/network/public-ip-address/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/network/public-ip-address/tests/e2e/min/main.test.bicep
rename to modules/network/public-ip-address/tests/e2e/defaults/main.test.bicep
diff --git a/modules/network/public-ip-prefix/tests/e2e/min/main.test.bicep b/modules/network/public-ip-prefix/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/network/public-ip-prefix/tests/e2e/min/main.test.bicep
rename to modules/network/public-ip-prefix/tests/e2e/defaults/main.test.bicep
diff --git a/modules/network/route-table/tests/e2e/min/main.test.bicep b/modules/network/route-table/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/network/route-table/tests/e2e/min/main.test.bicep
rename to modules/network/route-table/tests/e2e/defaults/main.test.bicep
diff --git a/modules/network/service-endpoint-policy/tests/e2e/min/main.test.bicep b/modules/network/service-endpoint-policy/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/network/service-endpoint-policy/tests/e2e/min/main.test.bicep
rename to modules/network/service-endpoint-policy/tests/e2e/defaults/main.test.bicep
diff --git a/modules/network/trafficmanagerprofile/tests/e2e/min/main.test.bicep b/modules/network/trafficmanagerprofile/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/network/trafficmanagerprofile/tests/e2e/min/main.test.bicep
rename to modules/network/trafficmanagerprofile/tests/e2e/defaults/main.test.bicep
diff --git a/modules/network/virtual-hub/tests/e2e/min/dependencies.bicep b/modules/network/virtual-hub/tests/e2e/defaults/dependencies.bicep
similarity index 100%
rename from modules/network/virtual-hub/tests/e2e/min/dependencies.bicep
rename to modules/network/virtual-hub/tests/e2e/defaults/dependencies.bicep
diff --git a/modules/network/virtual-hub/tests/e2e/min/main.test.bicep b/modules/network/virtual-hub/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/network/virtual-hub/tests/e2e/min/main.test.bicep
rename to modules/network/virtual-hub/tests/e2e/defaults/main.test.bicep
diff --git a/modules/network/virtual-network/tests/e2e/min/main.test.bicep b/modules/network/virtual-network/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/network/virtual-network/tests/e2e/min/main.test.bicep
rename to modules/network/virtual-network/tests/e2e/defaults/main.test.bicep
diff --git a/modules/network/virtual-wan/tests/e2e/min/main.test.bicep b/modules/network/virtual-wan/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/network/virtual-wan/tests/e2e/min/main.test.bicep
rename to modules/network/virtual-wan/tests/e2e/defaults/main.test.bicep
diff --git a/modules/network/vpn-gateway/tests/e2e/min/dependencies.bicep b/modules/network/vpn-gateway/tests/e2e/defaults/dependencies.bicep
similarity index 100%
rename from modules/network/vpn-gateway/tests/e2e/min/dependencies.bicep
rename to modules/network/vpn-gateway/tests/e2e/defaults/dependencies.bicep
diff --git a/modules/network/vpn-gateway/tests/e2e/min/main.test.bicep b/modules/network/vpn-gateway/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/network/vpn-gateway/tests/e2e/min/main.test.bicep
rename to modules/network/vpn-gateway/tests/e2e/defaults/main.test.bicep
diff --git a/modules/network/vpn-site/tests/e2e/min/dependencies.bicep b/modules/network/vpn-site/tests/e2e/defaults/dependencies.bicep
similarity index 100%
rename from modules/network/vpn-site/tests/e2e/min/dependencies.bicep
rename to modules/network/vpn-site/tests/e2e/defaults/dependencies.bicep
diff --git a/modules/network/vpn-site/tests/e2e/min/main.test.bicep b/modules/network/vpn-site/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/network/vpn-site/tests/e2e/min/main.test.bicep
rename to modules/network/vpn-site/tests/e2e/defaults/main.test.bicep
diff --git a/modules/operational-insights/workspace/tests/e2e/min/main.test.bicep b/modules/operational-insights/workspace/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/operational-insights/workspace/tests/e2e/min/main.test.bicep
rename to modules/operational-insights/workspace/tests/e2e/defaults/main.test.bicep
diff --git a/modules/operations-management/solution/tests/e2e/min/dependencies.bicep b/modules/operations-management/solution/tests/e2e/defaults/dependencies.bicep
similarity index 100%
rename from modules/operations-management/solution/tests/e2e/min/dependencies.bicep
rename to modules/operations-management/solution/tests/e2e/defaults/dependencies.bicep
diff --git a/modules/operations-management/solution/tests/e2e/min/main.test.bicep b/modules/operations-management/solution/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/operations-management/solution/tests/e2e/min/main.test.bicep
rename to modules/operations-management/solution/tests/e2e/defaults/main.test.bicep
diff --git a/modules/power-bi-dedicated/capacity/tests/e2e/min/dependencies.bicep b/modules/power-bi-dedicated/capacity/tests/e2e/defaults/dependencies.bicep
similarity index 100%
rename from modules/power-bi-dedicated/capacity/tests/e2e/min/dependencies.bicep
rename to modules/power-bi-dedicated/capacity/tests/e2e/defaults/dependencies.bicep
diff --git a/modules/power-bi-dedicated/capacity/tests/e2e/min/main.test.bicep b/modules/power-bi-dedicated/capacity/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/power-bi-dedicated/capacity/tests/e2e/min/main.test.bicep
rename to modules/power-bi-dedicated/capacity/tests/e2e/defaults/main.test.bicep
diff --git a/modules/purview/account/tests/e2e/min/main.test.bicep b/modules/purview/account/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/purview/account/tests/e2e/min/main.test.bicep
rename to modules/purview/account/tests/e2e/defaults/main.test.bicep
diff --git a/modules/recovery-services/vault/tests/e2e/min/main.test.bicep b/modules/recovery-services/vault/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/recovery-services/vault/tests/e2e/min/main.test.bicep
rename to modules/recovery-services/vault/tests/e2e/defaults/main.test.bicep
diff --git a/modules/relay/namespace/tests/e2e/min/main.test.bicep b/modules/relay/namespace/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/relay/namespace/tests/e2e/min/main.test.bicep
rename to modules/relay/namespace/tests/e2e/defaults/main.test.bicep
diff --git a/modules/resource-graph/query/tests/e2e/min/main.test.bicep b/modules/resource-graph/query/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/resource-graph/query/tests/e2e/min/main.test.bicep
rename to modules/resource-graph/query/tests/e2e/defaults/main.test.bicep
diff --git a/modules/resources/resource-group/tests/e2e/min/main.test.bicep b/modules/resources/resource-group/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/resources/resource-group/tests/e2e/min/main.test.bicep
rename to modules/resources/resource-group/tests/e2e/defaults/main.test.bicep
diff --git a/modules/resources/tags/tests/e2e/min/main.test.bicep b/modules/resources/tags/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/resources/tags/tests/e2e/min/main.test.bicep
rename to modules/resources/tags/tests/e2e/defaults/main.test.bicep
diff --git a/modules/search/search-service/tests/e2e/min/main.test.bicep b/modules/search/search-service/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/search/search-service/tests/e2e/min/main.test.bicep
rename to modules/search/search-service/tests/e2e/defaults/main.test.bicep
diff --git a/modules/service-bus/namespace/tests/e2e/min/main.test.bicep b/modules/service-bus/namespace/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/service-bus/namespace/tests/e2e/min/main.test.bicep
rename to modules/service-bus/namespace/tests/e2e/defaults/main.test.bicep
diff --git a/modules/service-fabric/cluster/tests/e2e/min/main.test.bicep b/modules/service-fabric/cluster/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/service-fabric/cluster/tests/e2e/min/main.test.bicep
rename to modules/service-fabric/cluster/tests/e2e/defaults/main.test.bicep
diff --git a/modules/signal-r-service/signal-r/tests/e2e/min/main.test.bicep b/modules/signal-r-service/signal-r/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/signal-r-service/signal-r/tests/e2e/min/main.test.bicep
rename to modules/signal-r-service/signal-r/tests/e2e/defaults/main.test.bicep
diff --git a/modules/signal-r-service/web-pub-sub/tests/e2e/min/main.test.bicep b/modules/signal-r-service/web-pub-sub/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/signal-r-service/web-pub-sub/tests/e2e/min/main.test.bicep
rename to modules/signal-r-service/web-pub-sub/tests/e2e/defaults/main.test.bicep
diff --git a/modules/sql/managed-instance/tests/e2e/min/dependencies.bicep b/modules/sql/managed-instance/tests/e2e/defaults/dependencies.bicep
similarity index 100%
rename from modules/sql/managed-instance/tests/e2e/min/dependencies.bicep
rename to modules/sql/managed-instance/tests/e2e/defaults/dependencies.bicep
diff --git a/modules/sql/managed-instance/tests/e2e/min/main.test.bicep b/modules/sql/managed-instance/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/sql/managed-instance/tests/e2e/min/main.test.bicep
rename to modules/sql/managed-instance/tests/e2e/defaults/main.test.bicep
diff --git a/modules/storage/storage-account/tests/e2e/min/main.test.bicep b/modules/storage/storage-account/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/storage/storage-account/tests/e2e/min/main.test.bicep
rename to modules/storage/storage-account/tests/e2e/defaults/main.test.bicep
diff --git a/modules/synapse/private-link-hub/tests/e2e/min/main.test.bicep b/modules/synapse/private-link-hub/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/synapse/private-link-hub/tests/e2e/min/main.test.bicep
rename to modules/synapse/private-link-hub/tests/e2e/defaults/main.test.bicep
diff --git a/modules/synapse/workspace/tests/e2e/min/dependencies.bicep b/modules/synapse/workspace/tests/e2e/defaults/dependencies.bicep
similarity index 100%
rename from modules/synapse/workspace/tests/e2e/min/dependencies.bicep
rename to modules/synapse/workspace/tests/e2e/defaults/dependencies.bicep
diff --git a/modules/synapse/workspace/tests/e2e/min/main.test.bicep b/modules/synapse/workspace/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/synapse/workspace/tests/e2e/min/main.test.bicep
rename to modules/synapse/workspace/tests/e2e/defaults/main.test.bicep
diff --git a/modules/virtual-machine-images/image-template/tests/e2e/min/dependencies.bicep b/modules/virtual-machine-images/image-template/tests/e2e/defaults/dependencies.bicep
similarity index 100%
rename from modules/virtual-machine-images/image-template/tests/e2e/min/dependencies.bicep
rename to modules/virtual-machine-images/image-template/tests/e2e/defaults/dependencies.bicep
diff --git a/modules/virtual-machine-images/image-template/tests/e2e/min/main.test.bicep b/modules/virtual-machine-images/image-template/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/virtual-machine-images/image-template/tests/e2e/min/main.test.bicep
rename to modules/virtual-machine-images/image-template/tests/e2e/defaults/main.test.bicep
diff --git a/modules/web/static-site/tests/e2e/min/main.test.bicep b/modules/web/static-site/tests/e2e/defaults/main.test.bicep
similarity index 100%
rename from modules/web/static-site/tests/e2e/min/main.test.bicep
rename to modules/web/static-site/tests/e2e/defaults/main.test.bicep

From 5050b71ab4fddf8261782cf6927ed09771829483 Mon Sep 17 00:00:00 2001
From: Erika Gressi <erikag@microsoft.com>
Date: Sat, 4 Nov 2023 16:52:23 +0100
Subject: [PATCH 2/3] readmes

---
 modules/analysis-services/server/README.md    | 102 +++----
 modules/api-management/service/README.md      | 118 ++++----
 .../configuration-store/README.md             | 102 +++----
 .../automation/automation-account/README.md   |  74 ++---
 modules/batch/batch-account/README.md         | 110 +++----
 modules/cache/redis-enterprise/README.md      | 102 +++----
 modules/cognitive-services/account/README.md  |  98 +++----
 modules/compute/disk/README.md                | 122 ++++----
 .../container-group/README.md                 | 214 +++++++-------
 modules/container-registry/registry/README.md | 102 +++----
 .../managed-cluster/README.md                 | 154 +++++-----
 modules/event-hub/namespace/README.md         | 102 +++----
 .../insights/data-collection-rule/README.md   | 274 +++++++++---------
 .../workspace/README.md                       | 150 +++++-----
 modules/network/azure-firewall/README.md      | 104 +++----
 modules/network/load-balancer/README.md       | 130 ++++-----
 modules/recovery-services/vault/README.md     | 102 +++----
 modules/service-bus/namespace/README.md       | 102 +++----
 modules/storage/storage-account/README.md     | 110 +++----
 modules/synapse/workspace/README.md           | 132 ++++-----
 20 files changed, 1252 insertions(+), 1252 deletions(-)

diff --git a/modules/analysis-services/server/README.md b/modules/analysis-services/server/README.md
index 7fa90cf6f9..67343bda2a 100644
--- a/modules/analysis-services/server/README.md
+++ b/modules/analysis-services/server/README.md
@@ -28,8 +28,8 @@ The following section provides usage examples for the module, which were used to
 >**Note**: To reference the module, please use the following syntax `br:bicep/modules/analysis-services.server:1.0.0`.
 
 - [Using large parameter set](#example-1-using-large-parameter-set)
-- [Max](#example-2-max)
-- [Using only defaults](#example-3-using-only-defaults)
+- [Using only defaults](#example-2-using-only-defaults)
+- [Max](#example-3-max)
 
 ### Example 1: _Using large parameter set_
 
@@ -151,7 +151,55 @@ module server 'br:bicep/modules/analysis-services.server:1.0.0' = {
 </details>
 <p>
 
-### Example 2: _Max_
+### Example 2: _Using only defaults_
+
+This instance deploys the module with the minimum set of required parameters.
+
+
+<details>
+
+<summary>via Bicep module</summary>
+
+```bicep
+module server 'br:bicep/modules/analysis-services.server:1.0.0' = {
+  name: '${uniqueString(deployment().name, location)}-test-assmin'
+  params: {
+    // Required parameters
+    name: 'assmin'
+    // Non-required parameters
+    enableDefaultTelemetry: '<enableDefaultTelemetry>'
+  }
+}
+```
+
+</details>
+<p>
+
+<details>
+
+<summary>via JSON Parameter file</summary>
+
+```json
+{
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    // Required parameters
+    "name": {
+      "value": "assmin"
+    },
+    // Non-required parameters
+    "enableDefaultTelemetry": {
+      "value": "<enableDefaultTelemetry>"
+    }
+  }
+}
+```
+
+</details>
+<p>
+
+### Example 3: _Max_
 
 <details>
 
@@ -298,54 +346,6 @@ module server 'br:bicep/modules/analysis-services.server:1.0.0' = {
 </details>
 <p>
 
-### Example 3: _Using only defaults_
-
-This instance deploys the module with the minimum set of required parameters.
-
-
-<details>
-
-<summary>via Bicep module</summary>
-
-```bicep
-module server 'br:bicep/modules/analysis-services.server:1.0.0' = {
-  name: '${uniqueString(deployment().name, location)}-test-assmin'
-  params: {
-    // Required parameters
-    name: 'assmin'
-    // Non-required parameters
-    enableDefaultTelemetry: '<enableDefaultTelemetry>'
-  }
-}
-```
-
-</details>
-<p>
-
-<details>
-
-<summary>via JSON Parameter file</summary>
-
-```json
-{
-  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    // Required parameters
-    "name": {
-      "value": "assmin"
-    },
-    // Non-required parameters
-    "enableDefaultTelemetry": {
-      "value": "<enableDefaultTelemetry>"
-    }
-  }
-}
-```
-
-</details>
-<p>
-
 
 ## Parameters
 
diff --git a/modules/api-management/service/README.md b/modules/api-management/service/README.md
index 596879a4b5..dda735bb01 100644
--- a/modules/api-management/service/README.md
+++ b/modules/api-management/service/README.md
@@ -43,8 +43,8 @@ The following section provides usage examples for the module, which were used to
 >**Note**: To reference the module, please use the following syntax `br:bicep/modules/api-management.service:1.0.0`.
 
 - [Using large parameter set](#example-1-using-large-parameter-set)
-- [Max](#example-2-max)
-- [Using only defaults](#example-3-using-only-defaults)
+- [Using only defaults](#example-2-using-only-defaults)
+- [Max](#example-3-max)
 
 ### Example 1: _Using large parameter set_
 
@@ -200,7 +200,63 @@ module service 'br:bicep/modules/api-management.service:1.0.0' = {
 </details>
 <p>
 
-### Example 2: _Max_
+### Example 2: _Using only defaults_
+
+This instance deploys the module with the minimum set of required parameters.
+
+
+<details>
+
+<summary>via Bicep module</summary>
+
+```bicep
+module service 'br:bicep/modules/api-management.service:1.0.0' = {
+  name: '${uniqueString(deployment().name, location)}-test-apismin'
+  params: {
+    // Required parameters
+    name: 'apismin001'
+    publisherEmail: 'apimgmt-noreply@mail.windowsazure.com'
+    publisherName: 'az-amorg-x-001'
+    // Non-required parameters
+    enableDefaultTelemetry: '<enableDefaultTelemetry>'
+  }
+}
+```
+
+</details>
+<p>
+
+<details>
+
+<summary>via JSON Parameter file</summary>
+
+```json
+{
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    // Required parameters
+    "name": {
+      "value": "apismin001"
+    },
+    "publisherEmail": {
+      "value": "apimgmt-noreply@mail.windowsazure.com"
+    },
+    "publisherName": {
+      "value": "az-amorg-x-001"
+    },
+    // Non-required parameters
+    "enableDefaultTelemetry": {
+      "value": "<enableDefaultTelemetry>"
+    }
+  }
+}
+```
+
+</details>
+<p>
+
+### Example 3: _Max_
 
 <details>
 
@@ -567,62 +623,6 @@ module service 'br:bicep/modules/api-management.service:1.0.0' = {
 </details>
 <p>
 
-### Example 3: _Using only defaults_
-
-This instance deploys the module with the minimum set of required parameters.
-
-
-<details>
-
-<summary>via Bicep module</summary>
-
-```bicep
-module service 'br:bicep/modules/api-management.service:1.0.0' = {
-  name: '${uniqueString(deployment().name, location)}-test-apismin'
-  params: {
-    // Required parameters
-    name: 'apismin001'
-    publisherEmail: 'apimgmt-noreply@mail.windowsazure.com'
-    publisherName: 'az-amorg-x-001'
-    // Non-required parameters
-    enableDefaultTelemetry: '<enableDefaultTelemetry>'
-  }
-}
-```
-
-</details>
-<p>
-
-<details>
-
-<summary>via JSON Parameter file</summary>
-
-```json
-{
-  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    // Required parameters
-    "name": {
-      "value": "apismin001"
-    },
-    "publisherEmail": {
-      "value": "apimgmt-noreply@mail.windowsazure.com"
-    },
-    "publisherName": {
-      "value": "az-amorg-x-001"
-    },
-    // Non-required parameters
-    "enableDefaultTelemetry": {
-      "value": "<enableDefaultTelemetry>"
-    }
-  }
-}
-```
-
-</details>
-<p>
-
 
 ## Parameters
 
diff --git a/modules/app-configuration/configuration-store/README.md b/modules/app-configuration/configuration-store/README.md
index b7cd4a7c0d..46f091b2d9 100644
--- a/modules/app-configuration/configuration-store/README.md
+++ b/modules/app-configuration/configuration-store/README.md
@@ -31,8 +31,8 @@ The following section provides usage examples for the module, which were used to
 >**Note**: To reference the module, please use the following syntax `br:bicep/modules/app-configuration.configuration-store:1.0.0`.
 
 - [Using large parameter set](#example-1-using-large-parameter-set)
-- [Encr](#example-2-encr)
-- [Using only defaults](#example-3-using-only-defaults)
+- [Using only defaults](#example-2-using-only-defaults)
+- [Encr](#example-3-encr)
 - [Pe](#example-4-pe)
 
 ### Example 1: _Using large parameter set_
@@ -211,7 +211,55 @@ module configurationStore 'br:bicep/modules/app-configuration.configuration-stor
 </details>
 <p>
 
-### Example 2: _Encr_
+### Example 2: _Using only defaults_
+
+This instance deploys the module with the minimum set of required parameters.
+
+
+<details>
+
+<summary>via Bicep module</summary>
+
+```bicep
+module configurationStore 'br:bicep/modules/app-configuration.configuration-store:1.0.0' = {
+  name: '${uniqueString(deployment().name, location)}-test-accmin'
+  params: {
+    // Required parameters
+    name: 'accmin001'
+    // Non-required parameters
+    enableDefaultTelemetry: '<enableDefaultTelemetry>'
+  }
+}
+```
+
+</details>
+<p>
+
+<details>
+
+<summary>via JSON Parameter file</summary>
+
+```json
+{
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    // Required parameters
+    "name": {
+      "value": "accmin001"
+    },
+    // Non-required parameters
+    "enableDefaultTelemetry": {
+      "value": "<enableDefaultTelemetry>"
+    }
+  }
+}
+```
+
+</details>
+<p>
+
+### Example 3: _Encr_
 
 <details>
 
@@ -354,54 +402,6 @@ module configurationStore 'br:bicep/modules/app-configuration.configuration-stor
 </details>
 <p>
 
-### Example 3: _Using only defaults_
-
-This instance deploys the module with the minimum set of required parameters.
-
-
-<details>
-
-<summary>via Bicep module</summary>
-
-```bicep
-module configurationStore 'br:bicep/modules/app-configuration.configuration-store:1.0.0' = {
-  name: '${uniqueString(deployment().name, location)}-test-accmin'
-  params: {
-    // Required parameters
-    name: 'accmin001'
-    // Non-required parameters
-    enableDefaultTelemetry: '<enableDefaultTelemetry>'
-  }
-}
-```
-
-</details>
-<p>
-
-<details>
-
-<summary>via JSON Parameter file</summary>
-
-```json
-{
-  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    // Required parameters
-    "name": {
-      "value": "accmin001"
-    },
-    // Non-required parameters
-    "enableDefaultTelemetry": {
-      "value": "<enableDefaultTelemetry>"
-    }
-  }
-}
-```
-
-</details>
-<p>
-
 ### Example 4: _Pe_
 
 <details>
diff --git a/modules/automation/automation-account/README.md b/modules/automation/automation-account/README.md
index a2f5f9fd1f..b5b6e86e68 100644
--- a/modules/automation/automation-account/README.md
+++ b/modules/automation/automation-account/README.md
@@ -38,8 +38,8 @@ The following section provides usage examples for the module, which were used to
 >**Note**: To reference the module, please use the following syntax `br:bicep/modules/automation.automation-account:1.0.0`.
 
 - [Using large parameter set](#example-1-using-large-parameter-set)
-- [Encr](#example-2-encr)
-- [Using only defaults](#example-3-using-only-defaults)
+- [Using only defaults](#example-2-using-only-defaults)
+- [Encr](#example-3-encr)
 
 ### Example 1: _Using large parameter set_
 
@@ -497,7 +497,10 @@ module automationAccount 'br:bicep/modules/automation.automation-account:1.0.0'
 </details>
 <p>
 
-### Example 2: _Encr_
+### Example 2: _Using only defaults_
+
+This instance deploys the module with the minimum set of required parameters.
+
 
 <details>
 
@@ -505,22 +508,12 @@ module automationAccount 'br:bicep/modules/automation.automation-account:1.0.0'
 
 ```bicep
 module automationAccount 'br:bicep/modules/automation.automation-account:1.0.0' = {
-  name: '${uniqueString(deployment().name, location)}-test-aaencr'
+  name: '${uniqueString(deployment().name, location)}-test-aamin'
   params: {
     // Required parameters
-    name: 'aaencr001'
+    name: 'aamin001'
     // Non-required parameters
-    customerManagedKey: {
-      keyName: '<keyName>'
-      keyVaultResourceId: '<keyVaultResourceId>'
-      userAssignedIdentityResourceId: '<userAssignedIdentityResourceId>'
-    }
     enableDefaultTelemetry: '<enableDefaultTelemetry>'
-    managedIdentities: {
-      userAssignedResourcesIds: [
-        '<managedIdentityResourceId>'
-      ]
-    }
   }
 }
 ```
@@ -539,25 +532,11 @@ module automationAccount 'br:bicep/modules/automation.automation-account:1.0.0'
   "parameters": {
     // Required parameters
     "name": {
-      "value": "aaencr001"
+      "value": "aamin001"
     },
     // Non-required parameters
-    "customerManagedKey": {
-      "value": {
-        "keyName": "<keyName>",
-        "keyVaultResourceId": "<keyVaultResourceId>",
-        "userAssignedIdentityResourceId": "<userAssignedIdentityResourceId>"
-      }
-    },
     "enableDefaultTelemetry": {
       "value": "<enableDefaultTelemetry>"
-    },
-    "managedIdentities": {
-      "value": {
-        "userAssignedResourcesIds": [
-          "<managedIdentityResourceId>"
-        ]
-      }
     }
   }
 }
@@ -566,10 +545,7 @@ module automationAccount 'br:bicep/modules/automation.automation-account:1.0.0'
 </details>
 <p>
 
-### Example 3: _Using only defaults_
-
-This instance deploys the module with the minimum set of required parameters.
-
+### Example 3: _Encr_
 
 <details>
 
@@ -577,12 +553,22 @@ This instance deploys the module with the minimum set of required parameters.
 
 ```bicep
 module automationAccount 'br:bicep/modules/automation.automation-account:1.0.0' = {
-  name: '${uniqueString(deployment().name, location)}-test-aamin'
+  name: '${uniqueString(deployment().name, location)}-test-aaencr'
   params: {
     // Required parameters
-    name: 'aamin001'
+    name: 'aaencr001'
     // Non-required parameters
+    customerManagedKey: {
+      keyName: '<keyName>'
+      keyVaultResourceId: '<keyVaultResourceId>'
+      userAssignedIdentityResourceId: '<userAssignedIdentityResourceId>'
+    }
     enableDefaultTelemetry: '<enableDefaultTelemetry>'
+    managedIdentities: {
+      userAssignedResourcesIds: [
+        '<managedIdentityResourceId>'
+      ]
+    }
   }
 }
 ```
@@ -601,11 +587,25 @@ module automationAccount 'br:bicep/modules/automation.automation-account:1.0.0'
   "parameters": {
     // Required parameters
     "name": {
-      "value": "aamin001"
+      "value": "aaencr001"
     },
     // Non-required parameters
+    "customerManagedKey": {
+      "value": {
+        "keyName": "<keyName>",
+        "keyVaultResourceId": "<keyVaultResourceId>",
+        "userAssignedIdentityResourceId": "<userAssignedIdentityResourceId>"
+      }
+    },
     "enableDefaultTelemetry": {
       "value": "<enableDefaultTelemetry>"
+    },
+    "managedIdentities": {
+      "value": {
+        "userAssignedResourcesIds": [
+          "<managedIdentityResourceId>"
+        ]
+      }
     }
   }
 }
diff --git a/modules/batch/batch-account/README.md b/modules/batch/batch-account/README.md
index 968d2b7b7b..45497741ab 100644
--- a/modules/batch/batch-account/README.md
+++ b/modules/batch/batch-account/README.md
@@ -32,8 +32,8 @@ The following section provides usage examples for the module, which were used to
 >**Note**: To reference the module, please use the following syntax `br:bicep/modules/batch.batch-account:1.0.0`.
 
 - [Using large parameter set](#example-1-using-large-parameter-set)
-- [Encr](#example-2-encr)
-- [Using only defaults](#example-3-using-only-defaults)
+- [Using only defaults](#example-2-using-only-defaults)
+- [Encr](#example-3-encr)
 
 ### Example 1: _Using large parameter set_
 
@@ -217,7 +217,59 @@ module batchAccount 'br:bicep/modules/batch.batch-account:1.0.0' = {
 </details>
 <p>
 
-### Example 2: _Encr_
+### Example 2: _Using only defaults_
+
+This instance deploys the module with the minimum set of required parameters.
+
+
+<details>
+
+<summary>via Bicep module</summary>
+
+```bicep
+module batchAccount 'br:bicep/modules/batch.batch-account:1.0.0' = {
+  name: '${uniqueString(deployment().name, location)}-test-bbamin'
+  params: {
+    // Required parameters
+    name: 'bbamin001'
+    storageAccountId: '<storageAccountId>'
+    // Non-required parameters
+    enableDefaultTelemetry: '<enableDefaultTelemetry>'
+  }
+}
+```
+
+</details>
+<p>
+
+<details>
+
+<summary>via JSON Parameter file</summary>
+
+```json
+{
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    // Required parameters
+    "name": {
+      "value": "bbamin001"
+    },
+    "storageAccountId": {
+      "value": "<storageAccountId>"
+    },
+    // Non-required parameters
+    "enableDefaultTelemetry": {
+      "value": "<enableDefaultTelemetry>"
+    }
+  }
+}
+```
+
+</details>
+<p>
+
+### Example 3: _Encr_
 
 <details>
 
@@ -340,58 +392,6 @@ module batchAccount 'br:bicep/modules/batch.batch-account:1.0.0' = {
 </details>
 <p>
 
-### Example 3: _Using only defaults_
-
-This instance deploys the module with the minimum set of required parameters.
-
-
-<details>
-
-<summary>via Bicep module</summary>
-
-```bicep
-module batchAccount 'br:bicep/modules/batch.batch-account:1.0.0' = {
-  name: '${uniqueString(deployment().name, location)}-test-bbamin'
-  params: {
-    // Required parameters
-    name: 'bbamin001'
-    storageAccountId: '<storageAccountId>'
-    // Non-required parameters
-    enableDefaultTelemetry: '<enableDefaultTelemetry>'
-  }
-}
-```
-
-</details>
-<p>
-
-<details>
-
-<summary>via JSON Parameter file</summary>
-
-```json
-{
-  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    // Required parameters
-    "name": {
-      "value": "bbamin001"
-    },
-    "storageAccountId": {
-      "value": "<storageAccountId>"
-    },
-    // Non-required parameters
-    "enableDefaultTelemetry": {
-      "value": "<enableDefaultTelemetry>"
-    }
-  }
-}
-```
-
-</details>
-<p>
-
 
 ## Parameters
 
diff --git a/modules/cache/redis-enterprise/README.md b/modules/cache/redis-enterprise/README.md
index adcf1a6345..9dd72d458e 100644
--- a/modules/cache/redis-enterprise/README.md
+++ b/modules/cache/redis-enterprise/README.md
@@ -31,8 +31,8 @@ The following section provides usage examples for the module, which were used to
 >**Note**: To reference the module, please use the following syntax `br:bicep/modules/cache.redis-enterprise:1.0.0`.
 
 - [Using large parameter set](#example-1-using-large-parameter-set)
-- [Geo](#example-2-geo)
-- [Using only defaults](#example-3-using-only-defaults)
+- [Using only defaults](#example-2-using-only-defaults)
+- [Geo](#example-3-geo)
 
 ### Example 1: _Using large parameter set_
 
@@ -228,7 +228,55 @@ module redisEnterprise 'br:bicep/modules/cache.redis-enterprise:1.0.0' = {
 </details>
 <p>
 
-### Example 2: _Geo_
+### Example 2: _Using only defaults_
+
+This instance deploys the module with the minimum set of required parameters.
+
+
+<details>
+
+<summary>via Bicep module</summary>
+
+```bicep
+module redisEnterprise 'br:bicep/modules/cache.redis-enterprise:1.0.0' = {
+  name: '${uniqueString(deployment().name, location)}-test-cremin'
+  params: {
+    // Required parameters
+    name: 'cremin001'
+    // Non-required parameters
+    enableDefaultTelemetry: '<enableDefaultTelemetry>'
+  }
+}
+```
+
+</details>
+<p>
+
+<details>
+
+<summary>via JSON Parameter file</summary>
+
+```json
+{
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    // Required parameters
+    "name": {
+      "value": "cremin001"
+    },
+    // Non-required parameters
+    "enableDefaultTelemetry": {
+      "value": "<enableDefaultTelemetry>"
+    }
+  }
+}
+```
+
+</details>
+<p>
+
+### Example 3: _Geo_
 
 <details>
 
@@ -349,54 +397,6 @@ module redisEnterprise 'br:bicep/modules/cache.redis-enterprise:1.0.0' = {
 </details>
 <p>
 
-### Example 3: _Using only defaults_
-
-This instance deploys the module with the minimum set of required parameters.
-
-
-<details>
-
-<summary>via Bicep module</summary>
-
-```bicep
-module redisEnterprise 'br:bicep/modules/cache.redis-enterprise:1.0.0' = {
-  name: '${uniqueString(deployment().name, location)}-test-cremin'
-  params: {
-    // Required parameters
-    name: 'cremin001'
-    // Non-required parameters
-    enableDefaultTelemetry: '<enableDefaultTelemetry>'
-  }
-}
-```
-
-</details>
-<p>
-
-<details>
-
-<summary>via JSON Parameter file</summary>
-
-```json
-{
-  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    // Required parameters
-    "name": {
-      "value": "cremin001"
-    },
-    // Non-required parameters
-    "enableDefaultTelemetry": {
-      "value": "<enableDefaultTelemetry>"
-    }
-  }
-}
-```
-
-</details>
-<p>
-
 
 ## Parameters
 
diff --git a/modules/cognitive-services/account/README.md b/modules/cognitive-services/account/README.md
index 88f881fde6..66a4163847 100644
--- a/modules/cognitive-services/account/README.md
+++ b/modules/cognitive-services/account/README.md
@@ -33,8 +33,8 @@ The following section provides usage examples for the module, which were used to
 >**Note**: To reference the module, please use the following syntax `br:bicep/modules/cognitive-services.account:1.0.0`.
 
 - [Using large parameter set](#example-1-using-large-parameter-set)
-- [Encr](#example-2-encr)
-- [Using only defaults](#example-3-using-only-defaults)
+- [Using only defaults](#example-2-using-only-defaults)
+- [Encr](#example-3-encr)
 - [Speech](#example-4-speech)
 
 ### Example 1: _Using large parameter set_
@@ -237,7 +237,10 @@ module account 'br:bicep/modules/cognitive-services.account:1.0.0' = {
 </details>
 <p>
 
-### Example 2: _Encr_
+### Example 2: _Using only defaults_
+
+This instance deploys the module with the minimum set of required parameters.
+
 
 <details>
 
@@ -245,24 +248,13 @@ module account 'br:bicep/modules/cognitive-services.account:1.0.0' = {
 
 ```bicep
 module account 'br:bicep/modules/cognitive-services.account:1.0.0' = {
-  name: '${uniqueString(deployment().name, location)}-test-csaencr'
+  name: '${uniqueString(deployment().name, location)}-test-csamin'
   params: {
     // Required parameters
     kind: 'SpeechServices'
-    name: 'csaencr001'
+    name: 'csamin001'
     // Non-required parameters
-    cMKKeyName: '<cMKKeyName>'
-    cMKKeyVaultResourceId: '<cMKKeyVaultResourceId>'
-    cMKUserAssignedIdentityResourceId: '<cMKUserAssignedIdentityResourceId>'
     enableDefaultTelemetry: '<enableDefaultTelemetry>'
-    managedIdentities: {
-      userAssignedResourcesIds: [
-        '<managedIdentityResourceId>'
-      ]
-    }
-    publicNetworkAccess: 'Enabled'
-    restrictOutboundNetworkAccess: false
-    sku: 'S0'
   }
 }
 ```
@@ -284,36 +276,11 @@ module account 'br:bicep/modules/cognitive-services.account:1.0.0' = {
       "value": "SpeechServices"
     },
     "name": {
-      "value": "csaencr001"
+      "value": "csamin001"
     },
     // Non-required parameters
-    "cMKKeyName": {
-      "value": "<cMKKeyName>"
-    },
-    "cMKKeyVaultResourceId": {
-      "value": "<cMKKeyVaultResourceId>"
-    },
-    "cMKUserAssignedIdentityResourceId": {
-      "value": "<cMKUserAssignedIdentityResourceId>"
-    },
     "enableDefaultTelemetry": {
       "value": "<enableDefaultTelemetry>"
-    },
-    "managedIdentities": {
-      "value": {
-        "userAssignedResourcesIds": [
-          "<managedIdentityResourceId>"
-        ]
-      }
-    },
-    "publicNetworkAccess": {
-      "value": "Enabled"
-    },
-    "restrictOutboundNetworkAccess": {
-      "value": false
-    },
-    "sku": {
-      "value": "S0"
     }
   }
 }
@@ -322,10 +289,7 @@ module account 'br:bicep/modules/cognitive-services.account:1.0.0' = {
 </details>
 <p>
 
-### Example 3: _Using only defaults_
-
-This instance deploys the module with the minimum set of required parameters.
-
+### Example 3: _Encr_
 
 <details>
 
@@ -333,13 +297,24 @@ This instance deploys the module with the minimum set of required parameters.
 
 ```bicep
 module account 'br:bicep/modules/cognitive-services.account:1.0.0' = {
-  name: '${uniqueString(deployment().name, location)}-test-csamin'
+  name: '${uniqueString(deployment().name, location)}-test-csaencr'
   params: {
     // Required parameters
     kind: 'SpeechServices'
-    name: 'csamin001'
+    name: 'csaencr001'
     // Non-required parameters
+    cMKKeyName: '<cMKKeyName>'
+    cMKKeyVaultResourceId: '<cMKKeyVaultResourceId>'
+    cMKUserAssignedIdentityResourceId: '<cMKUserAssignedIdentityResourceId>'
     enableDefaultTelemetry: '<enableDefaultTelemetry>'
+    managedIdentities: {
+      userAssignedResourcesIds: [
+        '<managedIdentityResourceId>'
+      ]
+    }
+    publicNetworkAccess: 'Enabled'
+    restrictOutboundNetworkAccess: false
+    sku: 'S0'
   }
 }
 ```
@@ -361,11 +336,36 @@ module account 'br:bicep/modules/cognitive-services.account:1.0.0' = {
       "value": "SpeechServices"
     },
     "name": {
-      "value": "csamin001"
+      "value": "csaencr001"
     },
     // Non-required parameters
+    "cMKKeyName": {
+      "value": "<cMKKeyName>"
+    },
+    "cMKKeyVaultResourceId": {
+      "value": "<cMKKeyVaultResourceId>"
+    },
+    "cMKUserAssignedIdentityResourceId": {
+      "value": "<cMKUserAssignedIdentityResourceId>"
+    },
     "enableDefaultTelemetry": {
       "value": "<enableDefaultTelemetry>"
+    },
+    "managedIdentities": {
+      "value": {
+        "userAssignedResourcesIds": [
+          "<managedIdentityResourceId>"
+        ]
+      }
+    },
+    "publicNetworkAccess": {
+      "value": "Enabled"
+    },
+    "restrictOutboundNetworkAccess": {
+      "value": false
+    },
+    "sku": {
+      "value": "S0"
     }
   }
 }
diff --git a/modules/compute/disk/README.md b/modules/compute/disk/README.md
index d1acd93b46..11eec29dec 100644
--- a/modules/compute/disk/README.md
+++ b/modules/compute/disk/README.md
@@ -27,9 +27,9 @@ The following section provides usage examples for the module, which were used to
 >**Note**: To reference the module, please use the following syntax `br:bicep/modules/compute.disk:1.0.0`.
 
 - [Using large parameter set](#example-1-using-large-parameter-set)
-- [Image](#example-2-image)
-- [Import](#example-3-import)
-- [Using only defaults](#example-4-using-only-defaults)
+- [Using only defaults](#example-2-using-only-defaults)
+- [Image](#example-3-image)
+- [Import](#example-4-import)
 
 ### Example 1: _Using large parameter set_
 
@@ -145,7 +145,63 @@ module disk 'br:bicep/modules/compute.disk:1.0.0' = {
 </details>
 <p>
 
-### Example 2: _Image_
+### Example 2: _Using only defaults_
+
+This instance deploys the module with the minimum set of required parameters.
+
+
+<details>
+
+<summary>via Bicep module</summary>
+
+```bicep
+module disk 'br:bicep/modules/compute.disk:1.0.0' = {
+  name: '${uniqueString(deployment().name, location)}-test-cdmin'
+  params: {
+    // Required parameters
+    name: 'cdmin001'
+    sku: 'Standard_LRS'
+    // Non-required parameters
+    diskSizeGB: 1
+    enableDefaultTelemetry: '<enableDefaultTelemetry>'
+  }
+}
+```
+
+</details>
+<p>
+
+<details>
+
+<summary>via JSON Parameter file</summary>
+
+```json
+{
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    // Required parameters
+    "name": {
+      "value": "cdmin001"
+    },
+    "sku": {
+      "value": "Standard_LRS"
+    },
+    // Non-required parameters
+    "diskSizeGB": {
+      "value": 1
+    },
+    "enableDefaultTelemetry": {
+      "value": "<enableDefaultTelemetry>"
+    }
+  }
+}
+```
+
+</details>
+<p>
+
+### Example 3: _Image_
 
 <details>
 
@@ -230,7 +286,7 @@ module disk 'br:bicep/modules/compute.disk:1.0.0' = {
 </details>
 <p>
 
-### Example 3: _Import_
+### Example 4: _Import_
 
 <details>
 
@@ -319,62 +375,6 @@ module disk 'br:bicep/modules/compute.disk:1.0.0' = {
 </details>
 <p>
 
-### Example 4: _Using only defaults_
-
-This instance deploys the module with the minimum set of required parameters.
-
-
-<details>
-
-<summary>via Bicep module</summary>
-
-```bicep
-module disk 'br:bicep/modules/compute.disk:1.0.0' = {
-  name: '${uniqueString(deployment().name, location)}-test-cdmin'
-  params: {
-    // Required parameters
-    name: 'cdmin001'
-    sku: 'Standard_LRS'
-    // Non-required parameters
-    diskSizeGB: 1
-    enableDefaultTelemetry: '<enableDefaultTelemetry>'
-  }
-}
-```
-
-</details>
-<p>
-
-<details>
-
-<summary>via JSON Parameter file</summary>
-
-```json
-{
-  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    // Required parameters
-    "name": {
-      "value": "cdmin001"
-    },
-    "sku": {
-      "value": "Standard_LRS"
-    },
-    // Non-required parameters
-    "diskSizeGB": {
-      "value": 1
-    },
-    "enableDefaultTelemetry": {
-      "value": "<enableDefaultTelemetry>"
-    }
-  }
-}
-```
-
-</details>
-<p>
-
 
 ## Parameters
 
diff --git a/modules/container-instance/container-group/README.md b/modules/container-instance/container-group/README.md
index 342a9f3fc0..124aa25f20 100644
--- a/modules/container-instance/container-group/README.md
+++ b/modules/container-instance/container-group/README.md
@@ -27,8 +27,8 @@ The following section provides usage examples for the module, which were used to
 >**Note**: To reference the module, please use the following syntax `br:bicep/modules/container-instance.container-group:1.0.0`.
 
 - [Using large parameter set](#example-1-using-large-parameter-set)
-- [Encr](#example-2-encr)
-- [Using only defaults](#example-3-using-only-defaults)
+- [Using only defaults](#example-2-using-only-defaults)
+- [Encr](#example-3-encr)
 - [Private](#example-4-private)
 
 ### Example 1: _Using large parameter set_
@@ -231,7 +231,111 @@ module containerGroup 'br:bicep/modules/container-instance.container-group:1.0.0
 </details>
 <p>
 
-### Example 2: _Encr_
+### Example 2: _Using only defaults_
+
+This instance deploys the module with the minimum set of required parameters.
+
+
+<details>
+
+<summary>via Bicep module</summary>
+
+```bicep
+module containerGroup 'br:bicep/modules/container-instance.container-group:1.0.0' = {
+  name: '${uniqueString(deployment().name, location)}-test-cicgmin'
+  params: {
+    // Required parameters
+    containers: [
+      {
+        name: 'az-aci-x-001'
+        properties: {
+          image: 'mcr.microsoft.com/azuredocs/aci-helloworld'
+          ports: [
+            {
+              port: '443'
+              protocol: 'Tcp'
+            }
+          ]
+          resources: {
+            requests: {
+              cpu: 2
+              memoryInGB: 2
+            }
+          }
+        }
+      }
+    ]
+    name: 'cicgmin001'
+    // Non-required parameters
+    enableDefaultTelemetry: '<enableDefaultTelemetry>'
+    ipAddressPorts: [
+      {
+        port: 443
+        protocol: 'Tcp'
+      }
+    ]
+  }
+}
+```
+
+</details>
+<p>
+
+<details>
+
+<summary>via JSON Parameter file</summary>
+
+```json
+{
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    // Required parameters
+    "containers": {
+      "value": [
+        {
+          "name": "az-aci-x-001",
+          "properties": {
+            "image": "mcr.microsoft.com/azuredocs/aci-helloworld",
+            "ports": [
+              {
+                "port": "443",
+                "protocol": "Tcp"
+              }
+            ],
+            "resources": {
+              "requests": {
+                "cpu": 2,
+                "memoryInGB": 2
+              }
+            }
+          }
+        }
+      ]
+    },
+    "name": {
+      "value": "cicgmin001"
+    },
+    // Non-required parameters
+    "enableDefaultTelemetry": {
+      "value": "<enableDefaultTelemetry>"
+    },
+    "ipAddressPorts": {
+      "value": [
+        {
+          "port": 443,
+          "protocol": "Tcp"
+        }
+      ]
+    }
+  }
+}
+```
+
+</details>
+<p>
+
+### Example 3: _Encr_
 
 <details>
 
@@ -440,110 +544,6 @@ module containerGroup 'br:bicep/modules/container-instance.container-group:1.0.0
 </details>
 <p>
 
-### Example 3: _Using only defaults_
-
-This instance deploys the module with the minimum set of required parameters.
-
-
-<details>
-
-<summary>via Bicep module</summary>
-
-```bicep
-module containerGroup 'br:bicep/modules/container-instance.container-group:1.0.0' = {
-  name: '${uniqueString(deployment().name, location)}-test-cicgmin'
-  params: {
-    // Required parameters
-    containers: [
-      {
-        name: 'az-aci-x-001'
-        properties: {
-          image: 'mcr.microsoft.com/azuredocs/aci-helloworld'
-          ports: [
-            {
-              port: '443'
-              protocol: 'Tcp'
-            }
-          ]
-          resources: {
-            requests: {
-              cpu: 2
-              memoryInGB: 2
-            }
-          }
-        }
-      }
-    ]
-    name: 'cicgmin001'
-    // Non-required parameters
-    enableDefaultTelemetry: '<enableDefaultTelemetry>'
-    ipAddressPorts: [
-      {
-        port: 443
-        protocol: 'Tcp'
-      }
-    ]
-  }
-}
-```
-
-</details>
-<p>
-
-<details>
-
-<summary>via JSON Parameter file</summary>
-
-```json
-{
-  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    // Required parameters
-    "containers": {
-      "value": [
-        {
-          "name": "az-aci-x-001",
-          "properties": {
-            "image": "mcr.microsoft.com/azuredocs/aci-helloworld",
-            "ports": [
-              {
-                "port": "443",
-                "protocol": "Tcp"
-              }
-            ],
-            "resources": {
-              "requests": {
-                "cpu": 2,
-                "memoryInGB": 2
-              }
-            }
-          }
-        }
-      ]
-    },
-    "name": {
-      "value": "cicgmin001"
-    },
-    // Non-required parameters
-    "enableDefaultTelemetry": {
-      "value": "<enableDefaultTelemetry>"
-    },
-    "ipAddressPorts": {
-      "value": [
-        {
-          "port": 443,
-          "protocol": "Tcp"
-        }
-      ]
-    }
-  }
-}
-```
-
-</details>
-<p>
-
 ### Example 4: _Private_
 
 <details>
diff --git a/modules/container-registry/registry/README.md b/modules/container-registry/registry/README.md
index 15270996f2..4568b1acee 100644
--- a/modules/container-registry/registry/README.md
+++ b/modules/container-registry/registry/README.md
@@ -33,8 +33,8 @@ The following section provides usage examples for the module, which were used to
 >**Note**: To reference the module, please use the following syntax `br:bicep/modules/container-registry.registry:1.0.0`.
 
 - [Using large parameter set](#example-1-using-large-parameter-set)
-- [Encr](#example-2-encr)
-- [Using only defaults](#example-3-using-only-defaults)
+- [Using only defaults](#example-2-using-only-defaults)
+- [Encr](#example-3-encr)
 - [Pe](#example-4-pe)
 
 ### Example 1: _Using large parameter set_
@@ -293,7 +293,55 @@ module registry 'br:bicep/modules/container-registry.registry:1.0.0' = {
 </details>
 <p>
 
-### Example 2: _Encr_
+### Example 2: _Using only defaults_
+
+This instance deploys the module with the minimum set of required parameters.
+
+
+<details>
+
+<summary>via Bicep module</summary>
+
+```bicep
+module registry 'br:bicep/modules/container-registry.registry:1.0.0' = {
+  name: '${uniqueString(deployment().name, location)}-test-crrmin'
+  params: {
+    // Required parameters
+    name: 'crrmin001'
+    // Non-required parameters
+    enableDefaultTelemetry: '<enableDefaultTelemetry>'
+  }
+}
+```
+
+</details>
+<p>
+
+<details>
+
+<summary>via JSON Parameter file</summary>
+
+```json
+{
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    // Required parameters
+    "name": {
+      "value": "crrmin001"
+    },
+    // Non-required parameters
+    "enableDefaultTelemetry": {
+      "value": "<enableDefaultTelemetry>"
+    }
+  }
+}
+```
+
+</details>
+<p>
+
+### Example 3: _Encr_
 
 <details>
 
@@ -382,54 +430,6 @@ module registry 'br:bicep/modules/container-registry.registry:1.0.0' = {
 </details>
 <p>
 
-### Example 3: _Using only defaults_
-
-This instance deploys the module with the minimum set of required parameters.
-
-
-<details>
-
-<summary>via Bicep module</summary>
-
-```bicep
-module registry 'br:bicep/modules/container-registry.registry:1.0.0' = {
-  name: '${uniqueString(deployment().name, location)}-test-crrmin'
-  params: {
-    // Required parameters
-    name: 'crrmin001'
-    // Non-required parameters
-    enableDefaultTelemetry: '<enableDefaultTelemetry>'
-  }
-}
-```
-
-</details>
-<p>
-
-<details>
-
-<summary>via JSON Parameter file</summary>
-
-```json
-{
-  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    // Required parameters
-    "name": {
-      "value": "crrmin001"
-    },
-    // Non-required parameters
-    "enableDefaultTelemetry": {
-      "value": "<enableDefaultTelemetry>"
-    }
-  }
-}
-```
-
-</details>
-<p>
-
 ### Example 4: _Pe_
 
 <details>
diff --git a/modules/container-service/managed-cluster/README.md b/modules/container-service/managed-cluster/README.md
index f77784354b..f2de8470fa 100644
--- a/modules/container-service/managed-cluster/README.md
+++ b/modules/container-service/managed-cluster/README.md
@@ -32,8 +32,8 @@ The following section provides usage examples for the module, which were used to
 >**Note**: To reference the module, please use the following syntax `br:bicep/modules/container-service.managed-cluster:1.0.0`.
 
 - [Azure](#example-1-azure)
-- [Kubenet](#example-2-kubenet)
-- [Using only defaults](#example-3-using-only-defaults)
+- [Using only defaults](#example-2-using-only-defaults)
+- [Kubenet](#example-3-kubenet)
 - [Priv](#example-4-priv)
 
 ### Example 1: _Azure_
@@ -507,7 +507,81 @@ module managedCluster 'br:bicep/modules/container-service.managed-cluster:1.0.0'
 </details>
 <p>
 
-### Example 2: _Kubenet_
+### Example 2: _Using only defaults_
+
+This instance deploys the module with the minimum set of required parameters.
+
+
+<details>
+
+<summary>via Bicep module</summary>
+
+```bicep
+module managedCluster 'br:bicep/modules/container-service.managed-cluster:1.0.0' = {
+  name: '${uniqueString(deployment().name, location)}-test-csmmin'
+  params: {
+    // Required parameters
+    name: 'csmmin001'
+    primaryAgentPoolProfile: [
+      {
+        count: 1
+        mode: 'System'
+        name: 'systempool'
+        vmSize: 'Standard_DS2_v2'
+      }
+    ]
+    // Non-required parameters
+    enableDefaultTelemetry: '<enableDefaultTelemetry>'
+    managedIdentities: {
+      systemAssigned: true
+    }
+  }
+}
+```
+
+</details>
+<p>
+
+<details>
+
+<summary>via JSON Parameter file</summary>
+
+```json
+{
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    // Required parameters
+    "name": {
+      "value": "csmmin001"
+    },
+    "primaryAgentPoolProfile": {
+      "value": [
+        {
+          "count": 1,
+          "mode": "System",
+          "name": "systempool",
+          "vmSize": "Standard_DS2_v2"
+        }
+      ]
+    },
+    // Non-required parameters
+    "enableDefaultTelemetry": {
+      "value": "<enableDefaultTelemetry>"
+    },
+    "managedIdentities": {
+      "value": {
+        "systemAssigned": true
+      }
+    }
+  }
+}
+```
+
+</details>
+<p>
+
+### Example 3: _Kubenet_
 
 <details>
 
@@ -770,80 +844,6 @@ module managedCluster 'br:bicep/modules/container-service.managed-cluster:1.0.0'
 </details>
 <p>
 
-### Example 3: _Using only defaults_
-
-This instance deploys the module with the minimum set of required parameters.
-
-
-<details>
-
-<summary>via Bicep module</summary>
-
-```bicep
-module managedCluster 'br:bicep/modules/container-service.managed-cluster:1.0.0' = {
-  name: '${uniqueString(deployment().name, location)}-test-csmmin'
-  params: {
-    // Required parameters
-    name: 'csmmin001'
-    primaryAgentPoolProfile: [
-      {
-        count: 1
-        mode: 'System'
-        name: 'systempool'
-        vmSize: 'Standard_DS2_v2'
-      }
-    ]
-    // Non-required parameters
-    enableDefaultTelemetry: '<enableDefaultTelemetry>'
-    managedIdentities: {
-      systemAssigned: true
-    }
-  }
-}
-```
-
-</details>
-<p>
-
-<details>
-
-<summary>via JSON Parameter file</summary>
-
-```json
-{
-  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    // Required parameters
-    "name": {
-      "value": "csmmin001"
-    },
-    "primaryAgentPoolProfile": {
-      "value": [
-        {
-          "count": 1,
-          "mode": "System",
-          "name": "systempool",
-          "vmSize": "Standard_DS2_v2"
-        }
-      ]
-    },
-    // Non-required parameters
-    "enableDefaultTelemetry": {
-      "value": "<enableDefaultTelemetry>"
-    },
-    "managedIdentities": {
-      "value": {
-        "systemAssigned": true
-      }
-    }
-  }
-}
-```
-
-</details>
-<p>
-
 ### Example 4: _Priv_
 
 <details>
diff --git a/modules/event-hub/namespace/README.md b/modules/event-hub/namespace/README.md
index 1329fdd23e..6db9b87e84 100644
--- a/modules/event-hub/namespace/README.md
+++ b/modules/event-hub/namespace/README.md
@@ -36,8 +36,8 @@ The following section provides usage examples for the module, which were used to
 >**Note**: To reference the module, please use the following syntax `br:bicep/modules/event-hub.namespace:1.0.0`.
 
 - [Using large parameter set](#example-1-using-large-parameter-set)
-- [Encr](#example-2-encr)
-- [Using only defaults](#example-3-using-only-defaults)
+- [Using only defaults](#example-2-using-only-defaults)
+- [Encr](#example-3-encr)
 - [Pe](#example-4-pe)
 
 ### Example 1: _Using large parameter set_
@@ -436,7 +436,55 @@ module namespace 'br:bicep/modules/event-hub.namespace:1.0.0' = {
 </details>
 <p>
 
-### Example 2: _Encr_
+### Example 2: _Using only defaults_
+
+This instance deploys the module with the minimum set of required parameters.
+
+
+<details>
+
+<summary>via Bicep module</summary>
+
+```bicep
+module namespace 'br:bicep/modules/event-hub.namespace:1.0.0' = {
+  name: '${uniqueString(deployment().name, location)}-test-ehnmin'
+  params: {
+    // Required parameters
+    name: 'ehnmin001'
+    // Non-required parameters
+    enableDefaultTelemetry: '<enableDefaultTelemetry>'
+  }
+}
+```
+
+</details>
+<p>
+
+<details>
+
+<summary>via JSON Parameter file</summary>
+
+```json
+{
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    // Required parameters
+    "name": {
+      "value": "ehnmin001"
+    },
+    // Non-required parameters
+    "enableDefaultTelemetry": {
+      "value": "<enableDefaultTelemetry>"
+    }
+  }
+}
+```
+
+</details>
+<p>
+
+### Example 3: _Encr_
 
 <details>
 
@@ -531,54 +579,6 @@ module namespace 'br:bicep/modules/event-hub.namespace:1.0.0' = {
 </details>
 <p>
 
-### Example 3: _Using only defaults_
-
-This instance deploys the module with the minimum set of required parameters.
-
-
-<details>
-
-<summary>via Bicep module</summary>
-
-```bicep
-module namespace 'br:bicep/modules/event-hub.namespace:1.0.0' = {
-  name: '${uniqueString(deployment().name, location)}-test-ehnmin'
-  params: {
-    // Required parameters
-    name: 'ehnmin001'
-    // Non-required parameters
-    enableDefaultTelemetry: '<enableDefaultTelemetry>'
-  }
-}
-```
-
-</details>
-<p>
-
-<details>
-
-<summary>via JSON Parameter file</summary>
-
-```json
-{
-  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    // Required parameters
-    "name": {
-      "value": "ehnmin001"
-    },
-    // Non-required parameters
-    "enableDefaultTelemetry": {
-      "value": "<enableDefaultTelemetry>"
-    }
-  }
-}
-```
-
-</details>
-<p>
-
 ### Example 4: _Pe_
 
 <details>
diff --git a/modules/insights/data-collection-rule/README.md b/modules/insights/data-collection-rule/README.md
index 37edcaf1f4..d28c4145c7 100644
--- a/modules/insights/data-collection-rule/README.md
+++ b/modules/insights/data-collection-rule/README.md
@@ -29,8 +29,8 @@ The following section provides usage examples for the module, which were used to
 - [Customadv](#example-1-customadv)
 - [Custombasic](#example-2-custombasic)
 - [Customiis](#example-3-customiis)
-- [Linux](#example-4-linux)
-- [Using only defaults](#example-5-using-only-defaults)
+- [Using only defaults](#example-4-using-only-defaults)
+- [Linux](#example-5-linux)
 - [Windows](#example-6-windows)
 
 ### Example 1: _Customadv_
@@ -654,7 +654,141 @@ module dataCollectionRule 'br:bicep/modules/insights.data-collection-rule:1.0.0'
 </details>
 <p>
 
-### Example 4: _Linux_
+### Example 4: _Using only defaults_
+
+This instance deploys the module with the minimum set of required parameters.
+
+
+<details>
+
+<summary>via Bicep module</summary>
+
+```bicep
+module dataCollectionRule 'br:bicep/modules/insights.data-collection-rule:1.0.0' = {
+  name: '${uniqueString(deployment().name)}-test-idcrmin'
+  params: {
+    // Required parameters
+    dataFlows: [
+      {
+        destinations: [
+          'azureMonitorMetrics-default'
+        ]
+        streams: [
+          'Microsoft-InsightsMetrics'
+        ]
+      }
+    ]
+    dataSources: {
+      performanceCounters: [
+        {
+          counterSpecifiers: [
+            '\\Process(_Total)\\Handle Count'
+            '\\Process(_Total)\\Thread Count'
+            '\\Processor Information(_Total)\\% Privileged Time'
+            '\\Processor Information(_Total)\\% Processor Time'
+            '\\Processor Information(_Total)\\% User Time'
+            '\\Processor Information(_Total)\\Processor Frequency'
+            '\\System\\Context Switches/sec'
+            '\\System\\Processes'
+            '\\System\\Processor Queue Length'
+            '\\System\\System Up Time'
+          ]
+          name: 'perfCounterDataSource60'
+          samplingFrequencyInSeconds: 60
+          streams: [
+            'Microsoft-InsightsMetrics'
+          ]
+        }
+      ]
+    }
+    destinations: {
+      azureMonitorMetrics: {
+        name: 'azureMonitorMetrics-default'
+      }
+    }
+    name: 'idcrmin001'
+    // Non-required parameters
+    enableDefaultTelemetry: '<enableDefaultTelemetry>'
+    kind: 'Windows'
+  }
+}
+```
+
+</details>
+<p>
+
+<details>
+
+<summary>via JSON Parameter file</summary>
+
+```json
+{
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    // Required parameters
+    "dataFlows": {
+      "value": [
+        {
+          "destinations": [
+            "azureMonitorMetrics-default"
+          ],
+          "streams": [
+            "Microsoft-InsightsMetrics"
+          ]
+        }
+      ]
+    },
+    "dataSources": {
+      "value": {
+        "performanceCounters": [
+          {
+            "counterSpecifiers": [
+              "\\Process(_Total)\\Handle Count",
+              "\\Process(_Total)\\Thread Count",
+              "\\Processor Information(_Total)\\% Privileged Time",
+              "\\Processor Information(_Total)\\% Processor Time",
+              "\\Processor Information(_Total)\\% User Time",
+              "\\Processor Information(_Total)\\Processor Frequency",
+              "\\System\\Context Switches/sec",
+              "\\System\\Processes",
+              "\\System\\Processor Queue Length",
+              "\\System\\System Up Time"
+            ],
+            "name": "perfCounterDataSource60",
+            "samplingFrequencyInSeconds": 60,
+            "streams": [
+              "Microsoft-InsightsMetrics"
+            ]
+          }
+        ]
+      }
+    },
+    "destinations": {
+      "value": {
+        "azureMonitorMetrics": {
+          "name": "azureMonitorMetrics-default"
+        }
+      }
+    },
+    "name": {
+      "value": "idcrmin001"
+    },
+    // Non-required parameters
+    "enableDefaultTelemetry": {
+      "value": "<enableDefaultTelemetry>"
+    },
+    "kind": {
+      "value": "Windows"
+    }
+  }
+}
+```
+
+</details>
+<p>
+
+### Example 5: _Linux_
 
 <details>
 
@@ -1045,140 +1179,6 @@ module dataCollectionRule 'br:bicep/modules/insights.data-collection-rule:1.0.0'
 </details>
 <p>
 
-### Example 5: _Using only defaults_
-
-This instance deploys the module with the minimum set of required parameters.
-
-
-<details>
-
-<summary>via Bicep module</summary>
-
-```bicep
-module dataCollectionRule 'br:bicep/modules/insights.data-collection-rule:1.0.0' = {
-  name: '${uniqueString(deployment().name)}-test-idcrmin'
-  params: {
-    // Required parameters
-    dataFlows: [
-      {
-        destinations: [
-          'azureMonitorMetrics-default'
-        ]
-        streams: [
-          'Microsoft-InsightsMetrics'
-        ]
-      }
-    ]
-    dataSources: {
-      performanceCounters: [
-        {
-          counterSpecifiers: [
-            '\\Process(_Total)\\Handle Count'
-            '\\Process(_Total)\\Thread Count'
-            '\\Processor Information(_Total)\\% Privileged Time'
-            '\\Processor Information(_Total)\\% Processor Time'
-            '\\Processor Information(_Total)\\% User Time'
-            '\\Processor Information(_Total)\\Processor Frequency'
-            '\\System\\Context Switches/sec'
-            '\\System\\Processes'
-            '\\System\\Processor Queue Length'
-            '\\System\\System Up Time'
-          ]
-          name: 'perfCounterDataSource60'
-          samplingFrequencyInSeconds: 60
-          streams: [
-            'Microsoft-InsightsMetrics'
-          ]
-        }
-      ]
-    }
-    destinations: {
-      azureMonitorMetrics: {
-        name: 'azureMonitorMetrics-default'
-      }
-    }
-    name: 'idcrmin001'
-    // Non-required parameters
-    enableDefaultTelemetry: '<enableDefaultTelemetry>'
-    kind: 'Windows'
-  }
-}
-```
-
-</details>
-<p>
-
-<details>
-
-<summary>via JSON Parameter file</summary>
-
-```json
-{
-  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    // Required parameters
-    "dataFlows": {
-      "value": [
-        {
-          "destinations": [
-            "azureMonitorMetrics-default"
-          ],
-          "streams": [
-            "Microsoft-InsightsMetrics"
-          ]
-        }
-      ]
-    },
-    "dataSources": {
-      "value": {
-        "performanceCounters": [
-          {
-            "counterSpecifiers": [
-              "\\Process(_Total)\\Handle Count",
-              "\\Process(_Total)\\Thread Count",
-              "\\Processor Information(_Total)\\% Privileged Time",
-              "\\Processor Information(_Total)\\% Processor Time",
-              "\\Processor Information(_Total)\\% User Time",
-              "\\Processor Information(_Total)\\Processor Frequency",
-              "\\System\\Context Switches/sec",
-              "\\System\\Processes",
-              "\\System\\Processor Queue Length",
-              "\\System\\System Up Time"
-            ],
-            "name": "perfCounterDataSource60",
-            "samplingFrequencyInSeconds": 60,
-            "streams": [
-              "Microsoft-InsightsMetrics"
-            ]
-          }
-        ]
-      }
-    },
-    "destinations": {
-      "value": {
-        "azureMonitorMetrics": {
-          "name": "azureMonitorMetrics-default"
-        }
-      }
-    },
-    "name": {
-      "value": "idcrmin001"
-    },
-    // Non-required parameters
-    "enableDefaultTelemetry": {
-      "value": "<enableDefaultTelemetry>"
-    },
-    "kind": {
-      "value": "Windows"
-    }
-  }
-}
-```
-
-</details>
-<p>
-
 ### Example 6: _Windows_
 
 <details>
diff --git a/modules/machine-learning-services/workspace/README.md b/modules/machine-learning-services/workspace/README.md
index c52e09855d..614646f1ef 100644
--- a/modules/machine-learning-services/workspace/README.md
+++ b/modules/machine-learning-services/workspace/README.md
@@ -32,8 +32,8 @@ The following section provides usage examples for the module, which were used to
 >**Note**: To reference the module, please use the following syntax `br:bicep/modules/machine-learning-services.workspace:1.0.0`.
 
 - [Using large parameter set](#example-1-using-large-parameter-set)
-- [Encr](#example-2-encr)
-- [Using only defaults](#example-3-using-only-defaults)
+- [Using only defaults](#example-2-using-only-defaults)
+- [Encr](#example-3-encr)
 
 ### Example 1: _Using large parameter set_
 
@@ -287,7 +287,79 @@ module workspace 'br:bicep/modules/machine-learning-services.workspace:1.0.0' =
 </details>
 <p>
 
-### Example 2: _Encr_
+### Example 2: _Using only defaults_
+
+This instance deploys the module with the minimum set of required parameters.
+
+
+<details>
+
+<summary>via Bicep module</summary>
+
+```bicep
+module workspace 'br:bicep/modules/machine-learning-services.workspace:1.0.0' = {
+  name: '${uniqueString(deployment().name, location)}-test-mlswmin'
+  params: {
+    // Required parameters
+    associatedApplicationInsightsResourceId: '<associatedApplicationInsightsResourceId>'
+    associatedKeyVaultResourceId: '<associatedKeyVaultResourceId>'
+    associatedStorageAccountResourceId: '<associatedStorageAccountResourceId>'
+    name: 'mlswmin001'
+    sku: 'Basic'
+    // Non-required parameters
+    enableDefaultTelemetry: '<enableDefaultTelemetry>'
+    managedIdentities: {
+      systemAssigned: true
+    }
+  }
+}
+```
+
+</details>
+<p>
+
+<details>
+
+<summary>via JSON Parameter file</summary>
+
+```json
+{
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    // Required parameters
+    "associatedApplicationInsightsResourceId": {
+      "value": "<associatedApplicationInsightsResourceId>"
+    },
+    "associatedKeyVaultResourceId": {
+      "value": "<associatedKeyVaultResourceId>"
+    },
+    "associatedStorageAccountResourceId": {
+      "value": "<associatedStorageAccountResourceId>"
+    },
+    "name": {
+      "value": "mlswmin001"
+    },
+    "sku": {
+      "value": "Basic"
+    },
+    // Non-required parameters
+    "enableDefaultTelemetry": {
+      "value": "<enableDefaultTelemetry>"
+    },
+    "managedIdentities": {
+      "value": {
+        "systemAssigned": true
+      }
+    }
+  }
+}
+```
+
+</details>
+<p>
+
+### Example 3: _Encr_
 
 <details>
 
@@ -420,78 +492,6 @@ module workspace 'br:bicep/modules/machine-learning-services.workspace:1.0.0' =
 </details>
 <p>
 
-### Example 3: _Using only defaults_
-
-This instance deploys the module with the minimum set of required parameters.
-
-
-<details>
-
-<summary>via Bicep module</summary>
-
-```bicep
-module workspace 'br:bicep/modules/machine-learning-services.workspace:1.0.0' = {
-  name: '${uniqueString(deployment().name, location)}-test-mlswmin'
-  params: {
-    // Required parameters
-    associatedApplicationInsightsResourceId: '<associatedApplicationInsightsResourceId>'
-    associatedKeyVaultResourceId: '<associatedKeyVaultResourceId>'
-    associatedStorageAccountResourceId: '<associatedStorageAccountResourceId>'
-    name: 'mlswmin001'
-    sku: 'Basic'
-    // Non-required parameters
-    enableDefaultTelemetry: '<enableDefaultTelemetry>'
-    managedIdentities: {
-      systemAssigned: true
-    }
-  }
-}
-```
-
-</details>
-<p>
-
-<details>
-
-<summary>via JSON Parameter file</summary>
-
-```json
-{
-  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    // Required parameters
-    "associatedApplicationInsightsResourceId": {
-      "value": "<associatedApplicationInsightsResourceId>"
-    },
-    "associatedKeyVaultResourceId": {
-      "value": "<associatedKeyVaultResourceId>"
-    },
-    "associatedStorageAccountResourceId": {
-      "value": "<associatedStorageAccountResourceId>"
-    },
-    "name": {
-      "value": "mlswmin001"
-    },
-    "sku": {
-      "value": "Basic"
-    },
-    // Non-required parameters
-    "enableDefaultTelemetry": {
-      "value": "<enableDefaultTelemetry>"
-    },
-    "managedIdentities": {
-      "value": {
-        "systemAssigned": true
-      }
-    }
-  }
-}
-```
-
-</details>
-<p>
-
 
 ## Parameters
 
diff --git a/modules/network/azure-firewall/README.md b/modules/network/azure-firewall/README.md
index c58b8068b9..f5d0409b80 100644
--- a/modules/network/azure-firewall/README.md
+++ b/modules/network/azure-firewall/README.md
@@ -31,9 +31,9 @@ The following section provides usage examples for the module, which were used to
 - [Addpip](#example-1-addpip)
 - [Using large parameter set](#example-2-using-large-parameter-set)
 - [Custompip](#example-3-custompip)
-- [Hubcommon](#example-4-hubcommon)
-- [Hubmin](#example-5-hubmin)
-- [Using only defaults](#example-6-using-only-defaults)
+- [Using only defaults](#example-4-using-only-defaults)
+- [Hubcommon](#example-5-hubcommon)
+- [Hubmin](#example-6-hubmin)
 
 ### Example 1: _Addpip_
 
@@ -557,7 +557,10 @@ module azureFirewall 'br:bicep/modules/network.azure-firewall:1.0.0' = {
 </details>
 <p>
 
-### Example 4: _Hubcommon_
+### Example 4: _Using only defaults_
+
+This instance deploys the module with the minimum set of required parameters.
+
 
 <details>
 
@@ -565,24 +568,13 @@ module azureFirewall 'br:bicep/modules/network.azure-firewall:1.0.0' = {
 
 ```bicep
 module azureFirewall 'br:bicep/modules/network.azure-firewall:1.0.0' = {
-  name: '${uniqueString(deployment().name, location)}-test-nafhubcom'
+  name: '${uniqueString(deployment().name, location)}-test-nafmin'
   params: {
     // Required parameters
-    name: 'nafhubcom001'
+    name: 'nafmin001'
     // Non-required parameters
     enableDefaultTelemetry: '<enableDefaultTelemetry>'
-    firewallPolicyId: '<firewallPolicyId>'
-    hubIPAddresses: {
-      publicIPs: {
-        count: 1
-      }
-    }
-    tags: {
-      Environment: 'Non-Prod'
-      'hidden-title': 'This is visible in the resource name'
-      Role: 'DeploymentValidation'
-    }
-    virtualHubId: '<virtualHubId>'
+    vNetId: '<vNetId>'
   }
 }
 ```
@@ -601,31 +593,14 @@ module azureFirewall 'br:bicep/modules/network.azure-firewall:1.0.0' = {
   "parameters": {
     // Required parameters
     "name": {
-      "value": "nafhubcom001"
+      "value": "nafmin001"
     },
     // Non-required parameters
     "enableDefaultTelemetry": {
       "value": "<enableDefaultTelemetry>"
     },
-    "firewallPolicyId": {
-      "value": "<firewallPolicyId>"
-    },
-    "hubIPAddresses": {
-      "value": {
-        "publicIPs": {
-          "count": 1
-        }
-      }
-    },
-    "tags": {
-      "value": {
-        "Environment": "Non-Prod",
-        "hidden-title": "This is visible in the resource name",
-        "Role": "DeploymentValidation"
-      }
-    },
-    "virtualHubId": {
-      "value": "<virtualHubId>"
+    "vNetId": {
+      "value": "<vNetId>"
     }
   }
 }
@@ -634,7 +609,7 @@ module azureFirewall 'br:bicep/modules/network.azure-firewall:1.0.0' = {
 </details>
 <p>
 
-### Example 5: _Hubmin_
+### Example 5: _Hubcommon_
 
 <details>
 
@@ -642,17 +617,23 @@ module azureFirewall 'br:bicep/modules/network.azure-firewall:1.0.0' = {
 
 ```bicep
 module azureFirewall 'br:bicep/modules/network.azure-firewall:1.0.0' = {
-  name: '${uniqueString(deployment().name, location)}-test-nafhubmin'
+  name: '${uniqueString(deployment().name, location)}-test-nafhubcom'
   params: {
     // Required parameters
-    name: 'nafhubmin001'
+    name: 'nafhubcom001'
     // Non-required parameters
     enableDefaultTelemetry: '<enableDefaultTelemetry>'
+    firewallPolicyId: '<firewallPolicyId>'
     hubIPAddresses: {
       publicIPs: {
         count: 1
       }
     }
+    tags: {
+      Environment: 'Non-Prod'
+      'hidden-title': 'This is visible in the resource name'
+      Role: 'DeploymentValidation'
+    }
     virtualHubId: '<virtualHubId>'
   }
 }
@@ -672,12 +653,15 @@ module azureFirewall 'br:bicep/modules/network.azure-firewall:1.0.0' = {
   "parameters": {
     // Required parameters
     "name": {
-      "value": "nafhubmin001"
+      "value": "nafhubcom001"
     },
     // Non-required parameters
     "enableDefaultTelemetry": {
       "value": "<enableDefaultTelemetry>"
     },
+    "firewallPolicyId": {
+      "value": "<firewallPolicyId>"
+    },
     "hubIPAddresses": {
       "value": {
         "publicIPs": {
@@ -685,6 +669,13 @@ module azureFirewall 'br:bicep/modules/network.azure-firewall:1.0.0' = {
         }
       }
     },
+    "tags": {
+      "value": {
+        "Environment": "Non-Prod",
+        "hidden-title": "This is visible in the resource name",
+        "Role": "DeploymentValidation"
+      }
+    },
     "virtualHubId": {
       "value": "<virtualHubId>"
     }
@@ -695,10 +686,7 @@ module azureFirewall 'br:bicep/modules/network.azure-firewall:1.0.0' = {
 </details>
 <p>
 
-### Example 6: _Using only defaults_
-
-This instance deploys the module with the minimum set of required parameters.
-
+### Example 6: _Hubmin_
 
 <details>
 
@@ -706,13 +694,18 @@ This instance deploys the module with the minimum set of required parameters.
 
 ```bicep
 module azureFirewall 'br:bicep/modules/network.azure-firewall:1.0.0' = {
-  name: '${uniqueString(deployment().name, location)}-test-nafmin'
+  name: '${uniqueString(deployment().name, location)}-test-nafhubmin'
   params: {
     // Required parameters
-    name: 'nafmin001'
+    name: 'nafhubmin001'
     // Non-required parameters
     enableDefaultTelemetry: '<enableDefaultTelemetry>'
-    vNetId: '<vNetId>'
+    hubIPAddresses: {
+      publicIPs: {
+        count: 1
+      }
+    }
+    virtualHubId: '<virtualHubId>'
   }
 }
 ```
@@ -731,14 +724,21 @@ module azureFirewall 'br:bicep/modules/network.azure-firewall:1.0.0' = {
   "parameters": {
     // Required parameters
     "name": {
-      "value": "nafmin001"
+      "value": "nafhubmin001"
     },
     // Non-required parameters
     "enableDefaultTelemetry": {
       "value": "<enableDefaultTelemetry>"
     },
-    "vNetId": {
-      "value": "<vNetId>"
+    "hubIPAddresses": {
+      "value": {
+        "publicIPs": {
+          "count": 1
+        }
+      }
+    },
+    "virtualHubId": {
+      "value": "<virtualHubId>"
     }
   }
 }
diff --git a/modules/network/load-balancer/README.md b/modules/network/load-balancer/README.md
index f6c2ff8e44..21fc7daf46 100644
--- a/modules/network/load-balancer/README.md
+++ b/modules/network/load-balancer/README.md
@@ -31,8 +31,8 @@ The following section provides usage examples for the module, which were used to
 >**Note**: To reference the module, please use the following syntax `br:bicep/modules/network.load-balancer:1.0.0`.
 
 - [Using large parameter set](#example-1-using-large-parameter-set)
-- [Internal](#example-2-internal)
-- [Using only defaults](#example-3-using-only-defaults)
+- [Using only defaults](#example-2-using-only-defaults)
+- [Internal](#example-3-internal)
 
 ### Example 1: _Using large parameter set_
 
@@ -322,7 +322,69 @@ module loadBalancer 'br:bicep/modules/network.load-balancer:1.0.0' = {
 </details>
 <p>
 
-### Example 2: _Internal_
+### Example 2: _Using only defaults_
+
+This instance deploys the module with the minimum set of required parameters.
+
+
+<details>
+
+<summary>via Bicep module</summary>
+
+```bicep
+module loadBalancer 'br:bicep/modules/network.load-balancer:1.0.0' = {
+  name: '${uniqueString(deployment().name, location)}-test-nlbmin'
+  params: {
+    // Required parameters
+    frontendIPConfigurations: [
+      {
+        name: 'publicIPConfig1'
+        publicIPAddressId: '<publicIPAddressId>'
+      }
+    ]
+    name: 'nlbmin001'
+    // Non-required parameters
+    enableDefaultTelemetry: '<enableDefaultTelemetry>'
+  }
+}
+```
+
+</details>
+<p>
+
+<details>
+
+<summary>via JSON Parameter file</summary>
+
+```json
+{
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    // Required parameters
+    "frontendIPConfigurations": {
+      "value": [
+        {
+          "name": "publicIPConfig1",
+          "publicIPAddressId": "<publicIPAddressId>"
+        }
+      ]
+    },
+    "name": {
+      "value": "nlbmin001"
+    },
+    // Non-required parameters
+    "enableDefaultTelemetry": {
+      "value": "<enableDefaultTelemetry>"
+    }
+  }
+}
+```
+
+</details>
+<p>
+
+### Example 3: _Internal_
 
 <details>
 
@@ -547,68 +609,6 @@ module loadBalancer 'br:bicep/modules/network.load-balancer:1.0.0' = {
 </details>
 <p>
 
-### Example 3: _Using only defaults_
-
-This instance deploys the module with the minimum set of required parameters.
-
-
-<details>
-
-<summary>via Bicep module</summary>
-
-```bicep
-module loadBalancer 'br:bicep/modules/network.load-balancer:1.0.0' = {
-  name: '${uniqueString(deployment().name, location)}-test-nlbmin'
-  params: {
-    // Required parameters
-    frontendIPConfigurations: [
-      {
-        name: 'publicIPConfig1'
-        publicIPAddressId: '<publicIPAddressId>'
-      }
-    ]
-    name: 'nlbmin001'
-    // Non-required parameters
-    enableDefaultTelemetry: '<enableDefaultTelemetry>'
-  }
-}
-```
-
-</details>
-<p>
-
-<details>
-
-<summary>via JSON Parameter file</summary>
-
-```json
-{
-  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    // Required parameters
-    "frontendIPConfigurations": {
-      "value": [
-        {
-          "name": "publicIPConfig1",
-          "publicIPAddressId": "<publicIPAddressId>"
-        }
-      ]
-    },
-    "name": {
-      "value": "nlbmin001"
-    },
-    // Non-required parameters
-    "enableDefaultTelemetry": {
-      "value": "<enableDefaultTelemetry>"
-    }
-  }
-}
-```
-
-</details>
-<p>
-
 
 ## Parameters
 
diff --git a/modules/recovery-services/vault/README.md b/modules/recovery-services/vault/README.md
index dbc5f018a3..1cf6b13205 100644
--- a/modules/recovery-services/vault/README.md
+++ b/modules/recovery-services/vault/README.md
@@ -40,8 +40,8 @@ The following section provides usage examples for the module, which were used to
 >**Note**: To reference the module, please use the following syntax `br:bicep/modules/recovery-services.vault:1.0.0`.
 
 - [Using large parameter set](#example-1-using-large-parameter-set)
-- [Dr](#example-2-dr)
-- [Using only defaults](#example-3-using-only-defaults)
+- [Using only defaults](#example-2-using-only-defaults)
+- [Dr](#example-3-dr)
 
 ### Example 1: _Using large parameter set_
 
@@ -729,7 +729,55 @@ module vault 'br:bicep/modules/recovery-services.vault:1.0.0' = {
 </details>
 <p>
 
-### Example 2: _Dr_
+### Example 2: _Using only defaults_
+
+This instance deploys the module with the minimum set of required parameters.
+
+
+<details>
+
+<summary>via Bicep module</summary>
+
+```bicep
+module vault 'br:bicep/modules/recovery-services.vault:1.0.0' = {
+  name: '${uniqueString(deployment().name, location)}-test-rsvmin'
+  params: {
+    // Required parameters
+    name: 'rsvmin001'
+    // Non-required parameters
+    enableDefaultTelemetry: '<enableDefaultTelemetry>'
+  }
+}
+```
+
+</details>
+<p>
+
+<details>
+
+<summary>via JSON Parameter file</summary>
+
+```json
+{
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    // Required parameters
+    "name": {
+      "value": "rsvmin001"
+    },
+    // Non-required parameters
+    "enableDefaultTelemetry": {
+      "value": "<enableDefaultTelemetry>"
+    }
+  }
+}
+```
+
+</details>
+<p>
+
+### Example 3: _Dr_
 
 <details>
 
@@ -900,54 +948,6 @@ module vault 'br:bicep/modules/recovery-services.vault:1.0.0' = {
 </details>
 <p>
 
-### Example 3: _Using only defaults_
-
-This instance deploys the module with the minimum set of required parameters.
-
-
-<details>
-
-<summary>via Bicep module</summary>
-
-```bicep
-module vault 'br:bicep/modules/recovery-services.vault:1.0.0' = {
-  name: '${uniqueString(deployment().name, location)}-test-rsvmin'
-  params: {
-    // Required parameters
-    name: 'rsvmin001'
-    // Non-required parameters
-    enableDefaultTelemetry: '<enableDefaultTelemetry>'
-  }
-}
-```
-
-</details>
-<p>
-
-<details>
-
-<summary>via JSON Parameter file</summary>
-
-```json
-{
-  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    // Required parameters
-    "name": {
-      "value": "rsvmin001"
-    },
-    // Non-required parameters
-    "enableDefaultTelemetry": {
-      "value": "<enableDefaultTelemetry>"
-    }
-  }
-}
-```
-
-</details>
-<p>
-
 
 ## Parameters
 
diff --git a/modules/service-bus/namespace/README.md b/modules/service-bus/namespace/README.md
index bd23507761..924bde7a97 100644
--- a/modules/service-bus/namespace/README.md
+++ b/modules/service-bus/namespace/README.md
@@ -38,8 +38,8 @@ The following section provides usage examples for the module, which were used to
 >**Note**: To reference the module, please use the following syntax `br:bicep/modules/service-bus.namespace:1.0.0`.
 
 - [Using large parameter set](#example-1-using-large-parameter-set)
-- [Encr](#example-2-encr)
-- [Using only defaults](#example-3-using-only-defaults)
+- [Using only defaults](#example-2-using-only-defaults)
+- [Encr](#example-3-encr)
 - [Pe](#example-4-pe)
 
 ### Example 1: _Using large parameter set_
@@ -432,7 +432,55 @@ module namespace 'br:bicep/modules/service-bus.namespace:1.0.0' = {
 </details>
 <p>
 
-### Example 2: _Encr_
+### Example 2: _Using only defaults_
+
+This instance deploys the module with the minimum set of required parameters.
+
+
+<details>
+
+<summary>via Bicep module</summary>
+
+```bicep
+module namespace 'br:bicep/modules/service-bus.namespace:1.0.0' = {
+  name: '${uniqueString(deployment().name, location)}-test-sbnmin'
+  params: {
+    // Required parameters
+    name: 'sbnmin001'
+    // Non-required parameters
+    enableDefaultTelemetry: '<enableDefaultTelemetry>'
+  }
+}
+```
+
+</details>
+<p>
+
+<details>
+
+<summary>via JSON Parameter file</summary>
+
+```json
+{
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    // Required parameters
+    "name": {
+      "value": "sbnmin001"
+    },
+    // Non-required parameters
+    "enableDefaultTelemetry": {
+      "value": "<enableDefaultTelemetry>"
+    }
+  }
+}
+```
+
+</details>
+<p>
+
+### Example 3: _Encr_
 
 <details>
 
@@ -613,54 +661,6 @@ module namespace 'br:bicep/modules/service-bus.namespace:1.0.0' = {
 </details>
 <p>
 
-### Example 3: _Using only defaults_
-
-This instance deploys the module with the minimum set of required parameters.
-
-
-<details>
-
-<summary>via Bicep module</summary>
-
-```bicep
-module namespace 'br:bicep/modules/service-bus.namespace:1.0.0' = {
-  name: '${uniqueString(deployment().name, location)}-test-sbnmin'
-  params: {
-    // Required parameters
-    name: 'sbnmin001'
-    // Non-required parameters
-    enableDefaultTelemetry: '<enableDefaultTelemetry>'
-  }
-}
-```
-
-</details>
-<p>
-
-<details>
-
-<summary>via JSON Parameter file</summary>
-
-```json
-{
-  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    // Required parameters
-    "name": {
-      "value": "sbnmin001"
-    },
-    // Non-required parameters
-    "enableDefaultTelemetry": {
-      "value": "<enableDefaultTelemetry>"
-    }
-  }
-}
-```
-
-</details>
-<p>
-
 ### Example 4: _Pe_
 
 <details>
diff --git a/modules/storage/storage-account/README.md b/modules/storage/storage-account/README.md
index 01647f91e5..87e05dea85 100644
--- a/modules/storage/storage-account/README.md
+++ b/modules/storage/storage-account/README.md
@@ -42,8 +42,8 @@ The following section provides usage examples for the module, which were used to
 >**Note**: To reference the module, please use the following syntax `br:bicep/modules/storage.storage-account:1.0.0`.
 
 - [Using large parameter set](#example-1-using-large-parameter-set)
-- [Encr](#example-2-encr)
-- [Using only defaults](#example-3-using-only-defaults)
+- [Using only defaults](#example-2-using-only-defaults)
+- [Encr](#example-3-encr)
 - [Nfs](#example-4-nfs)
 - [V1](#example-5-v1)
 
@@ -661,7 +661,59 @@ module storageAccount 'br:bicep/modules/storage.storage-account:1.0.0' = {
 </details>
 <p>
 
-### Example 2: _Encr_
+### Example 2: _Using only defaults_
+
+This instance deploys the module with the minimum set of required parameters.
+
+
+<details>
+
+<summary>via Bicep module</summary>
+
+```bicep
+module storageAccount 'br:bicep/modules/storage.storage-account:1.0.0' = {
+  name: '${uniqueString(deployment().name, location)}-test-ssamin'
+  params: {
+    // Required parameters
+    name: 'ssamin001'
+    // Non-required parameters
+    allowBlobPublicAccess: false
+    enableDefaultTelemetry: '<enableDefaultTelemetry>'
+  }
+}
+```
+
+</details>
+<p>
+
+<details>
+
+<summary>via JSON Parameter file</summary>
+
+```json
+{
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    // Required parameters
+    "name": {
+      "value": "ssamin001"
+    },
+    // Non-required parameters
+    "allowBlobPublicAccess": {
+      "value": false
+    },
+    "enableDefaultTelemetry": {
+      "value": "<enableDefaultTelemetry>"
+    }
+  }
+}
+```
+
+</details>
+<p>
+
+### Example 3: _Encr_
 
 <details>
 
@@ -830,58 +882,6 @@ module storageAccount 'br:bicep/modules/storage.storage-account:1.0.0' = {
 </details>
 <p>
 
-### Example 3: _Using only defaults_
-
-This instance deploys the module with the minimum set of required parameters.
-
-
-<details>
-
-<summary>via Bicep module</summary>
-
-```bicep
-module storageAccount 'br:bicep/modules/storage.storage-account:1.0.0' = {
-  name: '${uniqueString(deployment().name, location)}-test-ssamin'
-  params: {
-    // Required parameters
-    name: 'ssamin001'
-    // Non-required parameters
-    allowBlobPublicAccess: false
-    enableDefaultTelemetry: '<enableDefaultTelemetry>'
-  }
-}
-```
-
-</details>
-<p>
-
-<details>
-
-<summary>via JSON Parameter file</summary>
-
-```json
-{
-  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    // Required parameters
-    "name": {
-      "value": "ssamin001"
-    },
-    // Non-required parameters
-    "allowBlobPublicAccess": {
-      "value": false
-    },
-    "enableDefaultTelemetry": {
-      "value": "<enableDefaultTelemetry>"
-    }
-  }
-}
-```
-
-</details>
-<p>
-
 ### Example 4: _Nfs_
 
 <details>
diff --git a/modules/synapse/workspace/README.md b/modules/synapse/workspace/README.md
index 903f30470b..3b067e5ac2 100644
--- a/modules/synapse/workspace/README.md
+++ b/modules/synapse/workspace/README.md
@@ -33,10 +33,10 @@ The following section provides usage examples for the module, which were used to
 >**Note**: To reference the module, please use the following syntax `br:bicep/modules/synapse.workspace:1.0.0`.
 
 - [Using large parameter set](#example-1-using-large-parameter-set)
-- [Encrwsai](#example-2-encrwsai)
-- [Encrwuai](#example-3-encrwuai)
-- [Managedvnet](#example-4-managedvnet)
-- [Using only defaults](#example-5-using-only-defaults)
+- [Using only defaults](#example-2-using-only-defaults)
+- [Encrwsai](#example-3-encrwsai)
+- [Encrwuai](#example-4-encrwuai)
+- [Managedvnet](#example-5-managedvnet)
 
 ### Example 1: _Using large parameter set_
 
@@ -210,7 +210,10 @@ module workspace 'br:bicep/modules/synapse.workspace:1.0.0' = {
 </details>
 <p>
 
-### Example 2: _Encrwsai_
+### Example 2: _Using only defaults_
+
+This instance deploys the module with the minimum set of required parameters.
+
 
 <details>
 
@@ -218,20 +221,15 @@ module workspace 'br:bicep/modules/synapse.workspace:1.0.0' = {
 
 ```bicep
 module workspace 'br:bicep/modules/synapse.workspace:1.0.0' = {
-  name: '${uniqueString(deployment().name, location)}-test-swensa'
+  name: '${uniqueString(deployment().name, location)}-test-swmin'
   params: {
     // Required parameters
     defaultDataLakeStorageAccountResourceId: '<defaultDataLakeStorageAccountResourceId>'
     defaultDataLakeStorageFilesystem: '<defaultDataLakeStorageFilesystem>'
-    name: 'swensa001'
+    name: 'swmin001'
     sqlAdministratorLogin: 'synwsadmin'
     // Non-required parameters
-    customerManagedKey: {
-      keyName: '<keyName>'
-      keyVaultResourceId: '<keyVaultResourceId>'
-    }
     enableDefaultTelemetry: '<enableDefaultTelemetry>'
-    encryptionActivateWorkspace: true
   }
 }
 ```
@@ -256,23 +254,14 @@ module workspace 'br:bicep/modules/synapse.workspace:1.0.0' = {
       "value": "<defaultDataLakeStorageFilesystem>"
     },
     "name": {
-      "value": "swensa001"
+      "value": "swmin001"
     },
     "sqlAdministratorLogin": {
       "value": "synwsadmin"
     },
     // Non-required parameters
-    "customerManagedKey": {
-      "value": {
-        "keyName": "<keyName>",
-        "keyVaultResourceId": "<keyVaultResourceId>"
-      }
-    },
     "enableDefaultTelemetry": {
       "value": "<enableDefaultTelemetry>"
-    },
-    "encryptionActivateWorkspace": {
-      "value": true
     }
   }
 }
@@ -281,7 +270,7 @@ module workspace 'br:bicep/modules/synapse.workspace:1.0.0' = {
 </details>
 <p>
 
-### Example 3: _Encrwuai_
+### Example 3: _Encrwsai_
 
 <details>
 
@@ -289,25 +278,20 @@ module workspace 'br:bicep/modules/synapse.workspace:1.0.0' = {
 
 ```bicep
 module workspace 'br:bicep/modules/synapse.workspace:1.0.0' = {
-  name: '${uniqueString(deployment().name, location)}-test-swenua'
+  name: '${uniqueString(deployment().name, location)}-test-swensa'
   params: {
     // Required parameters
     defaultDataLakeStorageAccountResourceId: '<defaultDataLakeStorageAccountResourceId>'
     defaultDataLakeStorageFilesystem: '<defaultDataLakeStorageFilesystem>'
-    name: 'swenua001'
+    name: 'swensa001'
     sqlAdministratorLogin: 'synwsadmin'
     // Non-required parameters
     customerManagedKey: {
       keyName: '<keyName>'
       keyVaultResourceId: '<keyVaultResourceId>'
-      userAssignedIdentityResourceId: '<userAssignedIdentityResourceId>'
     }
     enableDefaultTelemetry: '<enableDefaultTelemetry>'
-    tags: {
-      Environment: 'Non-Prod'
-      'hidden-title': 'This is visible in the resource name'
-      Role: 'DeploymentValidation'
-    }
+    encryptionActivateWorkspace: true
   }
 }
 ```
@@ -332,7 +316,7 @@ module workspace 'br:bicep/modules/synapse.workspace:1.0.0' = {
       "value": "<defaultDataLakeStorageFilesystem>"
     },
     "name": {
-      "value": "swenua001"
+      "value": "swensa001"
     },
     "sqlAdministratorLogin": {
       "value": "synwsadmin"
@@ -341,19 +325,14 @@ module workspace 'br:bicep/modules/synapse.workspace:1.0.0' = {
     "customerManagedKey": {
       "value": {
         "keyName": "<keyName>",
-        "keyVaultResourceId": "<keyVaultResourceId>",
-        "userAssignedIdentityResourceId": "<userAssignedIdentityResourceId>"
+        "keyVaultResourceId": "<keyVaultResourceId>"
       }
     },
     "enableDefaultTelemetry": {
       "value": "<enableDefaultTelemetry>"
     },
-    "tags": {
-      "value": {
-        "Environment": "Non-Prod",
-        "hidden-title": "This is visible in the resource name",
-        "Role": "DeploymentValidation"
-      }
+    "encryptionActivateWorkspace": {
+      "value": true
     }
   }
 }
@@ -362,7 +341,7 @@ module workspace 'br:bicep/modules/synapse.workspace:1.0.0' = {
 </details>
 <p>
 
-### Example 4: _Managedvnet_
+### Example 4: _Encrwuai_
 
 <details>
 
@@ -370,20 +349,20 @@ module workspace 'br:bicep/modules/synapse.workspace:1.0.0' = {
 
 ```bicep
 module workspace 'br:bicep/modules/synapse.workspace:1.0.0' = {
-  name: '${uniqueString(deployment().name, location)}-test-swmanv'
+  name: '${uniqueString(deployment().name, location)}-test-swenua'
   params: {
     // Required parameters
     defaultDataLakeStorageAccountResourceId: '<defaultDataLakeStorageAccountResourceId>'
     defaultDataLakeStorageFilesystem: '<defaultDataLakeStorageFilesystem>'
-    name: 'swmanv001'
+    name: 'swenua001'
     sqlAdministratorLogin: 'synwsadmin'
     // Non-required parameters
-    allowedAadTenantIdsForLinking: [
-      '<tenantId>'
-    ]
+    customerManagedKey: {
+      keyName: '<keyName>'
+      keyVaultResourceId: '<keyVaultResourceId>'
+      userAssignedIdentityResourceId: '<userAssignedIdentityResourceId>'
+    }
     enableDefaultTelemetry: '<enableDefaultTelemetry>'
-    managedVirtualNetwork: true
-    preventDataExfiltration: true
     tags: {
       Environment: 'Non-Prod'
       'hidden-title': 'This is visible in the resource name'
@@ -413,26 +392,22 @@ module workspace 'br:bicep/modules/synapse.workspace:1.0.0' = {
       "value": "<defaultDataLakeStorageFilesystem>"
     },
     "name": {
-      "value": "swmanv001"
+      "value": "swenua001"
     },
     "sqlAdministratorLogin": {
       "value": "synwsadmin"
     },
     // Non-required parameters
-    "allowedAadTenantIdsForLinking": {
-      "value": [
-        "<tenantId>"
-      ]
+    "customerManagedKey": {
+      "value": {
+        "keyName": "<keyName>",
+        "keyVaultResourceId": "<keyVaultResourceId>",
+        "userAssignedIdentityResourceId": "<userAssignedIdentityResourceId>"
+      }
     },
     "enableDefaultTelemetry": {
       "value": "<enableDefaultTelemetry>"
     },
-    "managedVirtualNetwork": {
-      "value": true
-    },
-    "preventDataExfiltration": {
-      "value": true
-    },
     "tags": {
       "value": {
         "Environment": "Non-Prod",
@@ -447,10 +422,7 @@ module workspace 'br:bicep/modules/synapse.workspace:1.0.0' = {
 </details>
 <p>
 
-### Example 5: _Using only defaults_
-
-This instance deploys the module with the minimum set of required parameters.
-
+### Example 5: _Managedvnet_
 
 <details>
 
@@ -458,15 +430,25 @@ This instance deploys the module with the minimum set of required parameters.
 
 ```bicep
 module workspace 'br:bicep/modules/synapse.workspace:1.0.0' = {
-  name: '${uniqueString(deployment().name, location)}-test-swmin'
+  name: '${uniqueString(deployment().name, location)}-test-swmanv'
   params: {
     // Required parameters
     defaultDataLakeStorageAccountResourceId: '<defaultDataLakeStorageAccountResourceId>'
     defaultDataLakeStorageFilesystem: '<defaultDataLakeStorageFilesystem>'
-    name: 'swmin001'
+    name: 'swmanv001'
     sqlAdministratorLogin: 'synwsadmin'
     // Non-required parameters
+    allowedAadTenantIdsForLinking: [
+      '<tenantId>'
+    ]
     enableDefaultTelemetry: '<enableDefaultTelemetry>'
+    managedVirtualNetwork: true
+    preventDataExfiltration: true
+    tags: {
+      Environment: 'Non-Prod'
+      'hidden-title': 'This is visible in the resource name'
+      Role: 'DeploymentValidation'
+    }
   }
 }
 ```
@@ -491,14 +473,32 @@ module workspace 'br:bicep/modules/synapse.workspace:1.0.0' = {
       "value": "<defaultDataLakeStorageFilesystem>"
     },
     "name": {
-      "value": "swmin001"
+      "value": "swmanv001"
     },
     "sqlAdministratorLogin": {
       "value": "synwsadmin"
     },
     // Non-required parameters
+    "allowedAadTenantIdsForLinking": {
+      "value": [
+        "<tenantId>"
+      ]
+    },
     "enableDefaultTelemetry": {
       "value": "<enableDefaultTelemetry>"
+    },
+    "managedVirtualNetwork": {
+      "value": true
+    },
+    "preventDataExfiltration": {
+      "value": true
+    },
+    "tags": {
+      "value": {
+        "Environment": "Non-Prod",
+        "hidden-title": "This is visible in the resource name",
+        "Role": "DeploymentValidation"
+      }
     }
   }
 }

From d536828cc6b4b0ec8162240028f375f975c5bc5b Mon Sep 17 00:00:00 2001
From: Erika Gressi <erikag@microsoft.com>
Date: Sat, 4 Nov 2023 20:04:10 +0100
Subject: [PATCH 3/3] merge max and common

---
 modules/analysis-services/server/README.md    | 190 +++----------
 .../server/tests/e2e/common/main.test.bicep   |  19 ++
 .../server/tests/e2e/max/dependencies.bicep   |  13 -
 .../server/tests/e2e/max/main.test.bicep      | 112 --------
 modules/api-management/service/README.md      | 266 ++++--------------
 .../tests/e2e/common/dependencies.bicep       |   3 +
 .../service/tests/e2e/common/main.test.bicep  | 124 +++++++-
 .../service/tests/e2e/max/dependencies.bicep  |  16 --
 .../service/tests/e2e/max/main.test.bicep     | 216 --------------
 9 files changed, 242 insertions(+), 717 deletions(-)
 delete mode 100644 modules/analysis-services/server/tests/e2e/max/dependencies.bicep
 delete mode 100644 modules/analysis-services/server/tests/e2e/max/main.test.bicep
 delete mode 100644 modules/api-management/service/tests/e2e/max/dependencies.bicep
 delete mode 100644 modules/api-management/service/tests/e2e/max/main.test.bicep

diff --git a/modules/analysis-services/server/README.md b/modules/analysis-services/server/README.md
index 67343bda2a..803b3e6e39 100644
--- a/modules/analysis-services/server/README.md
+++ b/modules/analysis-services/server/README.md
@@ -29,7 +29,6 @@ The following section provides usage examples for the module, which were used to
 
 - [Using large parameter set](#example-1-using-large-parameter-set)
 - [Using only defaults](#example-2-using-only-defaults)
-- [Max](#example-3-max)
 
 ### Example 1: _Using large parameter set_
 
@@ -51,6 +50,14 @@ module server 'br:bicep/modules/analysis-services.server:1.0.0' = {
       {
         eventHubAuthorizationRuleResourceId: '<eventHubAuthorizationRuleResourceId>'
         eventHubName: '<eventHubName>'
+        logCategoriesAndGroups: [
+          {
+            category: 'Engine'
+          }
+          {
+            category: 'Service'
+          }
+        ]
         metricCategories: [
           {
             category: 'AllMetrics'
@@ -62,6 +69,16 @@ module server 'br:bicep/modules/analysis-services.server:1.0.0' = {
       }
     ]
     enableDefaultTelemetry: '<enableDefaultTelemetry>'
+    firewallSettings: {
+      enablePowerBIService: true
+      firewallRules: [
+        {
+          firewallRuleName: 'AllowFromAll'
+          rangeEnd: '255.255.255.255'
+          rangeStart: '0.0.0.0'
+        }
+      ]
+    }
     lock: {
       kind: 'CanNotDelete'
       name: 'myCustomLockName'
@@ -73,6 +90,7 @@ module server 'br:bicep/modules/analysis-services.server:1.0.0' = {
         roleDefinitionIdOrName: 'Reader'
       }
     ]
+    skuCapacity: 1
     skuName: 'S0'
     tags: {
       Environment: 'Non-Prod'
@@ -105,6 +123,14 @@ module server 'br:bicep/modules/analysis-services.server:1.0.0' = {
         {
           "eventHubAuthorizationRuleResourceId": "<eventHubAuthorizationRuleResourceId>",
           "eventHubName": "<eventHubName>",
+          "logCategoriesAndGroups": [
+            {
+              "category": "Engine"
+            },
+            {
+              "category": "Service"
+            }
+          ],
           "metricCategories": [
             {
               "category": "AllMetrics"
@@ -119,6 +145,18 @@ module server 'br:bicep/modules/analysis-services.server:1.0.0' = {
     "enableDefaultTelemetry": {
       "value": "<enableDefaultTelemetry>"
     },
+    "firewallSettings": {
+      "value": {
+        "enablePowerBIService": true,
+        "firewallRules": [
+          {
+            "firewallRuleName": "AllowFromAll",
+            "rangeEnd": "255.255.255.255",
+            "rangeStart": "0.0.0.0"
+          }
+        ]
+      }
+    },
     "lock": {
       "value": {
         "kind": "CanNotDelete",
@@ -134,6 +172,9 @@ module server 'br:bicep/modules/analysis-services.server:1.0.0' = {
         }
       ]
     },
+    "skuCapacity": {
+      "value": 1
+    },
     "skuName": {
       "value": "S0"
     },
@@ -199,153 +240,6 @@ module server 'br:bicep/modules/analysis-services.server:1.0.0' = {
 </details>
 <p>
 
-### Example 3: _Max_
-
-<details>
-
-<summary>via Bicep module</summary>
-
-```bicep
-module server 'br:bicep/modules/analysis-services.server:1.0.0' = {
-  name: '${uniqueString(deployment().name)}-test-assmax'
-  params: {
-    // Required parameters
-    name: 'assmax'
-    // Non-required parameters
-    diagnosticSettings: [
-      {
-        eventHubAuthorizationRuleResourceId: '<eventHubAuthorizationRuleResourceId>'
-        eventHubName: '<eventHubName>'
-        logCategoriesAndGroups: [
-          {
-            category: 'Engine'
-          }
-          {
-            category: 'Service'
-          }
-        ]
-        metricCategories: [
-          {
-            category: 'AllMetrics'
-          }
-        ]
-        name: 'customSetting'
-        storageAccountResourceId: '<storageAccountResourceId>'
-        workspaceResourceId: '<workspaceResourceId>'
-      }
-    ]
-    enableDefaultTelemetry: '<enableDefaultTelemetry>'
-    firewallSettings: {
-      enablePowerBIService: true
-      firewallRules: [
-        {
-          firewallRuleName: 'AllowFromAll'
-          rangeEnd: '255.255.255.255'
-          rangeStart: '0.0.0.0'
-        }
-      ]
-    }
-    lock: {
-      kind: 'CanNotDelete'
-      name: 'myCustomLockName'
-    }
-    roleAssignments: [
-      {
-        principalId: '<principalId>'
-        principalType: 'ServicePrincipal'
-        roleDefinitionIdOrName: 'Reader'
-      }
-    ]
-    skuCapacity: 1
-    skuName: 'S0'
-  }
-}
-```
-
-</details>
-<p>
-
-<details>
-
-<summary>via JSON Parameter file</summary>
-
-```json
-{
-  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    // Required parameters
-    "name": {
-      "value": "assmax"
-    },
-    // Non-required parameters
-    "diagnosticSettings": {
-      "value": [
-        {
-          "eventHubAuthorizationRuleResourceId": "<eventHubAuthorizationRuleResourceId>",
-          "eventHubName": "<eventHubName>",
-          "logCategoriesAndGroups": [
-            {
-              "category": "Engine"
-            },
-            {
-              "category": "Service"
-            }
-          ],
-          "metricCategories": [
-            {
-              "category": "AllMetrics"
-            }
-          ],
-          "name": "customSetting",
-          "storageAccountResourceId": "<storageAccountResourceId>",
-          "workspaceResourceId": "<workspaceResourceId>"
-        }
-      ]
-    },
-    "enableDefaultTelemetry": {
-      "value": "<enableDefaultTelemetry>"
-    },
-    "firewallSettings": {
-      "value": {
-        "enablePowerBIService": true,
-        "firewallRules": [
-          {
-            "firewallRuleName": "AllowFromAll",
-            "rangeEnd": "255.255.255.255",
-            "rangeStart": "0.0.0.0"
-          }
-        ]
-      }
-    },
-    "lock": {
-      "value": {
-        "kind": "CanNotDelete",
-        "name": "myCustomLockName"
-      }
-    },
-    "roleAssignments": {
-      "value": [
-        {
-          "principalId": "<principalId>",
-          "principalType": "ServicePrincipal",
-          "roleDefinitionIdOrName": "Reader"
-        }
-      ]
-    },
-    "skuCapacity": {
-      "value": 1
-    },
-    "skuName": {
-      "value": "S0"
-    }
-  }
-}
-```
-
-</details>
-<p>
-
 
 ## Parameters
 
diff --git a/modules/analysis-services/server/tests/e2e/common/main.test.bicep b/modules/analysis-services/server/tests/e2e/common/main.test.bicep
index f90426c6a4..c73e5c64c5 100644
--- a/modules/analysis-services/server/tests/e2e/common/main.test.bicep
+++ b/modules/analysis-services/server/tests/e2e/common/main.test.bicep
@@ -71,6 +71,17 @@ module testDeployment '../../../main.bicep' = {
       name: 'myCustomLockName'
     }
     skuName: 'S0'
+    skuCapacity: 1
+    firewallSettings: {
+      firewallRules: [
+        {
+          firewallRuleName: 'AllowFromAll'
+          rangeStart: '0.0.0.0'
+          rangeEnd: '255.255.255.255'
+        }
+      ]
+      enablePowerBIService: true
+    }
     roleAssignments: [
       {
         roleDefinitionIdOrName: 'Reader'
@@ -86,6 +97,14 @@ module testDeployment '../../../main.bicep' = {
             category: 'AllMetrics'
           }
         ]
+        logCategoriesAndGroups: [
+          {
+            category: 'Engine'
+          }
+          {
+            category: 'Service'
+          }
+        ]
         eventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
         eventHubAuthorizationRuleResourceId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
         storageAccountResourceId: diagnosticDependencies.outputs.storageAccountResourceId
diff --git a/modules/analysis-services/server/tests/e2e/max/dependencies.bicep b/modules/analysis-services/server/tests/e2e/max/dependencies.bicep
deleted file mode 100644
index 29b9641692..0000000000
--- a/modules/analysis-services/server/tests/e2e/max/dependencies.bicep
+++ /dev/null
@@ -1,13 +0,0 @@
-@description('Required. The name of the managed identity to create.')
-param managedIdentityName string
-
-@description('Optional. The location to deploy resources to.')
-param location string = resourceGroup().location
-
-resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = {
-  name: managedIdentityName
-  location: location
-}
-
-@description('The principal ID of the created managed identity.')
-output managedIdentityPrincipalId string = managedIdentity.properties.principalId
diff --git a/modules/analysis-services/server/tests/e2e/max/main.test.bicep b/modules/analysis-services/server/tests/e2e/max/main.test.bicep
deleted file mode 100644
index 41b6b1dcd0..0000000000
--- a/modules/analysis-services/server/tests/e2e/max/main.test.bicep
+++ /dev/null
@@ -1,112 +0,0 @@
-targetScope = 'subscription'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'dep-${namePrefix}-analysisservices.servers-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'assmax'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
-  name: resourceGroupName
-  location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
-  scope: resourceGroup
-  name: '${uniqueString(deployment().name, location)}-nestedDependencies'
-  params: {
-    managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
-  }
-}
-
-// Diagnostics
-// ===========
-module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
-  scope: resourceGroup
-  name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
-  params: {
-    storageAccountName: 'dep${namePrefix}azsa${serviceShort}01'
-    logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
-    eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
-    eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
-    location: location
-  }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../../main.bicep' = {
-  scope: az.resourceGroup(resourceGroupName)
-  name: '${uniqueString(deployment().name)}-test-${serviceShort}'
-  params: {
-    enableDefaultTelemetry: enableDefaultTelemetry
-    name: '${namePrefix}${serviceShort}'
-    lock: {
-      kind: 'CanNotDelete'
-      name: 'myCustomLockName'
-    }
-    skuName: 'S0'
-    skuCapacity: 1
-    firewallSettings: {
-      firewallRules: [
-        {
-          firewallRuleName: 'AllowFromAll'
-          rangeStart: '0.0.0.0'
-          rangeEnd: '255.255.255.255'
-        }
-      ]
-      enablePowerBIService: true
-    }
-    roleAssignments: [
-      {
-        roleDefinitionIdOrName: 'Reader'
-        principalId: nestedDependencies.outputs.managedIdentityPrincipalId
-        principalType: 'ServicePrincipal'
-      }
-    ]
-    diagnosticSettings: [
-      {
-        name: 'customSetting'
-        metricCategories: [
-          {
-            category: 'AllMetrics'
-          }
-        ]
-        logCategoriesAndGroups: [
-          {
-            category: 'Engine'
-          }
-          {
-            category: 'Service'
-          }
-        ]
-        eventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
-        eventHubAuthorizationRuleResourceId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
-        storageAccountResourceId: diagnosticDependencies.outputs.storageAccountResourceId
-        workspaceResourceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
-      }
-    ]
-  }
-}
diff --git a/modules/api-management/service/README.md b/modules/api-management/service/README.md
index dda735bb01..7a7e701100 100644
--- a/modules/api-management/service/README.md
+++ b/modules/api-management/service/README.md
@@ -44,7 +44,6 @@ The following section provides usage examples for the module, which were used to
 
 - [Using large parameter set](#example-1-using-large-parameter-set)
 - [Using only defaults](#example-2-using-only-defaults)
-- [Max](#example-3-max)
 
 ### Example 1: _Using large parameter set_
 
@@ -64,213 +63,6 @@ module service 'br:bicep/modules/api-management.service:1.0.0' = {
     publisherEmail: 'apimgmt-noreply@mail.windowsazure.com'
     publisherName: 'az-amorg-x-001'
     // Non-required parameters
-    enableDefaultTelemetry: '<enableDefaultTelemetry>'
-    lock: {
-      kind: 'CanNotDelete'
-      name: 'myCustomLockName'
-    }
-    managedIdentities: {
-      systemAssigned: true
-    }
-    policies: [
-      {
-        format: 'xml'
-        value: '<policies> <inbound> <rate-limit-by-key calls=\'250\' renewal-period=\'60\' counter-key=\'@(context.Request.IpAddress)\' /> </inbound> <backend> <forward-request /> </backend> <outbound> </outbound> </policies>'
-      }
-    ]
-    portalsettings: [
-      {
-        name: 'signin'
-        properties: {
-          enabled: false
-        }
-      }
-      {
-        name: 'signup'
-        properties: {
-          enabled: false
-          termsOfService: {
-            consentRequired: false
-            enabled: false
-          }
-        }
-      }
-    ]
-    roleAssignments: [
-      {
-        principalId: '<principalId>'
-        principalType: 'ServicePrincipal'
-        roleDefinitionIdOrName: 'Reader'
-      }
-    ]
-    tags: {
-      Environment: 'Non-Prod'
-      'hidden-title': 'This is visible in the resource name'
-      Role: 'DeploymentValidation'
-    }
-  }
-}
-```
-
-</details>
-<p>
-
-<details>
-
-<summary>via JSON Parameter file</summary>
-
-```json
-{
-  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    // Required parameters
-    "name": {
-      "value": "apiscom001"
-    },
-    "publisherEmail": {
-      "value": "apimgmt-noreply@mail.windowsazure.com"
-    },
-    "publisherName": {
-      "value": "az-amorg-x-001"
-    },
-    // Non-required parameters
-    "enableDefaultTelemetry": {
-      "value": "<enableDefaultTelemetry>"
-    },
-    "lock": {
-      "value": {
-        "kind": "CanNotDelete",
-        "name": "myCustomLockName"
-      }
-    },
-    "managedIdentities": {
-      "value": {
-        "systemAssigned": true
-      }
-    },
-    "policies": {
-      "value": [
-        {
-          "format": "xml",
-          "value": "<policies> <inbound> <rate-limit-by-key calls=\"250\" renewal-period=\"60\" counter-key=\"@(context.Request.IpAddress)\" /> </inbound> <backend> <forward-request /> </backend> <outbound> </outbound> </policies>"
-        }
-      ]
-    },
-    "portalsettings": {
-      "value": [
-        {
-          "name": "signin",
-          "properties": {
-            "enabled": false
-          }
-        },
-        {
-          "name": "signup",
-          "properties": {
-            "enabled": false,
-            "termsOfService": {
-              "consentRequired": false,
-              "enabled": false
-            }
-          }
-        }
-      ]
-    },
-    "roleAssignments": {
-      "value": [
-        {
-          "principalId": "<principalId>",
-          "principalType": "ServicePrincipal",
-          "roleDefinitionIdOrName": "Reader"
-        }
-      ]
-    },
-    "tags": {
-      "value": {
-        "Environment": "Non-Prod",
-        "hidden-title": "This is visible in the resource name",
-        "Role": "DeploymentValidation"
-      }
-    }
-  }
-}
-```
-
-</details>
-<p>
-
-### Example 2: _Using only defaults_
-
-This instance deploys the module with the minimum set of required parameters.
-
-
-<details>
-
-<summary>via Bicep module</summary>
-
-```bicep
-module service 'br:bicep/modules/api-management.service:1.0.0' = {
-  name: '${uniqueString(deployment().name, location)}-test-apismin'
-  params: {
-    // Required parameters
-    name: 'apismin001'
-    publisherEmail: 'apimgmt-noreply@mail.windowsazure.com'
-    publisherName: 'az-amorg-x-001'
-    // Non-required parameters
-    enableDefaultTelemetry: '<enableDefaultTelemetry>'
-  }
-}
-```
-
-</details>
-<p>
-
-<details>
-
-<summary>via JSON Parameter file</summary>
-
-```json
-{
-  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    // Required parameters
-    "name": {
-      "value": "apismin001"
-    },
-    "publisherEmail": {
-      "value": "apimgmt-noreply@mail.windowsazure.com"
-    },
-    "publisherName": {
-      "value": "az-amorg-x-001"
-    },
-    // Non-required parameters
-    "enableDefaultTelemetry": {
-      "value": "<enableDefaultTelemetry>"
-    }
-  }
-}
-```
-
-</details>
-<p>
-
-### Example 3: _Max_
-
-<details>
-
-<summary>via Bicep module</summary>
-
-```bicep
-module service 'br:bicep/modules/api-management.service:1.0.0' = {
-  name: '${uniqueString(deployment().name, location)}-test-apismax'
-  params: {
-    // Required parameters
-    name: 'apismax001'
-    publisherEmail: 'apimgmt-noreply@mail.windowsazure.com'
-    publisherName: 'az-amorg-x-001'
-    // Non-required parameters
     apis: [
       {
         apiVersionSet: {
@@ -432,7 +224,7 @@ module service 'br:bicep/modules/api-management.service:1.0.0' = {
   "parameters": {
     // Required parameters
     "name": {
-      "value": "apismax001"
+      "value": "apiscom001"
     },
     "publisherEmail": {
       "value": "apimgmt-noreply@mail.windowsazure.com"
@@ -623,6 +415,62 @@ module service 'br:bicep/modules/api-management.service:1.0.0' = {
 </details>
 <p>
 
+### Example 2: _Using only defaults_
+
+This instance deploys the module with the minimum set of required parameters.
+
+
+<details>
+
+<summary>via Bicep module</summary>
+
+```bicep
+module service 'br:bicep/modules/api-management.service:1.0.0' = {
+  name: '${uniqueString(deployment().name, location)}-test-apismin'
+  params: {
+    // Required parameters
+    name: 'apismin001'
+    publisherEmail: 'apimgmt-noreply@mail.windowsazure.com'
+    publisherName: 'az-amorg-x-001'
+    // Non-required parameters
+    enableDefaultTelemetry: '<enableDefaultTelemetry>'
+  }
+}
+```
+
+</details>
+<p>
+
+<details>
+
+<summary>via JSON Parameter file</summary>
+
+```json
+{
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    // Required parameters
+    "name": {
+      "value": "apismin001"
+    },
+    "publisherEmail": {
+      "value": "apimgmt-noreply@mail.windowsazure.com"
+    },
+    "publisherName": {
+      "value": "az-amorg-x-001"
+    },
+    // Non-required parameters
+    "enableDefaultTelemetry": {
+      "value": "<enableDefaultTelemetry>"
+    }
+  }
+}
+```
+
+</details>
+<p>
+
 
 ## Parameters
 
diff --git a/modules/api-management/service/tests/e2e/common/dependencies.bicep b/modules/api-management/service/tests/e2e/common/dependencies.bicep
index 29b9641692..bd63a95634 100644
--- a/modules/api-management/service/tests/e2e/common/dependencies.bicep
+++ b/modules/api-management/service/tests/e2e/common/dependencies.bicep
@@ -11,3 +11,6 @@ resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-
 
 @description('The principal ID of the created managed identity.')
 output managedIdentityPrincipalId string = managedIdentity.properties.principalId
+
+@description('The resource ID of the created Managed Identity.')
+output managedIdentityResourceId string = managedIdentity.id
diff --git a/modules/api-management/service/tests/e2e/common/main.test.bicep b/modules/api-management/service/tests/e2e/common/main.test.bicep
index 36998d40bd..80806744ef 100644
--- a/modules/api-management/service/tests/e2e/common/main.test.bicep
+++ b/modules/api-management/service/tests/e2e/common/main.test.bicep
@@ -23,6 +23,10 @@ param enableDefaultTelemetry bool = true
 @description('Optional. A token to inject into the name of each resource.')
 param namePrefix string = '[[namePrefix]]'
 
+@description('Optional. The secret to leverage for authorization server authentication.')
+@secure()
+param customSecret string = newGuid()
+
 // ============ //
 // Dependencies //
 // ============ //
@@ -42,6 +46,20 @@ module nestedDependencies 'dependencies.bicep' = {
   }
 }
 
+// Diagnostics
+// ===========
+module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
+  scope: resourceGroup
+  name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
+  params: {
+    storageAccountName: 'dep${namePrefix}azsa${serviceShort}01'
+    logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
+    eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
+    eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
+    location: location
+  }
+}
+
 // ============== //
 // Test Execution //
 // ============== //
@@ -54,10 +72,84 @@ module testDeployment '../../../main.bicep' = {
     name: '${namePrefix}${serviceShort}001'
     publisherEmail: 'apimgmt-noreply@mail.windowsazure.com'
     publisherName: '${namePrefix}-az-amorg-x-001'
+    apis: [
+      {
+        apiVersionSet: {
+          name: 'echo-version-set'
+          properties: {
+            description: 'echo-version-set'
+            displayName: 'echo-version-set'
+            versioningScheme: 'Segment'
+          }
+        }
+        displayName: 'Echo API'
+        name: 'echo-api'
+        path: 'echo'
+        serviceUrl: 'http://echoapi.cloudapp.net/api'
+      }
+    ]
+    authorizationServers: {
+      secureList: [
+        {
+          authorizationEndpoint: '${environment().authentication.loginEndpoint}651b43ce-ccb8-4301-b551-b04dd872d401/oauth2/v2.0/authorize'
+          clientId: 'apimclientid'
+          clientSecret: customSecret
+          clientRegistrationEndpoint: 'http://localhost'
+          grantTypes: [
+            'authorizationCode'
+          ]
+          name: 'AuthServer1'
+          tokenEndpoint: '${environment().authentication.loginEndpoint}651b43ce-ccb8-4301-b551-b04dd872d401/oauth2/v2.0/token'
+        }
+      ]
+    }
+    backends: [
+      {
+        name: 'backend'
+        tls: {
+          validateCertificateChain: false
+          validateCertificateName: false
+        }
+        url: 'http://echoapi.cloudapp.net/api'
+      }
+    ]
+    caches: [
+      {
+        connectionString: 'connectionstringtest'
+        name: 'westeurope'
+        useFromLocation: 'westeurope'
+      }
+    ]
+    diagnosticSettings: [
+      {
+        name: 'customSetting'
+        metricCategories: [
+          {
+            category: 'AllMetrics'
+          }
+        ]
+        eventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+        eventHubAuthorizationRuleResourceId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+        storageAccountResourceId: diagnosticDependencies.outputs.storageAccountResourceId
+        workspaceResourceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+      }
+    ]
+    identityProviders: [
+      {
+        name: 'aadProvider'
+      }
+    ]
     lock: {
       kind: 'CanNotDelete'
       name: 'myCustomLockName'
     }
+    namedValues: [
+      {
+        displayName: 'apimkey'
+        name: 'apimkey'
+        secret: true
+      }
+    ]
     policies: [
       {
         format: 'xml'
@@ -82,9 +174,23 @@ module testDeployment '../../../main.bicep' = {
         }
       }
     ]
-    managedIdentities: {
-      systemAssigned: true
-    }
+    products: [
+      {
+        apis: [
+          {
+            name: 'echo-api'
+          }
+        ]
+        approvalRequired: false
+        groups: [
+          {
+            name: 'developers'
+          }
+        ]
+        name: 'Starter'
+        subscriptionRequired: false
+      }
+    ]
     roleAssignments: [
       {
         roleDefinitionIdOrName: 'Reader'
@@ -92,6 +198,18 @@ module testDeployment '../../../main.bicep' = {
         principalType: 'ServicePrincipal'
       }
     ]
+    subscriptions: [
+      {
+        name: 'testArmSubscriptionAllApis'
+        scope: '/apis'
+      }
+    ]
+    managedIdentities: {
+      systemAssigned: true
+      userAssignedResourcesIds: [
+        nestedDependencies.outputs.managedIdentityResourceId
+      ]
+    }
     tags: {
       'hidden-title': 'This is visible in the resource name'
       Environment: 'Non-Prod'
diff --git a/modules/api-management/service/tests/e2e/max/dependencies.bicep b/modules/api-management/service/tests/e2e/max/dependencies.bicep
deleted file mode 100644
index bd63a95634..0000000000
--- a/modules/api-management/service/tests/e2e/max/dependencies.bicep
+++ /dev/null
@@ -1,16 +0,0 @@
-@description('Required. The name of the managed identity to create.')
-param managedIdentityName string
-
-@description('Optional. The location to deploy resources to.')
-param location string = resourceGroup().location
-
-resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = {
-  name: managedIdentityName
-  location: location
-}
-
-@description('The principal ID of the created managed identity.')
-output managedIdentityPrincipalId string = managedIdentity.properties.principalId
-
-@description('The resource ID of the created Managed Identity.')
-output managedIdentityResourceId string = managedIdentity.id
diff --git a/modules/api-management/service/tests/e2e/max/main.test.bicep b/modules/api-management/service/tests/e2e/max/main.test.bicep
deleted file mode 100644
index 75ed04fb5a..0000000000
--- a/modules/api-management/service/tests/e2e/max/main.test.bicep
+++ /dev/null
@@ -1,216 +0,0 @@
-targetScope = 'subscription'
-
-// ========== //
-// Parameters //
-// ========== //
-
-@description('Optional. The name of the resource group to deploy for testing purposes.')
-@maxLength(90)
-param resourceGroupName string = 'dep-${namePrefix}-apimanagement.service-${serviceShort}-rg'
-
-@description('Optional. The location to deploy resources to.')
-param location string = deployment().location
-
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'apismax'
-
-@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
-param enableDefaultTelemetry bool = true
-
-@description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
-
-@description('Optional. The secret to leverage for authorization server authentication.')
-@secure()
-param customSecret string = newGuid()
-
-// ============ //
-// Dependencies //
-// ============ //
-
-// General resources
-// =================
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
-  name: resourceGroupName
-  location: location
-}
-
-module nestedDependencies 'dependencies.bicep' = {
-  scope: resourceGroup
-  name: '${uniqueString(deployment().name, location)}-nestedDependencies'
-  params: {
-    managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}'
-  }
-}
-
-// Diagnostics
-// ===========
-module diagnosticDependencies '../../../../../.shared/.templates/diagnostic.dependencies.bicep' = {
-  scope: resourceGroup
-  name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
-  params: {
-    storageAccountName: 'dep${namePrefix}azsa${serviceShort}01'
-    logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
-    eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
-    eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
-    location: location
-  }
-}
-
-// ============== //
-// Test Execution //
-// ============== //
-
-module testDeployment '../../../main.bicep' = {
-  scope: resourceGroup
-  name: '${uniqueString(deployment().name, location)}-test-${serviceShort}'
-  params: {
-    enableDefaultTelemetry: enableDefaultTelemetry
-    name: '${namePrefix}${serviceShort}001'
-    publisherEmail: 'apimgmt-noreply@mail.windowsazure.com'
-    publisherName: '${namePrefix}-az-amorg-x-001'
-    apis: [
-      {
-        apiVersionSet: {
-          name: 'echo-version-set'
-          properties: {
-            description: 'echo-version-set'
-            displayName: 'echo-version-set'
-            versioningScheme: 'Segment'
-          }
-        }
-        displayName: 'Echo API'
-        name: 'echo-api'
-        path: 'echo'
-        serviceUrl: 'http://echoapi.cloudapp.net/api'
-      }
-    ]
-    authorizationServers: {
-      secureList: [
-        {
-          authorizationEndpoint: '${environment().authentication.loginEndpoint}651b43ce-ccb8-4301-b551-b04dd872d401/oauth2/v2.0/authorize'
-          clientId: 'apimclientid'
-          clientSecret: customSecret
-          clientRegistrationEndpoint: 'http://localhost'
-          grantTypes: [
-            'authorizationCode'
-          ]
-          name: 'AuthServer1'
-          tokenEndpoint: '${environment().authentication.loginEndpoint}651b43ce-ccb8-4301-b551-b04dd872d401/oauth2/v2.0/token'
-        }
-      ]
-    }
-    backends: [
-      {
-        name: 'backend'
-        tls: {
-          validateCertificateChain: false
-          validateCertificateName: false
-        }
-        url: 'http://echoapi.cloudapp.net/api'
-      }
-    ]
-    caches: [
-      {
-        connectionString: 'connectionstringtest'
-        name: 'westeurope'
-        useFromLocation: 'westeurope'
-      }
-    ]
-    diagnosticSettings: [
-      {
-        name: 'customSetting'
-        metricCategories: [
-          {
-            category: 'AllMetrics'
-          }
-        ]
-        eventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
-        eventHubAuthorizationRuleResourceId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
-        storageAccountResourceId: diagnosticDependencies.outputs.storageAccountResourceId
-        workspaceResourceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
-      }
-    ]
-    identityProviders: [
-      {
-        name: 'aadProvider'
-      }
-    ]
-    lock: {
-      kind: 'CanNotDelete'
-      name: 'myCustomLockName'
-    }
-    namedValues: [
-      {
-        displayName: 'apimkey'
-        name: 'apimkey'
-        secret: true
-      }
-    ]
-    policies: [
-      {
-        format: 'xml'
-        value: '<policies> <inbound> <rate-limit-by-key calls=\'250\' renewal-period=\'60\' counter-key=\'@(context.Request.IpAddress)\' /> </inbound> <backend> <forward-request /> </backend> <outbound> </outbound> </policies>'
-      }
-    ]
-    portalsettings: [
-      {
-        name: 'signin'
-        properties: {
-          enabled: false
-        }
-      }
-      {
-        name: 'signup'
-        properties: {
-          enabled: false
-          termsOfService: {
-            consentRequired: false
-            enabled: false
-          }
-        }
-      }
-    ]
-    products: [
-      {
-        apis: [
-          {
-            name: 'echo-api'
-          }
-        ]
-        approvalRequired: false
-        groups: [
-          {
-            name: 'developers'
-          }
-        ]
-        name: 'Starter'
-        subscriptionRequired: false
-      }
-    ]
-    roleAssignments: [
-      {
-        roleDefinitionIdOrName: 'Reader'
-        principalId: nestedDependencies.outputs.managedIdentityPrincipalId
-        principalType: 'ServicePrincipal'
-      }
-    ]
-    subscriptions: [
-      {
-        name: 'testArmSubscriptionAllApis'
-        scope: '/apis'
-      }
-    ]
-    managedIdentities: {
-      systemAssigned: true
-      userAssignedResourcesIds: [
-        nestedDependencies.outputs.managedIdentityResourceId
-      ]
-    }
-    tags: {
-      'hidden-title': 'This is visible in the resource name'
-      Environment: 'Non-Prod'
-      Role: 'DeploymentValidation'
-    }
-  }
-}