diff --git a/.github/workflows/terratests-fcr-prod-suite.yaml b/.github/workflows/terratests-fcr-prod-suite.yaml
index d67dca6..361768d 100644
--- a/.github/workflows/terratests-fcr-prod-suite.yaml
+++ b/.github/workflows/terratests-fcr-prod-suite.yaml
@@ -10,10 +10,14 @@ jobs:
     env:
       TF_VAR_equinix_client_id: ${{ secrets.EQUINIX_CLIENT_ID }}
       TF_VAR_equinix_client_secret: ${{ secrets.EQUINIX_CLIENT_SECRET }}
+      TF_VAR_azure_client_id: ${{ secrets.AZURE_CLIENT_ID}}
+      TF_VAR_azure_client_secret: ${{ secrets.AZURE_CLIENT_SECRET}}
+      TF_VAR_azure_tenant_id: ${{ secrets.AZURE_TENANT_ID}}
+      TF_VAR_azure_subscription_id: ${{ secrets.AZURE_SUBSCRIPTION_ID}}
       TEST_DATA_PROD_CLOUD_ROUTER: ${{ secrets.TEST_DATA_PROD_CLOUD_ROUTER }}
       TEST_DATA_PROD_CLOUD_ROUTER_2_AWS_CONNECTION: ${{secrets.TEST_DATA_PROD_CLOUD_ROUTER_2_AWS_CONNECTION}}
       TEST_DATA_PROD_CLOUD_ROUTER_2_AZURE_CONNECTION: ${{secrets.TEST_DATA_PROD_CLOUD_ROUTER_2_AZURE_CONNECTION}}
-      TEST_DATA_PROD_CLOUD_ROUTER_2_PORT_ROUTING_PROTOCOL_CONNECTION: ${{secrets.TEST_DATA_PROD_CLOUD_ROUTER_2_PORT_ROUTING_PROTOCOL_CONNECTION}}
+      TEST_DATA_PROD_CLOUD_ROUTER_2_PORT_ROUTING_PROTOCOL_AND_ROUTE_FILTER_CONNECTION: ${{secrets.TEST_DATA_PROD_CLOUD_ROUTER_2_PORT_ROUTING_PROTOCOL_AND_ROUTE_FILTER_CONNECTION}}
       TEST_DATA_PROD_CLOUD_ROUTER_2_SERVICE_PROFILE_CONNECTION: ${{secrets.TEST_DATA_PROD_CLOUD_ROUTER_2_SERVICE_PROFILE_CONNECTION}}
       TEST_DATA_PROD_CLOUD_ROUTER_2_WAN_CONNECTION: ${{secrets.TEST_DATA_PROD_CLOUD_ROUTER_2_WAN_CONNECTION}}
       TEST_DATA_PROD_CLOUD_ROUTER_2_VIRTUAL_DEVICE_CONNECTION: ${{secrets.TEST_DATA_PROD_CLOUD_ROUTER_2_VIRTUAL_DEVICE_CONNECTION}}
@@ -56,9 +60,9 @@ jobs:
           jq --arg timestamp "$TIMESTAMP" '.connection_name = ($timestamp + "_" + .connection_name)' ./tests/examples-without-external-providers/cloud-router/terraform.tfvars.json > ./tests/examples-without-external-providers/cloud-router/tmp.test.json && mv ./tests/examples-without-external-providers/cloud-router/tmp.test.json ./tests/examples-without-external-providers/cloud-router/terraform.tfvars.json
           echo $TEST_DATA_PROD_CLOUD_ROUTER_2_AWS_CONNECTION >> "./tests/examples-without-external-providers/cloud-router-2-aws-connection/terraform.tfvars.json"
           jq --arg timestamp "$TIMESTAMP" '.connection_name = ($timestamp + "_" + .connection_name)' ./tests/examples-without-external-providers/cloud-router-2-aws-connection/terraform.tfvars.json > ./tests/examples-without-external-providers/cloud-router-2-aws-connection/tmp.test.json && mv ./tests/examples-without-external-providers/cloud-router-2-aws-connection/tmp.test.json ./tests/examples-without-external-providers/cloud-router-2-aws-connection/terraform.tfvars.json
-          echo $TEST_DATA_PROD_CLOUD_ROUTER_2_AZURE_CONNECTION >> "./tests/examples-without-external-providers/cloud-router-2-azure-connection/terraform.tfvars.json"
+          echo $TEST_DATA_PROD_CLOUD_ROUTER_2_AZURE_CONNECTION >> "./examples/cloud-router-2-azure-connection/terraform.tfvars.json"
           jq --arg timestamp "$TIMESTAMP" '.connection_name = ($timestamp + "_" + .connection_name)' ./tests/examples-without-external-providers/cloud-router-2-azure-connection/terraform.tfvars.json > ./tests/examples-without-external-providers/cloud-router-2-azure-connection/tmp.test.json && mv ./tests/examples-without-external-providers/cloud-router-2-azure-connection/tmp.test.json ./tests/examples-without-external-providers/cloud-router-2-azure-connection/terraform.tfvars.json
-          echo $TEST_DATA_PROD_CLOUD_ROUTER_2_PORT_ROUTING_PROTOCOL_CONNECTION >> "./tests/examples-without-external-providers/cloud-router-2-port-connection-with-routing-protocols-and-route-filters/terraform.tfvars.json"
+          echo $TEST_DATA_PROD_CLOUD_ROUTER_2_PORT_ROUTING_PROTOCOL_AND_ROUTE_FILTER_CONNECTION >> "./tests/examples-without-external-providers/cloud-router-2-port-connection-with-routing-protocols-and-route-filters/terraform.tfvars.json"
           jq --arg timestamp "$TIMESTAMP" '.connection_name = ($timestamp + "_" + .connection_name)' ./tests/examples-without-external-providers/cloud-router-2-port-routing-protocol-connection/terraform.tfvars.json > ./tests/examples-without-external-providers/cloud-router-2-port-routing-protocol-connection/tmp.test.json && mv ./tests/examples-without-external-providers/cloud-router-2-port-routing-protocol-connection/tmp.test.json ./tests/examples-without-external-providers/cloud-router-2-port-routing-protocol-connection/terraform.tfvars.json
           echo $TEST_DATA_PROD_CLOUD_ROUTER_2_SERVICE_PROFILE_CONNECTION >> "./examples/cloud-router-2-service-profile-connection/terraform.tfvars.json"
           jq --arg timestamp "$TIMESTAMP" '.connection_name = ($timestamp + "_" + .connection_name)' ./examples/cloud-router-2-service-profile-connection/terraform.tfvars.json > ./examples/cloud-router-2-service-profile-connection/tmp.test.json && mv ./examples/cloud-router-2-service-profile-connection/tmp.test.json ./examples/cloud-router-2-service-profile-connection/terraform.tfvars.json
diff --git a/.github/workflows/terratests-metal-nimf-suite.yaml b/.github/workflows/terratests-metal-nimf-suite.yaml
index 7d85378..ec0986f 100644
--- a/.github/workflows/terratests-metal-nimf-suite.yaml
+++ b/.github/workflows/terratests-metal-nimf-suite.yaml
@@ -10,6 +10,10 @@ jobs:
     env:
       TF_VAR_equinix_client_id: ${{ secrets.EQUINIX_CLIENT_ID }}
       TF_VAR_equinix_client_secret: ${{ secrets.EQUINIX_CLIENT_SECRET }}
+      TF_VAR_azure_client_id: ${{ secrets.AZURE_CLIENT_ID}}
+      TF_VAR_azure_client_secret: ${{ secrets.AZURE_CLIENT_SECRET}}
+      TF_VAR_azure_tenant_id: ${{ secrets.AZURE_TENANT_ID}}
+      TF_VAR_azure_subscription_id: ${{ secrets.AZURE_SUBSCRIPTION_ID}}
       TF_VAR_metal_auth_token: ${{ secrets.METAL_AUTH_TOKEN }}
       GOOGLE_SERVICE_KEYS: ${{ secrets.GOOGLE_SERVICE_KEYS }}
       TEST_DATA_PROD_METAL_NIMF_2_AWS_CONNECTION: ${{ secrets.TEST_DATA_PROD_METAL_NIMF_2_AWS_CONNECTION }}
diff --git a/.github/workflows/terratests-port-prod-suite.yaml b/.github/workflows/terratests-port-prod-suite.yaml
index 0f9899e..86a08b5 100644
--- a/.github/workflows/terratests-port-prod-suite.yaml
+++ b/.github/workflows/terratests-port-prod-suite.yaml
@@ -10,6 +10,10 @@ jobs:
     env:
       TF_VAR_equinix_client_id: ${{ secrets.EQUINIX_CLIENT_ID }}
       TF_VAR_equinix_client_secret: ${{ secrets.EQUINIX_CLIENT_SECRET }}
+      TF_VAR_azure_client_id: ${{ secrets.AZURE_CLIENT_ID}}
+      TF_VAR_azure_client_secret: ${{ secrets.AZURE_CLIENT_SECRET}}
+      TF_VAR_azure_tenant_id: ${{ secrets.AZURE_TENANT_ID}}
+      TF_VAR_azure_subscription_id: ${{ secrets.AZURE_SUBSCRIPTION_ID}}
       GOOGLE_SERVICE_KEYS: ${{ secrets.GOOGLE_SERVICE_KEYS }}
       TEST_DATA_PROD_PORT_2_ALIBABA_CONNECTION: ${{ secrets.TEST_DATA_PROD_PORT_2_ALIBABA_CONNECTION }}
       TEST_DATA_PROD_PORT_2_AWS_CONNECTION: ${{ secrets.TEST_DATA_PROD_PORT_2_AWS_CONNECTION }}
@@ -58,7 +62,7 @@ jobs:
           jq --arg timestamp "$TIMESTAMP" '.connection_name = ($timestamp + "_" + .connection_name)' ./examples/port-2-alibaba-connection/terraform.tfvars.json > ./examples/port-2-alibaba-connection/tmp.test.json && mv ./examples/port-2-alibaba-connection/tmp.test.json ./examples/port-2-alibaba-connection/terraform.tfvars.json
           echo $TEST_DATA_PROD_PORT_2_AWS_CONNECTION >> "./tests/examples-without-external-providers/port-2-aws-connection/terraform.tfvars.json"
           jq --arg timestamp "$TIMESTAMP" '.connection_name = ($timestamp + "_" + .connection_name)' ./tests/examples-without-external-providers/port-2-aws-connection/terraform.tfvars.json > ./tests/examples-without-external-providers/port-2-aws-connection/tmp.test.json && mv ./tests/examples-without-external-providers/port-2-aws-connection/tmp.test.json ./tests/examples-without-external-providers/port-2-aws-connection/terraform.tfvars.json
-          echo $TEST_DATA_PROD_PORT_2_AZURE_CONNECTION >> "./tests/examples-without-external-providers/port-2-azure-connection/terraform.tfvars.json"
+          echo $TEST_DATA_PROD_PORT_2_AZURE_CONNECTION >> "./examples/port-2-azure-connection/terraform.tfvars.json"
           jq --arg timestamp "$TIMESTAMP" '.connection_name = ($timestamp + "_" + .connection_name)' ./tests/examples-without-external-providers/port-2-azure-connection/terraform.tfvars.json > ./tests/examples-without-external-providers/port-2-azure-connection/tmp.test.json && mv ./tests/examples-without-external-providers/port-2-azure-connection/tmp.test.json ./tests/examples-without-external-providers/port-2-azure-connection/terraform.tfvars.json
           echo $GOOGLE_SERVICE_KEYS >> "./examples/port-2-google-connection/keys.json"
           echo $TEST_DATA_PROD_PORT_2_GOOGLE_CONNECTION >> "./examples/port-2-google-connection/terraform.tfvars.json"
diff --git a/.github/workflows/terratests-prod-suite-all.yaml b/.github/workflows/terratests-prod-suite-all.yaml
index 45b40d7..9450c10 100644
--- a/.github/workflows/terratests-prod-suite-all.yaml
+++ b/.github/workflows/terratests-prod-suite-all.yaml
@@ -10,6 +10,10 @@ jobs:
     env:
       TF_VAR_equinix_client_id: ${{ secrets.EQUINIX_CLIENT_ID }}
       TF_VAR_equinix_client_secret: ${{ secrets.EQUINIX_CLIENT_SECRET }}
+      TF_VAR_azure_client_id: ${{ secrets.AZURE_CLIENT_ID}}
+      TF_VAR_azure_client_secret: ${{ secrets.AZURE_CLIENT_SECRET}}
+      TF_VAR_azure_tenant_id: ${{ secrets.AZURE_TENANT_ID}}
+      TF_VAR_azure_subscription_id: ${{ secrets.AZURE_SUBSCRIPTION_ID}}
       GOOGLE_SERVICE_KEYS: ${{ secrets.GOOGLE_SERVICE_KEYS }}
       TEST_DATA_PROD_PORT_2_ALIBABA_CONNECTION: ${{ secrets.TEST_DATA_PROD_PORT_2_ALIBABA_CONNECTION }}
       TEST_DATA_PROD_PORT_2_AWS_CONNECTION: ${{ secrets.TEST_DATA_PROD_PORT_2_AWS_CONNECTION }}
@@ -23,7 +27,7 @@ jobs:
       TEST_DATA_PROD_CLOUD_ROUTER: ${{ secrets.TEST_DATA_PROD_CLOUD_ROUTER }}
       TEST_DATA_PROD_CLOUD_ROUTER_2_AWS_CONNECTION: ${{secrets.TEST_DATA_PROD_CLOUD_ROUTER_2_AWS_CONNECTION}}
       TEST_DATA_PROD_CLOUD_ROUTER_2_AZURE_CONNECTION: ${{secrets.TEST_DATA_PROD_CLOUD_ROUTER_2_AZURE_CONNECTION}}
-      TEST_DATA_PROD_CLOUD_ROUTER_2_PORT_ROUTING_PROTOCOL_CONNECTION: ${{secrets.TEST_DATA_PROD_CLOUD_ROUTER_2_PORT_ROUTING_PROTOCOL_CONNECTION}}
+      TEST_DATA_PROD_CLOUD_ROUTER_2_PORT_ROUTING_PROTOCOL_AND_ROUTE_FILTER_CONNECTION: ${{secrets.TEST_DATA_PROD_CLOUD_ROUTER_2_PORT_ROUTING_PROTOCOL_AND_ROUTE_FILTER_CONNECTION}}
       TEST_DATA_PROD_CLOUD_ROUTER_2_SERVICE_PROFILE_CONNECTION: ${{secrets.TEST_DATA_PROD_CLOUD_ROUTER_2_SERVICE_PROFILE_CONNECTION}}
       TEST_DATA_PROD_CLOUD_ROUTER_2_WAN_CONNECTION: ${{secrets.TEST_DATA_PROD_CLOUD_ROUTER_2_WAN_CONNECTION}}
       TEST_DATA_PROD_CLOUD_ROUTER_2_VIRTUAL_DEVICE_CONNECTION: ${{secrets.TEST_DATA_PROD_CLOUD_ROUTER_2_VIRTUAL_DEVICE_CONNECTION}}
@@ -70,7 +74,7 @@ jobs:
           jq --arg timestamp "$TIMESTAMP" '.connection_name = ($timestamp + "_" + .connection_name)' ./examples/port-2-alibaba-connection/terraform.tfvars.json > ./examples/port-2-alibaba-connection/tmp.test.json && mv ./examples/port-2-alibaba-connection/tmp.test.json ./examples/port-2-alibaba-connection/terraform.tfvars.json
           echo $TEST_DATA_PROD_PORT_2_AWS_CONNECTION >> "./tests/examples-without-external-providers/port-2-aws-connection/terraform.tfvars.json"
           jq --arg timestamp "$TIMESTAMP" '.connection_name = ($timestamp + "_" + .connection_name)' ./tests/examples-without-external-providers/port-2-aws-connection/terraform.tfvars.json > ./tests/examples-without-external-providers/port-2-aws-connection/tmp.test.json && mv ./tests/examples-without-external-providers/port-2-aws-connection/tmp.test.json ./tests/examples-without-external-providers/port-2-aws-connection/terraform.tfvars.json
-          echo $TEST_DATA_PROD_PORT_2_AZURE_CONNECTION >> "./tests/examples-without-external-providers/port-2-azure-connection/terraform.tfvars.json"
+          echo $TEST_DATA_PROD_PORT_2_AZURE_CONNECTION >> "./examples/port-2-azure-connection/terraform.tfvars.json"
           jq --arg timestamp "$TIMESTAMP" '.connection_name = ($timestamp + "_" + .connection_name)' ./tests/examples-without-external-providers/port-2-azure-connection/terraform.tfvars.json > ./tests/examples-without-external-providers/port-2-azure-connection/tmp.test.json && mv ./tests/examples-without-external-providers/port-2-azure-connection/tmp.test.json ./tests/examples-without-external-providers/port-2-azure-connection/terraform.tfvars.json
           echo $GOOGLE_SERVICE_KEYS >> "./examples/port-2-google-connection/keys.json"
           echo $TEST_DATA_PROD_PORT_2_GOOGLE_CONNECTION >> "./examples/port-2-google-connection/terraform.tfvars.json"
@@ -89,9 +93,9 @@ jobs:
           jq --arg timestamp "$TIMESTAMP" '.connection_name = ($timestamp + "_" + .connection_name)' ./tests/examples-without-external-providers/cloud-router/terraform.tfvars.json > ./tests/examples-without-external-providers/cloud-router/tmp.test.json && mv ./tests/examples-without-external-providers/cloud-router/tmp.test.json ./tests/examples-without-external-providers/cloud-router/terraform.tfvars.json
           echo $TEST_DATA_PROD_CLOUD_ROUTER_2_AWS_CONNECTION >> "./tests/examples-without-external-providers/cloud-router-2-aws-connection/terraform.tfvars.json"
           jq --arg timestamp "$TIMESTAMP" '.connection_name = ($timestamp + "_" + .connection_name)' ./tests/examples-without-external-providers/cloud-router-2-aws-connection/terraform.tfvars.json > ./tests/examples-without-external-providers/cloud-router-2-aws-connection/tmp.test.json && mv ./tests/examples-without-external-providers/cloud-router-2-aws-connection/tmp.test.json ./tests/examples-without-external-providers/cloud-router-2-aws-connection/terraform.tfvars.json
-          echo $TEST_DATA_PROD_CLOUD_ROUTER_2_AZURE_CONNECTION >> "./tests/examples-without-external-providers/cloud-router-2-azure-connection/terraform.tfvars.json"
+          echo $TEST_DATA_PROD_CLOUD_ROUTER_2_AZURE_CONNECTION >> "./examples/cloud-router-2-azure-connection/terraform.tfvars.json"
           jq --arg timestamp "$TIMESTAMP" '.connection_name = ($timestamp + "_" + .connection_name)' ./tests/examples-without-external-providers/cloud-router-2-azure-connection/terraform.tfvars.json > ./tests/examples-without-external-providers/cloud-router-2-azure-connection/tmp.test.json && mv ./tests/examples-without-external-providers/cloud-router-2-azure-connection/tmp.test.json ./tests/examples-without-external-providers/cloud-router-2-azure-connection/terraform.tfvars.json
-          echo $TEST_DATA_PROD_CLOUD_ROUTER_2_PORT_ROUTING_PROTOCOL_CONNECTION >> "./tests/examples-without-external-providers/cloud-router-2-port-connection-with-routing-protocols-and-route-filters/terraform.tfvars.json"
+          echo $TEST_DATA_PROD_CLOUD_ROUTER_2_PORT_ROUTING_PROTOCOL_AND_ROUTE_FILTER_CONNECTION >> "./tests/examples-without-external-providers/cloud-router-2-port-connection-with-routing-protocols-and-route-filters/terraform.tfvars.json"
           jq --arg timestamp "$TIMESTAMP" '.connection_name = ($timestamp + "_" + .connection_name)' ./tests/examples-without-external-providers/cloud-router-2-port-routing-protocol-connection/terraform.tfvars.json > ./tests/examples-without-external-providers/cloud-router-2-port-routing-protocol-connection/tmp.test.json && mv ./tests/examples-without-external-providers/cloud-router-2-port-routing-protocol-connection/tmp.test.json ./tests/examples-without-external-providers/cloud-router-2-port-routing-protocol-connection/terraform.tfvars.json
           echo $TEST_DATA_PROD_CLOUD_ROUTER_2_SERVICE_PROFILE_CONNECTION >> "./examples/cloud-router-2-service-profile-connection/terraform.tfvars.json"
           jq --arg timestamp "$TIMESTAMP" '.connection_name = ($timestamp + "_" + .connection_name)' ./examples/cloud-router-2-service-profile-connection/terraform.tfvars.json > ./examples/cloud-router-2-service-profile-connection/tmp.test.json && mv ./examples/cloud-router-2-service-profile-connection/tmp.test.json ./examples/cloud-router-2-service-profile-connection/terraform.tfvars.json
@@ -99,7 +103,7 @@ jobs:
           jq --arg timestamp "$TIMESTAMP" '.connection_name = ($timestamp + "_" + .connection_name)' ./examples/cloud-router-2-wan-connection/terraform.tfvars.json > ./examples/cloud-router-2-wan-connection/tmp.test.json && mv ./examples/cloud-router-2-wan-connection/tmp.test.json ./examples/cloud-router-2-wan-connection/terraform.tfvars.json
           echo $TEST_DATA_PROD_VIRTUAL_DEVICE_2_WAN_CONNECTION >> "./tests/examples-without-external-providers/virtual-device-2-wan-connection/terraform.tfvars.json"
           jq --arg timestamp "$TIMESTAMP" '.connection_name = ($timestamp + "_" + .connection_name)' ./tests/examples-without-external-providers/virtual-device-2-wan-connection/terraform.tfvars.json > ./tests/examples-without-external-providers/virtual-device-2-wan-connection/tmp.test.json && mv ./tests/examples-without-external-providers/virtual-device-2-wan-connection/tmp.test.json ./tests/examples-without-external-providers/virtual-device-2-wan-connection/terraform.tfvars.json
-          echo $TEST_DATA_PROD_VIRTUAL_DEVICE_2_AZURE_CONNECTION >> "./tests/examples-without-external-providers/virtual-device-2-azure-connection/terraform.tfvars.json"
+          echo $TEST_DATA_PROD_VIRTUAL_DEVICE_2_AZURE_CONNECTION >> "./examples/virtual-device-2-azure-connection/terraform.tfvars.json"
           jq --arg timestamp "$TIMESTAMP" '.connection_name = ($timestamp + "_" + .connection_name)' ./tests/examples-without-external-providers/virtual-device-2-azure-connection/terraform.tfvars.json > ./tests/examples-without-external-providers/virtual-device-2-azure-connection/tmp.test.json && mv ./tests/examples-without-external-providers/virtual-device-2-azure-connection/tmp.test.json ./tests/examples-without-external-providers/virtual-device-2-azure-connection/terraform.tfvars.json
           echo $TEST_DATA_PROD_VIRTUAL_DEVICE_2_PORT_CONNECTION >> "./tests/examples-without-external-providers/virtual-device-2-port-connection/terraform.tfvars.json"
           jq --arg timestamp "$TIMESTAMP" '.connection_name = ($timestamp + "_" + .connection_name)' ./tests/examples-without-external-providers/virtual-device-2-port-connection/terraform.tfvars.json > ./tests/examples-without-external-providers/virtual-device-2-port-connection/tmp.test.json && mv ./tests/examples-without-external-providers/virtual-device-2-port-connection/tmp.test.json ./tests/examples-without-external-providers/virtual-device-2-port-connection/terraform.tfvars.json
diff --git a/.github/workflows/terratests-uat-suite.yaml b/.github/workflows/terratests-uat-suite.yaml
index 0c0404b..4541064 100644
--- a/.github/workflows/terratests-uat-suite.yaml
+++ b/.github/workflows/terratests-uat-suite.yaml
@@ -71,7 +71,7 @@ jobs:
       TEST_DATA_UAT_PORT_2_PUBLIC_SERVICE_PROFILE_CONNECTION: ${{ secrets.TEST_DATA_UAT_PORT_2_PUBLIC_SERVICE_PROFILE_CONNECTION }}
       TEST_DATA_UAT_CLOUD_ROUTER_2_AWS_CONNECTION: ${{secrets.TEST_DATA_UAT_CLOUD_ROUTER_2_AWS_CONNECTION}}
       TEST_DATA_UAT_CLOUD_ROUTER_2_AZURE_CONNECTION: ${{secrets.TEST_DATA_UAT_CLOUD_ROUTER_2_AZURE_CONNECTION}}
-      TEST_DATA_UAT_CLOUD_ROUTER_2_PORT_ROUTING_PROTOCOL_CONNECTION: ${{secrets.TEST_DATA_UAT_CLOUD_ROUTER_2_PORT_ROUTING_PROTOCOL_CONNECTION}}
+      TEST_DATA_UAT_CLOUD_ROUTER_2_PORT_ROUTING_PROTOCOL_AND_ROUTE_FILTER_CONNECTION: ${{secrets.TEST_DATA_UAT_CLOUD_ROUTER_2_PORT_ROUTING_PROTOCOL_AND_ROUTE_FILTER_CONNECTION}}
       TEST_DATA_UAT_CLOUD_ROUTER_2_SERVICE_PROFILE_CONNECTION: ${{secrets.TEST_DATA_UAT_CLOUD_ROUTER_2_SERVICE_PROFILE_CONNECTION}}
       TEST_DATA_UAT_CLOUD_ROUTER_2_WAN_CONNECTION: ${{secrets.TEST_DATA_UAT_CLOUD_ROUTER_2_WAN_CONNECTION}}
       TEST_DATA_UAT_CLOUD_ROUTER_2_VIRTUAL_DEVICE_CONNECTION: ${{secrets.TEST_DATA_UAT_CLOUD_ROUTER_2_VIRTUAL_DEVICE_CONNECTION}}
@@ -109,7 +109,7 @@ jobs:
 
           echo $TEST_DATA_UAT_CLOUD_ROUTER_2_AWS_CONNECTION >> "./tests/examples-without-external-providers/cloud-router-2-aws-connection/terraform.tfvars.json"
           echo $TEST_DATA_UAT_CLOUD_ROUTER_2_AZURE_CONNECTION >> "./tests/examples-without-external-providers/cloud-router-2-azure-connection/terraform.tfvars.json"
-          echo $TEST_DATA_UAT_CLOUD_ROUTER_2_PORT_ROUTING_PROTOCOL_CONNECTION >> "./tests/examples-without-external-providers/cloud-router-2-port-connection-with-routing-protocols-and-route-filters/terraform.tfvars.json"
+          echo $TEST_DATA_UAT_CLOUD_ROUTER_2_PORT_ROUTING_PROTOCOL_AND_ROUTE_FILTER_CONNECTION  >> "./tests/examples-without-external-providers/cloud-router-2-port-connection-with-routing-protocols-and-route-filters/terraform.tfvars.json"
           echo $TEST_DATA_UAT_CLOUD_ROUTER_2_SERVICE_PROFILE_CONNECTION >> "./examples/cloud-router-2-service-profile-connection/terraform.tfvars.json"
           echo $TEST_DATA_UAT_CLOUD_ROUTER_2_WAN_CONNECTION >> "./examples/cloud-router-2-wan-connection/terraform.tfvars.json"
           echo $TEST_DATA_UAT_CLOUD_ROUTER_2_VIRTUAL_DEVICE_CONNECTION >> "./examples/cloud-router-2-virtual-device-connection/terraform.tfvars.json"
diff --git a/.github/workflows/terratests-virtualdevice-prod-suite.yaml b/.github/workflows/terratests-virtualdevice-prod-suite.yaml
index f8f41a5..e59726f 100644
--- a/.github/workflows/terratests-virtualdevice-prod-suite.yaml
+++ b/.github/workflows/terratests-virtualdevice-prod-suite.yaml
@@ -10,6 +10,10 @@ jobs:
     env:
       TF_VAR_equinix_client_id: ${{ secrets.EQUINIX_CLIENT_ID }}
       TF_VAR_equinix_client_secret: ${{ secrets.EQUINIX_CLIENT_SECRET }}
+      TF_VAR_azure_client_id: ${{ secrets.AZURE_CLIENT_ID}}
+      TF_VAR_azure_client_secret: ${{ secrets.AZURE_CLIENT_SECRET}}
+      TF_VAR_azure_tenant_id: ${{ secrets.AZURE_TENANT_ID}}
+      TF_VAR_azure_subscription_id: ${{ secrets.AZURE_SUBSCRIPTION_ID}}
       TEST_DATA_PROD_VIRTUAL_DEVICE_2_WAN_CONNECTION: ${{ secrets.TEST_DATA_PROD_VIRTUAL_DEVICE_2_WAN_CONNECTION }}
       TEST_DATA_PROD_VIRTUAL_DEVICE_2_AZURE_CONNECTION: ${{secrets.TEST_DATA_PROD_VIRTUAL_DEVICE_2_AZURE_CONNECTION}}
       TEST_DATA_PROD_VIRTUAL_DEVICE_2_PORT_CONNECTION: ${{secrets.TEST_DATA_PROD_VIRTUAL_DEVICE_2_PORT_CONNECTION}}
@@ -51,7 +55,7 @@ jobs:
           SUFFIX="_DIGP"
           echo $TEST_DATA_PROD_VIRTUAL_DEVICE_2_WAN_CONNECTION >> "./tests/examples-without-external-providers/virtual-device-2-wan-connection/terraform.tfvars.json"
           jq --arg timestamp "$TIMESTAMP" '.connection_name = ($timestamp + "_" + .connection_name)' ./tests/examples-without-external-providers/virtual-device-2-wan-connection/terraform.tfvars.json > ./tests/examples-without-external-providers/virtual-device-2-wan-connection/tmp.test.json && mv ./tests/examples-without-external-providers/virtual-device-2-wan-connection/tmp.test.json ./tests/examples-without-external-providers/virtual-device-2-wan-connection/terraform.tfvars.json
-          echo $TEST_DATA_PROD_VIRTUAL_DEVICE_2_AZURE_CONNECTION >> "./tests/examples-without-external-providers/virtual-device-2-azure-connection/terraform.tfvars.json"
+          echo $TEST_DATA_PROD_VIRTUAL_DEVICE_2_AZURE_CONNECTION >> "./examples/virtual-device-2-azure-connection/terraform.tfvars.json"
           jq --arg timestamp "$TIMESTAMP" '.connection_name = ($timestamp + "_" + .connection_name)' ./tests/examples-without-external-providers/virtual-device-2-azure-connection/terraform.tfvars.json > ./tests/examples-without-external-providers/virtual-device-2-azure-connection/tmp.test.json && mv ./tests/examples-without-external-providers/virtual-device-2-azure-connection/tmp.test.json ./tests/examples-without-external-providers/virtual-device-2-azure-connection/terraform.tfvars.json
           echo $TEST_DATA_PROD_VIRTUAL_DEVICE_2_PORT_CONNECTION >> "./tests/examples-without-external-providers/virtual-device-2-port-connection/terraform.tfvars.json"
           jq --arg timestamp "$TIMESTAMP" '.connection_name = ($timestamp + "_" + .connection_name)' ./tests/examples-without-external-providers/virtual-device-2-port-connection/terraform.tfvars.json > ./tests/examples-without-external-providers/virtual-device-2-port-connection/tmp.test.json && mv ./tests/examples-without-external-providers/virtual-device-2-port-connection/tmp.test.json ./tests/examples-without-external-providers/virtual-device-2-port-connection/terraform.tfvars.json
diff --git a/tests/prod/cloud-router/prod_sanity_fcr_test.go b/tests/prod/cloud-router/prod_sanity_fcr_test.go
index c4586bc..94b157c 100644
--- a/tests/prod/cloud-router/prod_sanity_fcr_test.go
+++ b/tests/prod/cloud-router/prod_sanity_fcr_test.go
@@ -53,7 +53,7 @@ func TestCloudRouter2AwsCreateConnection_DIGP(t *testing.T) {
 func TestCloudRouter2AzureCreateConnection_DIGP(t *testing.T) {
 
 	terraformOptions := terraform.WithDefaultRetryableErrors(t, &terraform.Options{
-		TerraformDir: "../../../tests/examples-without-external-providers/cloud-router-2-azure-connection",
+		TerraformDir: "../../../examples/cloud-router-2-azure-connection",
 	})
 
 	defer terraform.Destroy(t, terraformOptions)
@@ -64,7 +64,7 @@ func TestCloudRouter2AzureCreateConnection_DIGP(t *testing.T) {
 	assert.NotNil(t, output)
 }
 
-func TestCloudRouter2PortRoutingProtocolCreateConnection_DIGP(t *testing.T) {
+func  TestCloudRouter2PortRoutingProtocolAndRouteFilterCreateConnection_DIGP(t *testing.T) {
 
 	terraformOptions := terraform.WithDefaultRetryableErrors(t, &terraform.Options{
 		TerraformDir: "../../../tests/examples-without-external-providers/cloud-router-2-port-connection-with-routing-protocols-and-route-filters",
diff --git a/tests/prod/port/prod_sanity_port_test.go b/tests/prod/port/prod_sanity_port_test.go
index ab2f698..f5f14f5 100644
--- a/tests/prod/port/prod_sanity_port_test.go
+++ b/tests/prod/port/prod_sanity_port_test.go
@@ -45,7 +45,7 @@ func TestPort2AwsCreateConnection_DIGP(t *testing.T) {
 func TestPort2AzureCreateConnection_DIGP(t *testing.T) {
 
 	terraformOptions := terraform.WithDefaultRetryableErrors(t, &terraform.Options{
-		TerraformDir: "../../../tests/examples-without-external-providers/port-2-azure-connection",
+		TerraformDir: "../../../examples/port-2-azure-connection",
 	})
 
 	defer terraform.Destroy(t, terraformOptions)
@@ -59,7 +59,7 @@ func TestPort2AzureCreateConnection_DIGP(t *testing.T) {
 		Vars: map[string]interface{}{
 			"connection_name": "P2Azure_Name_Update",
 		},
-		TerraformDir: "../../../tests/examples-without-external-providers/port-2-azure-connection",
+		TerraformDir: "../../../examples/port-2-azure-connection",
 	})
 	terraform.Apply(t, terraformOptions)
 }
diff --git a/tests/prod/prod_sanity_suite_test.go b/tests/prod/prod_sanity_suite_test.go
index e68d9d5..fcaedfe 100644
--- a/tests/prod/prod_sanity_suite_test.go
+++ b/tests/prod/prod_sanity_suite_test.go
@@ -45,7 +45,7 @@ func TestPort2AwsCreateConnection_DIGP(t *testing.T) {
 func TestPort2AzureCreateConnection_DIGP(t *testing.T) {
 
 	terraformOptions := terraform.WithDefaultRetryableErrors(t, &terraform.Options{
-		TerraformDir: "../../tests/examples-without-external-providers/port-2-azure-connection",
+		TerraformDir: "../../examples/port-2-azure-connection",
 	})
 
 	defer terraform.Destroy(t, terraformOptions)
@@ -190,7 +190,7 @@ func TestCloudRouter2AwsCreateConnection_DIGP(t *testing.T) {
 func TestCloudRouter2AzureCreateConnection_DIGP(t *testing.T) {
 
 	terraformOptions := terraform.WithDefaultRetryableErrors(t, &terraform.Options{
-		TerraformDir: "../../tests/examples-without-external-providers/cloud-router-2-azure-connection",
+		TerraformDir: "../../examples/cloud-router-2-azure-connection",
 	})
 
 	defer terraform.Destroy(t, terraformOptions)
@@ -201,10 +201,10 @@ func TestCloudRouter2AzureCreateConnection_DIGP(t *testing.T) {
 	assert.NotNil(t, output)
 }
 
-func TestCloudRouter2PortRoutingProtocolCreateConnection_DIGP(t *testing.T) {
+func TestCloudRouter2PortRoutingProtocolAndRouteFilterCreateConnection_DIGP(t *testing.T) {
 
 	terraformOptions := terraform.WithDefaultRetryableErrors(t, &terraform.Options{
-		TerraformDir: "../../tests/examples-without-external-providers/cloud-router-2-port-routing-protocol-connection",
+		TerraformDir: "../../tests/examples-without-external-providers/cloud-router-2-port-connection-with-routing-protocols-and-route-filters",
 	})
 
 	defer terraform.Destroy(t, terraformOptions)
@@ -219,7 +219,7 @@ func TestCloudRouter2PortRoutingProtocolCreateConnection_DIGP(t *testing.T) {
 			"connection_name": "FCR2Port_Name_Update",
 			"bandwidth":       100,
 		},
-		TerraformDir: "../../tests/examples-without-external-providers/cloud-router-2-port-routing-protocol-connection",
+		TerraformDir: "../../tests/examples-without-external-providers/cloud-router-2-port-connection-with-routing-protocols-and-route-filters",
 	})
 	terraform.Apply(t, terraformOptions)
 }
diff --git a/tests/prod/virtual-device/prod_sanity_vd_test.go b/tests/prod/virtual-device/prod_sanity_vd_test.go
index 79a47d8..8c64b97 100644
--- a/tests/prod/virtual-device/prod_sanity_vd_test.go
+++ b/tests/prod/virtual-device/prod_sanity_vd_test.go
@@ -31,7 +31,7 @@ func TestVirtualDevice2WanCreateConnection_DIGP(t *testing.T) {
 func TestVirtualDevice2AzureCreateConnection_DIGP(t *testing.T) {
 
 	terraformOptions := terraform.WithDefaultRetryableErrors(t, &terraform.Options{
-		TerraformDir: "../../../tests/examples-without-external-providers/virtual-device-2-azure-connection",
+		TerraformDir: "../../../examples/virtual-device-2-azure-connection",
 	})
 
 	defer terraform.Destroy(t, terraformOptions)
diff --git a/tests/uat/uat_sanity_suite_test.go b/tests/uat/uat_sanity_suite_test.go
index e58697f..a41f9a7 100644
--- a/tests/uat/uat_sanity_suite_test.go
+++ b/tests/uat/uat_sanity_suite_test.go
@@ -140,7 +140,7 @@ func TestCloudRouter2AzureCreateConnection_PFCR(t *testing.T) {
 	assert.NotNil(t, output)
 }
 
-func TestCloudRouter2PortRoutingProtocolCreateConnection_PFCR(t *testing.T) {
+func  TestCloudRouter2PortRoutingProtocolAndRouteFilterCreateConnection_PFCR(t *testing.T) {
 
 	terraformOptions := terraform.WithDefaultRetryableErrors(t, &terraform.Options{
 		TerraformDir: "../../tests/examples-without-external-providers/cloud-router-2-port-connection-with-routing-protocols-and-route-filters",