diff --git a/NOTICE b/NOTICE
index 6073b9ea75745349129f6595ee28e6fcef33686a..4550b9d844884e80d69c14c5b5c3f9c9c91b6a27 100644
--- a/NOTICE
+++ b/NOTICE
@@ -39,7 +39,6 @@ The following software have components provided under the terms of this license:
 - Apache Commons Logging (from http://commons.apache.org/proper/commons-logging/)
 - Apache Geronimo JMS Spec 2.0 (from http://geronimo.apache.org/maven/${siteId}/${version})
 - Apache HttpAsyncClient (from http://hc.apache.org/httpcomponents-asyncclient)
-- Apache HttpClient (from http://hc.apache.org/httpcomponents-client)
 - Apache HttpClient Cache (from http://hc.apache.org/httpcomponents-client)
 - Apache HttpCore (from http://hc.apache.org/httpcomponents-core-ga)
 - Apache HttpCore NIO (from http://hc.apache.org/httpcomponents-core-ga)
@@ -58,7 +57,7 @@ The following software have components provided under the terms of this license:
 - Brave Instrumentation: Http Adapters (from https://repo1.maven.org/maven2/io/zipkin/brave/brave-instrumentation-http)
 - Brave instrumentation for Reactor Netty HTTP (from https://github.com/reactor/reactor-netty)
 - Byte Buddy (without dependencies) (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy)
-- Byte Buddy agent (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent)
+- Byte Buddy Java agent (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent)
 - ClassMate (from http://github.com/cowtowncoder/java-classmate)
 - Cloud Key Management Service (KMS) API v1-rev20210820-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms)
 - Cloud Storage JSON API v1-rev20200814-1.30.10 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage)
@@ -72,7 +71,7 @@ The following software have components provided under the terms of this license:
 - Google APIs Client Library for Java (from https://repo1.maven.org/maven2/com/google/api-client/google-api-client)
 - Google App Engine extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-appengine)
 - Google Cloud Core (from https://github.com/googleapis/java-core)
-- Google Cloud Core HTTP (from https://github.com/googleapis/java-core)
+- Google Cloud Core HTTP (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-http)
 - Google Cloud Core gRPC (from https://github.com/googleapis/java-core)
 - Google Cloud Datastore (from https://github.com/googleapis/java-datastore)
 - Google Cloud IAM Service Account Credentials (from https://github.com/googleapis/java-iamcredentials)
@@ -82,8 +81,8 @@ The following software have components provided under the terms of this license:
 - Google HTTP Client Library for Java (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client)
 - Google HTTP Client Library for Java (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client)
 - Google OAuth Client Library for Java (from https://repo1.maven.org/maven2/com/google/oauth-client/google-oauth-client)
-- Gson (from https://repo1.maven.org/maven2/com/google/code/gson/gson)
-- Gson (from https://repo1.maven.org/maven2/com/google/code/gson/gson)
+- Gson (from http://code.google.com/p/google-gson/)
+- Gson (from http://code.google.com/p/google-gson/)
 - Guava InternalFutureFailureAccess and InternalFutures (from https://repo1.maven.org/maven2/com/google/guava/failureaccess)
 - Guava InternalFutureFailureAccess and InternalFutures (from https://repo1.maven.org/maven2/com/google/guava/failureaccess)
 - Guava: Google Core Libraries for Java (from https://repo1.maven.org/maven2/com/google/guava/guava)
@@ -92,6 +91,7 @@ The following software have components provided under the terms of this license:
 - HTTP functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty)
 - Hibernate Validator Engine (from https://repo1.maven.org/maven2/org/hibernate/validator/hibernate-validator)
 - Hibernate Validator Engine (from https://repo1.maven.org/maven2/org/hibernate/validator/hibernate-validator)
+- HttpClient (from http://hc.apache.org/httpcomponents-client)
 - IBM COS Java SDK for Amazon S3 (from https://github.com/ibm/ibm-cos-sdk-java)
 - IBM COS Java SDK for COS KMS (from https://github.com/ibm/ibm-cos-sdk-java)
 - IBM COS SDK For Java (from https://github.com/ibm/ibm-cos-sdk-java)
@@ -116,11 +116,11 @@ The following software have components provided under the terms of this license:
 - Jackson extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson)
 - Jackson module: Afterburner (from https://github.com/FasterXML/jackson-modules-base)
 - Jackson-annotations (from http://github.com/FasterXML/jackson)
-- Jackson-core (from http://wiki.fasterxml.com/JacksonHome)
-- Jackson-core (from http://wiki.fasterxml.com/JacksonHome)
+- Jackson-core (from https://github.com/FasterXML/jackson)
+- Jackson-core (from https://github.com/FasterXML/jackson)
 - Jackson-dataformat-Smile (from http://wiki.fasterxml.com/JacksonForSmile)
 - Jackson-dataformat-XML (from https://github.com/FasterXML/jackson-dataformat-xml)
-- Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson)
+- Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson-dataformats-text)
 - Jackson-datatype-Joda (from http://wiki.fasterxml.com/JacksonModuleJoda)
 - Jackson-module-JAXB-annotations (from http://wiki.fasterxml.com/JacksonJAXBAnnotations)
 - Jackson-module-parameter-names (from https://repo1.maven.org/maven2/com/fasterxml/jackson/module/jackson-module-parameter-names)
@@ -198,12 +198,12 @@ The following software have components provided under the terms of this license:
 - Nimbus JOSE+JWT (from https://bitbucket.org/connect2id/nimbus-jose-jwt)
 - Nimbus LangTag (from https://bitbucket.org/connect2id/nimbus-language-tags)
 - Nimbus LangTag (from https://bitbucket.org/connect2id/nimbus-language-tags)
-- Non-Blocking Reactive Foundation for the JVM (from https://github.com/reactor/reactor-core)
+- Non-Blocking Reactive Foundation for the JVM (from https://github.com/reactor/reactor)
 - OAuth 2.0 SDK with OpenID Connect extensions (from https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions)
 - OAuth 2.0 SDK with OpenID Connect extensions (from https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions)
 - Objenesis (from http://objenesis.org)
-- Okio (from https://github.com/square/okio/)
-- Okio (from https://github.com/square/okio/)
+- Okio (from https://repo1.maven.org/maven2/com/squareup/okio/okio)
+- Okio (from https://repo1.maven.org/maven2/com/squareup/okio/okio)
 - OpenCensus (from https://github.com/census-instrumentation/opencensus-java)
 - OpenCensus (from https://github.com/census-instrumentation/opencensus-java)
 - OpenCensus (from https://github.com/census-instrumentation/opencensus-java)
@@ -220,30 +220,32 @@ The following software have components provided under the terms of this license:
 - Reactive Streams Netty driver (from https://github.com/reactor/reactor-netty)
 - Retrofit (from https://repo1.maven.org/maven2/com/squareup/retrofit2/retrofit)
 - SnakeYAML (from http://www.snakeyaml.org)
-- Spring Beans (from https://github.com/SpringSource/spring-framework)
-- Spring Boot (from http://projects.spring.io/spring-boot/)
-- Spring Boot AutoConfigure (from http://projects.spring.io/spring-boot/)
-- Spring Boot Json Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-json)
-- Spring Boot Log4j 2 Starter (from https://projects.spring.io/spring-boot/)
-- Spring Boot Logging Starter (from http://projects.spring.io/spring-boot/)
-- Spring Boot Starter (from http://projects.spring.io/spring-boot/)
-- Spring Boot Test (from http://projects.spring.io/spring-boot/)
-- Spring Boot Test Auto-Configure (from http://projects.spring.io/spring-boot/)
-- Spring Boot Test Starter (from http://projects.spring.io/spring-boot/)
-- Spring Boot Tomcat Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-tomcat)
+- Spring AOP (from https://github.com/spring-projects/spring-framework)
+- Spring Beans (from https://github.com/spring-projects/spring-framework)
+- Spring Boot AOP Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-aop)
+- Spring Boot Actuator (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-actuator)
+- Spring Boot Logging Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-logging)
+- Spring Boot Reactor Netty Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-reactor-netty)
+- Spring Boot Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter)
+- Spring Boot Test (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-test)
 - Spring Boot Undertow Starter (from https://projects.spring.io/spring-boot/)
 - Spring Boot Undertow Starter (from https://projects.spring.io/spring-boot/)
 - Spring Boot Web Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-web)
 - Spring Boot Web Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-web)
+- Spring Boot WebFlux Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-webflux)
 - Spring Commons Logging Bridge (from https://github.com/spring-projects/spring-framework)
-- Spring Core (from https://github.com/SpringSource/spring-framework)
+- Spring Context (from https://github.com/spring-projects/spring-framework)
+- Spring Core (from https://github.com/spring-projects/spring-framework)
 - Spring Data Core (from https://repo1.maven.org/maven2/org/springframework/data/spring-data-commons)
-- Spring Framework: JMS (from http://www.springframework.org)
-- Spring Framework: Web (from http://www.springframework.org)
-- Spring Framework: WebMVC (from http://www.springframework.org)
+- Spring Expression Language (SpEL) (from https://github.com/spring-projects/spring-framework)
+- Spring JMS (from https://github.com/spring-projects/spring-framework)
 - Spring Messaging (from https://github.com/spring-projects/spring-framework)
 - Spring Plugin - Metadata Extension (from https://repo1.maven.org/maven2/org/springframework/plugin/spring-plugin-metadata)
 - Spring Plugin Core (from https://repo1.maven.org/maven2/org/springframework/plugin/spring-plugin-core)
+- Spring TestContext Framework (from https://github.com/spring-projects/spring-framework)
+- Spring Transaction (from https://github.com/spring-projects/spring-framework)
+- Spring Web (from https://github.com/spring-projects/spring-framework)
+- Spring Web MVC (from https://github.com/spring-projects/spring-framework)
 - Spring WebFlux (from https://github.com/spring-projects/spring-framework)
 - T-Digest (from https://github.com/tdunning/t-digest)
 - Undertow Core (from https://repo1.maven.org/maven2/io/undertow/undertow-core)
@@ -265,12 +267,10 @@ The following software have components provided under the terms of this license:
 - Zipkin Reporter: Core (from https://repo1.maven.org/maven2/io/zipkin/reporter2/zipkin-reporter)
 - aalto-xml (from )
 - aggs-matrix-stats (from https://github.com/elastic/elasticsearch)
+- cli (from https://github.com/elastic/elasticsearch)
 - compiler (from http://github.com/spullara/mustache.java)
+- core (from https://github.com/elastic/elasticsearch)
 - datastore-v1-proto-client (from https://repo1.maven.org/maven2/com/google/cloud/datastore/datastore-v1-proto-client)
-- elasticsearch-cli (from https://github.com/elastic/elasticsearch)
-- elasticsearch-core (from https://github.com/elastic/elasticsearch)
-- elasticsearch-secure-sm (from https://github.com/elastic/elasticsearch)
-- elasticsearch-x-content (from https://github.com/elastic/elasticsearch)
 - error-prone annotations (from https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations)
 - error-prone annotations (from https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations)
 - grpc-google-cloud-pubsub-v1 (from https://repo1.maven.org/maven2/com/google/api/grpc/grpc-google-cloud-pubsub-v1)
@@ -292,8 +292,8 @@ The following software have components provided under the terms of this license:
 - io.grpc:grpc-stub (from https://github.com/grpc/grpc-java)
 - ion-java (from https://github.com/amznlabs/ion-java/)
 - ion-java (from https://github.com/amznlabs/ion-java/)
-- jackson-databind (from http://wiki.fasterxml.com/JacksonHome)
-- jackson-databind (from http://wiki.fasterxml.com/JacksonHome)
+- jackson-databind (from http://github.com/FasterXML/jackson)
+- jackson-databind (from http://github.com/FasterXML/jackson)
 - java-cloudant (from https://cloudant.com)
 - java-cloudant (from https://cloudant.com)
 - javatuples (from http://www.javatuples.org)
@@ -303,7 +303,7 @@ The following software have components provided under the terms of this license:
 - lettuce (from http://github.com/mp911de/lettuce/wiki)
 - micrometer-core (from https://github.com/micrometer-metrics/micrometer)
 - micrometer-registry-azure-monitor (from https://github.com/micrometer-metrics/micrometer)
-- mockito-core (from http://mockito.org)
+- mockito-core (from https://github.com/mockito/mockito)
 - nio-multipart-parser (from )
 - nio-stream-storage (from https://github.com/synchronoss/nio-stream-storage)
 - okhttp (from https://square.github.io/okhttp/)
@@ -314,7 +314,7 @@ The following software have components provided under the terms of this license:
 - org.apiguardian:apiguardian-api (from https://github.com/apiguardian-team/apiguardian)
 - org.conscrypt:conscrypt-openjdk-uber (from https://conscrypt.org/)
 - org.opentest4j:opentest4j (from https://github.com/ota4j-team/opentest4j)
-- org.xmlunit:xmlunit-core (from http://www.xmlunit.org/)
+- org.xmlunit:xmlunit-core (from https://www.xmlunit.org/)
 - parent-join (from https://github.com/elastic/elasticsearch)
 - perfmark:perfmark-api (from https://github.com/perfmark/perfmark)
 - project ':json-path' (from https://github.com/jayway/JsonPath)
@@ -328,40 +328,39 @@ The following software have components provided under the terms of this license:
 - proton-j (from https://repo1.maven.org/maven2/org/apache/qpid/proton-j)
 - rank-eval (from https://github.com/elastic/elasticsearch)
 - resilience4j (from https://github.com/resilience4j/resilience4j)
-- resilience4j (from https://github.com/resilience4j/resilience4j)
-- resilience4j (from https://resilience4j.readme.io)
 - resilience4j (from https://resilience4j.readme.io)
 - resilience4j (from https://github.com/resilience4j/resilience4j)
 - resilience4j (from https://resilience4j.readme.io)
 - resilience4j (from https://github.com/resilience4j/resilience4j)
+- resilience4j (from https://github.com/resilience4j/resilience4j)
 - resilience4j (from https://resilience4j.readme.io)
+- resilience4j (from https://github.com/resilience4j/resilience4j)
 - rest (from https://github.com/elastic/elasticsearch)
 - rest-high-level (from https://github.com/elastic/elasticsearch)
 - rxjava (from https://github.com/ReactiveX/RxJava)
+- secure-sm (from https://github.com/elastic/elasticsearch)
 - server (from https://github.com/elastic/elasticsearch)
-- spring-aop (from https://repo1.maven.org/maven2/org/springframework/spring-aop)
-- spring-boot-actuator (from https://spring.io/projects/spring-boot)
+- spring-boot (from https://spring.io/projects/spring-boot)
 - spring-boot-actuator-autoconfigure (from https://spring.io/projects/spring-boot)
+- spring-boot-autoconfigure (from https://spring.io/projects/spring-boot)
 - spring-boot-dependencies (from https://spring.io/projects/spring-boot)
 - spring-boot-starter-actuator (from https://spring.io/projects/spring-boot)
-- spring-boot-starter-aop (from https://spring.io/projects/spring-boot)
-- spring-boot-starter-reactor-netty (from https://spring.io/projects/spring-boot)
+- spring-boot-starter-json (from https://spring.io/projects/spring-boot)
+- spring-boot-starter-log4j2 (from https://spring.io/projects/spring-boot)
 - spring-boot-starter-security (from https://spring.io/projects/spring-boot)
+- spring-boot-starter-test (from https://spring.io/projects/spring-boot)
+- spring-boot-starter-tomcat (from https://spring.io/projects/spring-boot)
 - spring-boot-starter-validation (from https://spring.io/projects/spring-boot)
 - spring-boot-starter-validation (from https://spring.io/projects/spring-boot)
-- spring-boot-starter-webflux (from https://spring.io/projects/spring-boot)
-- spring-context (from https://repo1.maven.org/maven2/org/springframework/spring-context)
-- spring-expression (from https://repo1.maven.org/maven2/org/springframework/spring-expression)
-- spring-security-config (from https://spring.io/projects/spring-security)
-- spring-security-config (from https://spring.io/projects/spring-security)
-- spring-security-core (from https://spring.io/projects/spring-security)
-- spring-security-oauth2-core (from https://spring.io/projects/spring-security)
-- spring-security-oauth2-jose (from https://spring.io/projects/spring-security)
+- spring-boot-test-autoconfigure (from https://spring.io/projects/spring-boot)
+- spring-security-config (from https://spring.io/spring-security)
+- spring-security-config (from https://spring.io/spring-security)
+- spring-security-core (from https://spring.io/spring-security)
+- spring-security-oauth2-core (from https://spring.io/spring-security)
+- spring-security-oauth2-jose (from https://spring.io/spring-security)
 - spring-security-oauth2-resource-server (from https://spring.io/projects/spring-security)
-- spring-security-web (from https://spring.io/projects/spring-security)
-- spring-security-web (from https://spring.io/projects/spring-security)
-- spring-test (from https://repo1.maven.org/maven2/org/springframework/spring-test)
-- spring-tx (from https://repo1.maven.org/maven2/org/springframework/spring-tx)
+- spring-security-web (from https://spring.io/spring-security)
+- spring-security-web (from https://spring.io/spring-security)
 - springfox-core (from https://github.com/springfox/springfox)
 - springfox-schema (from https://github.com/springfox/springfox)
 - springfox-spi (from https://github.com/springfox/springfox)
@@ -376,6 +375,7 @@ The following software have components provided under the terms of this license:
 - tomcat-embed-el (from http://tomcat.apache.org/)
 - tomcat-embed-websocket (from https://tomcat.apache.org/)
 - wildfly-common (from https://repo1.maven.org/maven2/org/wildfly/common/wildfly-common)
+- x-content (from https://github.com/elastic/elasticsearch)
 
 ========================================================================
 BSD-2-Clause
@@ -418,7 +418,7 @@ The following software have components provided under the terms of this license:
 - Protocol Buffers [Util] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util)
 - Reflections (from http://github.com/ronmamo/reflections)
 - SnakeYAML (from http://www.snakeyaml.org)
-- Spring Core (from https://github.com/SpringSource/spring-framework)
+- Spring Core (from https://github.com/spring-projects/spring-framework)
 - ThreeTen backport (from https://www.threeten.org/threetenbp)
 - asm (from http://asm.ow2.io/)
 
@@ -451,7 +451,7 @@ CDDL-1.0
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- JAXB RI (from http://jaxb.java.net/)
+- JAXB Reference Implementation (from http://jaxb.java.net/)
 - JavaBeans Activation Framework API jar (from )
 - Old JAXB Core (from https://eclipse-ee4j.github.io/jaxb-ri/)
 
@@ -530,7 +530,7 @@ GPL-2.0-only
 The following software have components provided under the terms of this license:
 
 - Expression Language 3.0 (from http://uel.java.net)
-- JAXB RI (from http://jaxb.java.net/)
+- JAXB Reference Implementation (from http://jaxb.java.net/)
 - Java Architecture for XML Binding (from http://jaxb.java.net/)
 - Java Architecture for XML Binding (from http://jaxb.java.net/)
 - Java Servlet 4.0 API (from )
@@ -556,7 +556,7 @@ The following software have components provided under the terms of this license:
 - Checker Qual (from https://checkerframework.org)
 - Expression Language 3.0 (from http://uel.java.net)
 - Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el)
-- JAXB RI (from http://jaxb.java.net/)
+- JAXB Reference Implementation (from http://jaxb.java.net/)
 - JBoss Jakarta Annotations API (from https://github.com/jboss/jboss-jakarta-annotations-api_spec)
 - Java Architecture for XML Binding (from http://jaxb.java.net/)
 - Java Architecture for XML Binding (from http://jaxb.java.net/)
@@ -577,7 +577,7 @@ GPL-3.0-only
 The following software have components provided under the terms of this license:
 
 - Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el)
-- JAXB RI (from http://jaxb.java.net/)
+- JAXB Reference Implementation (from http://jaxb.java.net/)
 - JBoss Jakarta Annotations API (from https://github.com/jboss/jboss-jakarta-annotations-api_spec)
 - Java Servlet 4.0 API (from )
 - Java Servlet 4.0 API (from )
@@ -681,12 +681,12 @@ The following software have components provided under the terms of this license:
 - java jwt (from https://github.com/auth0/java-jwt)
 - java jwt (from https://github.com/auth0/java-jwt)
 - micrometer-core (from https://github.com/micrometer-metrics/micrometer)
-- mockito-core (from http://mockito.org)
+- mockito-core (from https://github.com/mockito/mockito)
 - mockito-junit-jupiter (from https://github.com/mockito/mockito)
 - msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java)
 - msal4j-persistence-extension (from https://github.com/AzureAD/microsoft-authentication-extensions-for-java)
 - qpid-proton-j-extensions (from https://github.com/Azure/qpid-proton-j-extensions)
-- spring-security-core (from https://spring.io/projects/spring-security)
+- spring-security-core (from https://spring.io/spring-security)
 
 ========================================================================
 MPL-1.1
@@ -717,7 +717,7 @@ Public-Domain
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- JAXB RI (from http://jaxb.java.net/)
+- JAXB Reference Implementation (from http://jaxb.java.net/)
 - Old JAXB Core (from https://eclipse-ee4j.github.io/jaxb-ri/)
 - Spongy Castle (from http://rtyley.github.io/spongycastle/)
 
@@ -759,7 +759,7 @@ The following software have components provided under the terms of this license:
 - Microsoft Azure SDK for SQL API of Azure Cosmos DB Service (from https://github.com/Azure/azure-sdk-for-java)
 - Microsoft Azure client library for Blob Storage (from https://github.com/Azure/azure-sdk-for-java)
 - Project Lombok (from http://projectlombok.org)
-- Spring Framework: Web (from http://www.springframework.org)
+- Spring Web (from https://github.com/spring-projects/spring-framework)
 - azure-documentdb (from http://azure.microsoft.com/en-us/services/documentdb/)
 - msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java)
 - reactive-streams (from http://www.reactive-streams.org/)
diff --git a/testing/notification-test-azure/src/test/java/org/opengroup/osdu/notification/api/StorageIntegrationDescriptor.java b/testing/notification-test-azure/src/test/java/org/opengroup/osdu/notification/api/StorageIntegrationDescriptor.java
index 3dee5339b926db66dd40bd43d06b3e82400e3c11..118191df710d2bcf31ea8589840535eac04ff165 100644
--- a/testing/notification-test-azure/src/test/java/org/opengroup/osdu/notification/api/StorageIntegrationDescriptor.java
+++ b/testing/notification-test-azure/src/test/java/org/opengroup/osdu/notification/api/StorageIntegrationDescriptor.java
@@ -25,6 +25,7 @@ import java.util.UUID;
 public class StorageIntegrationDescriptor extends RestDescriptor {
 
     protected static final String LEGAL_TAG = TestUtils.getOsduTenant() + "-test-tag";
+    protected static final String DOMAIN = System.getProperty("DOMAIN", System.getenv("DOMAIN"));
 
     @Override
     public String getPath() {
@@ -38,6 +39,7 @@ public class StorageIntegrationDescriptor extends RestDescriptor {
 
     @Override
     public String getValidBody() {
+        String postfix = String.format("%s.%s", TestUtils.getOsduTenant(), DOMAIN);
         return "[\n" +
                 "  {\n" +
                 "      \"data\":{\n" +
@@ -49,9 +51,9 @@ public class StorageIntegrationDescriptor extends RestDescriptor {
                 "      \"kind\":\"opendes:at:wellbore:1.0.0\",\n" +
                 "      \"acl\":{\n" +
                 "            \"viewers\":[\n" +
-                "                 \"data.test1@opendes.contoso.com\"],\n" +
+                "                 \"data.test1@" + postfix + "\"],\n" +
                 "            \"owners\":[\n" +
-                "                 \"data.test1@opendes.contoso.com\"]},\n" +
+                "                 \"data.test1@" + postfix + "\"]},\n" +
                 "      \"legal\":{\n" +
                 "            \"legaltags\":[\n" +
                 "                 \"" + LEGAL_TAG + "\"],\n" +