diff --git a/NOTICE b/NOTICE
index 8a59bd973bb15b6f4a1d824b301100ddb76f1430..32f59e449ca19ff041688b2a850ed2bdb9f682ac 100644
--- a/NOTICE
+++ b/NOTICE
@@ -2,13 +2,6 @@
 Generated by fossa-cli (https://github.com/fossas/fossa-cli).
 This software includes the following software and licenses:
 
-========================================================================
-Android-Sdk
-========================================================================
-The following software have components provided under the terms of this license:
-
-- Android SDK (from https://www.android.com/)
-
 ========================================================================
 Apache-2.0
 ========================================================================
@@ -69,7 +62,6 @@ The following software have components provided under the terms of this license:
 - AssertJ fluent assertions (from )
 - Asynchronous Http Client (from )
 - Asynchronous Http Client Netty Utils (from )
-- AutoValue Annotations (from )
 - Azure Spring Boot Starter for Azure AD Spring Security Integration (from https://github.com/Azure/azure-sdk-for-java)
 - Bean Validation API (from http://beanvalidation.org)
 - Brave Instrumentation: Http Adapters (from )
@@ -77,36 +69,22 @@ The following software have components provided under the terms of this license:
 - Byte Buddy (without dependencies) (from )
 - Byte Buddy Java agent (from )
 - ClassMate (from http://github.com/cowtowncoder/java-classmate)
-- Cloud Storage JSON API v1-rev58-1.21.0 (from )
 - Commons IO (from http://commons.apache.org/io/)
 - Converter: Jackson (from )
 - Core functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty)
 - Elastic JNA Distribution (from https://github.com/java-native-access/jna)
 - Elasticsearch: 5.0.0-alpha5 (from https://github.com/elastic/elasticsearch)
-- Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el)
 - Expression Language 3.0 (from http://uel.java.net)
+- Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el)
 - FindBugs-jsr305 (from http://findbugs.sourceforge.net/)
-- GSON extensions to the Google HTTP Client Library for Java. (from )
 - Google APIs Client Library for Java (from )
-- Google App Engine extensions to the Google HTTP Client Library for Java. (from )
-- Google Cloud Core (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core)
-- Google Cloud Core HTTP (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-http)
-- Google Cloud Core gRPC (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-grpc)
-- Google Cloud Datastore (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore)
-- Google Cloud Key Management Service (KMS) API v1-rev22-1.23.0 (from )
-- Google Cloud Logging (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-logging)
-- Google Cloud Pub/Sub (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-pubsub)
-- Google Cloud Storage (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-storage)
-- Google HTTP Client Library for Java (from https://github.com/google/google-http-java-client.git)
 - Google HTTP Client Library for Java (from https://github.com/google/google-http-java-client.git)
 - Google OAuth Client Library for Java (from )
 - Gson (from https://github.com/google/gson)
 - Gson (from https://github.com/google/gson)
 - Guava InternalFutureFailureAccess and InternalFutures (from )
-- Guava InternalFutureFailureAccess and InternalFutures (from )
 - Guava ListenableFuture only (from )
 - Guava: Google Core Libraries for Java (from https://github.com/google/guava.git)
-- Guava: Google Core Libraries for Java (from https://github.com/google/guava.git)
 - HPPC Collections (from http://labs.carrotsearch.com)
 - HTTP functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty)
 - Hibernate Validator Engine (from )
@@ -117,7 +95,6 @@ The following software have components provided under the terms of this license:
 - IBM COS SDK For Java (from https://github.com/ibm/ibm-cos-sdk-java)
 - IBM COS SDK for Java - Core (from https://github.com/ibm/ibm-cos-sdk-java)
 - Identity and Access Management (IAM) API v1-rev247-1.23.0 (from )
-- Identity and Access Management (IAM) API v1-rev247-1.23.0 (from )
 - IntelliJ IDEA Annotations (from http://www.jetbrains.org)
 - J2ObjC Annotations (from https://github.com/google/j2objc/)
 - JBoss Logging 3 (from http://www.jboss.org)
@@ -128,13 +105,11 @@ The following software have components provided under the terms of this license:
 - JSON Web Token support for the JVM (from https://github.com/jwtk/jjwt.git)
 - JSON library from Android SDK (from http://developer.android.com/sdk)
 - JSONassert (from https://github.com/skyscreamer/JSONassert)
-- Jackson (from http://jackson.codehaus.org)
 - Jackson 2 extensions to the Google HTTP Client Library for Java. (from https://github.com/google/google-http-java-client.git/google-http-client-jackson2)
 - Jackson dataformat: CBOR (from http://github.com/FasterXML/jackson-dataformats-binary)
 - Jackson dataformat: CBOR (from http://github.com/FasterXML/jackson-dataformats-binary)
 - Jackson datatype: JSR310 (from http://wiki.fasterxml.com/JacksonModuleJSR310)
 - Jackson datatype: JSR310 (from http://wiki.fasterxml.com/JacksonModuleJSR310)
-- Jackson extensions to the Google HTTP Client Library for Java. (from )
 - Jackson-annotations (from http://github.com/FasterXML/jackson)
 - Jackson-annotations (from http://github.com/FasterXML/jackson)
 - Jackson-core (from https://github.com/FasterXML/jackson-core)
@@ -154,8 +129,8 @@ The following software have components provided under the terms of this license:
 - Jakarta Bean Validation API (from https://beanvalidation.org)
 - Java Native Access (from https://github.com/java-native-access/jna)
 - Java Native Access Platform (from https://github.com/java-native-access/jna)
-- Java Servlet API (from http://servlet-spec.java.net)
 - Java Servlet API (from https://projects.eclipse.org/projects/ee4j.servlet)
+- Java Servlet API (from http://servlet-spec.java.net)
 - Java UUID Generator (from http://wiki.fasterxml.com/JugHome)
 - Javassist (from http://www.javassist.org/)
 - Javassist (from http://www.javassist.org/)
@@ -169,8 +144,6 @@ The following software have components provided under the terms of this license:
 - KeePassJava2 :: KDBX (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2-kdbx)
 - KeePassJava2 :: Simple (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2-simple)
 - Logback Contrib :: JSON :: Classic (from )
-- Logback Contrib :: JSON :: Core (from )
-- Logback Contrib :: Jackson (from )
 - Lucene Common Analyzers (from )
 - Lucene Core (from )
 - Lucene Grouping (from )
@@ -222,15 +195,11 @@ The following software have components provided under the terms of this license:
 - Netty/Transport (from http://netty.io/)
 - Netty/Transport/Native/Unix/Common (from )
 - Netty/Transport/Native/Unix/Common (from )
-- Nimbus Content Type (from https://bitbucket.org/connect2id/nimbus-content-type)
-- Nimbus JOSE+JWT (from https://bitbucket.org/connect2id/nimbus-jose-jwt)
 - Nimbus JOSE+JWT (from https://bitbucket.org/connect2id/nimbus-jose-jwt)
 - 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)
 - 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)
 - OkHttp (from )
 - OkHttp (from )
@@ -242,10 +211,8 @@ The following software have components provided under the terms of this license:
 - 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)
-- OpenCensus (from https://github.com/census-instrumentation/opencensus-java)
 - PWDB :: Database (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/database)
 - PowerMock (from http://www.powermock.org)
-- Protocol Buffer extensions to the Google HTTP Client Library for Java. (from )
 - QpidJMS Client (from )
 - Reactive Streams Netty driver (from https://github.com/reactor/reactor-netty)
 - Retrofit (from )
@@ -327,32 +294,16 @@ The following software have components provided under the terms of this license:
 - aws-ssm-java-caching-client (from https://github.com/awslabs/aws-ssm-java-caching-client)
 - brave (from )
 - cli (from https://github.com/elastic/elasticsearch)
-- com.google.api.grpc:grpc-google-cloud-pubsub-v1 (from https://github.com/googleapis/googleapis)
-- com.google.api.grpc:proto-google-cloud-logging-v2 (from https://github.com/googleapis/googleapis)
-- com.google.api.grpc:proto-google-cloud-pubsub-v1 (from https://github.com/googleapis/googleapis)
 - com.google.api.grpc:proto-google-common-protos (from https://github.com/googleapis/googleapis)
-- com.google.api.grpc:proto-google-common-protos (from https://github.com/googleapis/googleapis)
-- com.google.api.grpc:proto-google-iam-v1 (from https://github.com/googleapis/googleapis)
 - compiler (from http://github.com/spullara/mustache.java)
-- datastore-v1-proto-client (from )
 - elasticsearch-core (from https://github.com/elastic/elasticsearch)
 - error-prone annotations (from )
-- error-prone annotations (from )
-- io.grpc:grpc-alts (from https://github.com/grpc/grpc-java)
-- io.grpc:grpc-api (from https://github.com/grpc/grpc-java)
-- io.grpc:grpc-auth (from https://github.com/grpc/grpc-java)
 - io.grpc:grpc-context (from https://github.com/grpc/grpc-java)
 - io.grpc:grpc-core (from https://github.com/grpc/grpc-java)
-- io.grpc:grpc-core (from https://github.com/grpc/grpc-java)
-- io.grpc:grpc-grpclb (from https://github.com/grpc/grpc-java)
-- io.grpc:grpc-netty-shaded (from https://github.com/grpc/grpc-java)
 - io.grpc:grpc-netty-shaded (from https://github.com/grpc/grpc-java)
 - io.grpc:grpc-protobuf (from https://github.com/grpc/grpc-java)
-- io.grpc:grpc-protobuf (from https://github.com/grpc/grpc-java)
-- io.grpc:grpc-protobuf-lite (from https://github.com/grpc/grpc-java)
 - io.grpc:grpc-protobuf-lite (from https://github.com/grpc/grpc-java)
 - io.grpc:grpc-stub (from https://github.com/grpc/grpc-java)
-- 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://github.com/FasterXML/jackson)
@@ -378,7 +329,6 @@ The following software have components provided under the terms of this license:
 - powermock-module-junit4 (from http://www.powermock.org)
 - powermock-module-junit4-common (from )
 - powermock-reflect (from )
-- proto-google-cloud-datastore-v1 (from https://github.com/googleapis/api-client-staging)
 - proton-j (from )
 - rank-eval (from https://github.com/elastic/elasticsearch)
 - rest (from https://github.com/elastic/elasticsearch)
@@ -404,10 +354,8 @@ The following software have components provided under the terms of this license:
 - swagger-annotations (from )
 - swagger-jaxrs (from )
 - swagger-models (from )
-- tomcat-embed-core (from http://tomcat.apache.org/)
 - tomcat-embed-el (from http://tomcat.apache.org/)
 - tomcat-embed-el (from http://tomcat.apache.org/)
-- tomcat-embed-websocket (from http://tomcat.apache.org/)
 - x-content (from https://github.com/elastic/elasticsearch)
 
 ========================================================================
@@ -415,10 +363,6 @@ BSD-2-Clause
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- API Common (from https://github.com/googleapis)
-- GAX (Google Api eXtensions) (from https://github.com/googleapis)
-- GAX (Google Api eXtensions) (from https://github.com/googleapis)
-- GAX (Google Api eXtensions) (from https://github.com/googleapis)
 - Hamcrest Core (from http://hamcrest.org/)
 - Lucene Common Analyzers (from )
 - Stax2 API (from http://github.com/FasterXML/stax2-api)
@@ -428,15 +372,9 @@ BSD-3-Clause
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- API Common (from https://github.com/googleapis)
 - ASM Core (from )
 - Apache Commons Codec (from http://commons.apache.org/proper/commons-codec/)
-- GAX (Google Api eXtensions) (from https://github.com/googleapis)
-- GAX (Google Api eXtensions) (from https://github.com/googleapis)
-- GAX (Google Api eXtensions) (from https://github.com/googleapis)
 - Google APIs Client Library for Java (from )
-- Google Auth Library for Java - Credentials (from )
-- Google Auth Library for Java - OAuth2 HTTP (from )
 - Hamcrest library (from )
 - Lucene Common Analyzers (from )
 - Lucene Core (from )
@@ -448,14 +386,11 @@ The following software have components provided under the terms of this license:
 - Netty/Codec/HTTP (from )
 - Netty/Codec/HTTP (from )
 - Protocol Buffer Java API (from https://developers.google.com/protocol-buffers/)
-- Protocol Buffer Java API (from https://developers.google.com/protocol-buffers/)
-- Protocol Buffers [Util] (from )
 - Reflections (from http://github.com/ronmamo/reflections)
 - SnakeYAML (from http://www.snakeyaml.org)
 - Spring Core (from https://github.com/spring-projects/spring-framework)
 - Spring Core (from https://github.com/spring-projects/spring-framework)
 - Stax2 API (from http://github.com/FasterXML/stax2-api)
-- ThreeTen backport (from https://www.threeten.org/threetenbp)
 
 ========================================================================
 CC-BY-2.5
@@ -508,7 +443,6 @@ The following software have components provided under the terms of this license:
 - JavaBeans Activation Framework (from )
 - JavaBeans(TM) Activation Framework (from http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp)
 - JavaMail API (from )
-- tomcat-embed-core (from http://tomcat.apache.org/)
 
 ========================================================================
 CPL-1.0
@@ -527,8 +461,6 @@ The following software have components provided under the terms of this license:
 - Java Servlet API (from https://projects.eclipse.org/projects/ee4j.servlet)
 - Logback Classic Module (from )
 - Logback Contrib :: JSON :: Classic (from )
-- Logback Contrib :: JSON :: Core (from )
-- Logback Contrib :: Jackson (from )
 - Logback Core Module (from )
 - Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java)
 - Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java)
@@ -571,7 +503,6 @@ The following software have components provided under the terms of this license:
 - Old JAXB Core (from )
 - Old JAXB Runtime (from )
 - javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
-- tomcat-embed-core (from http://tomcat.apache.org/)
 
 ========================================================================
 GPL-2.0-or-later
@@ -599,7 +530,6 @@ The following software have components provided under the terms of this license:
 - Old JAXB Core (from )
 - Old JAXB Runtime (from )
 - javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
-- tomcat-embed-core (from http://tomcat.apache.org/)
 
 ========================================================================
 GPL-3.0-only
@@ -632,8 +562,6 @@ The following software have components provided under the terms of this license:
 - Javassist (from http://www.javassist.org/)
 - Logback Classic Module (from )
 - Logback Contrib :: JSON :: Classic (from )
-- Logback Contrib :: JSON :: Core (from )
-- Logback Contrib :: Jackson (from )
 - Logback Core Module (from )
 - Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java)
 - Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java)
@@ -669,14 +597,12 @@ The following software have components provided under the terms of this license:
 - Azure Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
 - Azure Spring Boot AutoConfigure (from https://github.com/Azure/azure-sdk-for-java)
 - Checker Qual (from https://checkerframework.org)
-- Checker Qual (from https://checkerframework.org)
 - Extensions on Apache Proton-J library (from https://github.com/Azure/qpid-proton-j-extensions)
 - JOpt Simple (from http://pholser.github.io/jopt-simple)
 - JUL to SLF4J bridge (from http://www.slf4j.org)
 - JUL to SLF4J bridge (from http://www.slf4j.org)
 - Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
 - Java JWT (from http://www.jwt.io)
-- Java JWT (from http://www.jwt.io)
 - Lucene Core (from )
 - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java)
 - Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java)
@@ -759,7 +685,6 @@ SPL-1.0
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- Checker Qual (from https://checkerframework.org)
 - Checker Qual (from https://checkerframework.org)
 
 ========================================================================
@@ -777,7 +702,6 @@ The following software have components provided under the terms of this license:
 - AWS Java SDK :: SDK Core (from https://aws.amazon.com/sdkforjava)
 - Asynchronous Http Client (from )
 - Guava: Google Core Libraries for Java (from https://github.com/google/guava.git)
-- Guava: Google Core Libraries for Java (from https://github.com/google/guava.git)
 - HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
 - Joda-Time (from http://www.joda.org/joda-time/)
 - Joda-Time (from http://www.joda.org/joda-time/)
@@ -799,7 +723,6 @@ unknown
 The following software have components provided under the terms of this license:
 
 - Byte Buddy (without dependencies) (from )
-- Checker Qual (from https://checkerframework.org)
 - Common Annotations 1.2 API (from )
 - JUnit (from http://junit.org)
 - JUnit Jupiter (Aggregator) (from https://junit.org/junit5/)
diff --git a/testing/notification-test-core/src/main/java/org/opengroup/osdu/notification/util/BaseTestTemplate.java b/testing/notification-test-core/src/main/java/org/opengroup/osdu/notification/util/BaseTestTemplate.java
index 8792991c580a08210a61326e527cbfca5c61459a..01a0be5de9ef90263eb40f6efd729e3919b72ddb 100644
--- a/testing/notification-test-core/src/main/java/org/opengroup/osdu/notification/util/BaseTestTemplate.java
+++ b/testing/notification-test-core/src/main/java/org/opengroup/osdu/notification/util/BaseTestTemplate.java
@@ -89,7 +89,7 @@ public abstract class BaseTestTemplate extends TestBase {
 
 			assertEquals(error(response.getStatus() == 204 ? "" : response.getEntity(String.class)), expectedOkResponseCode(), response.getStatus());
 			assertEquals("GET, POST, PUT, DELETE, OPTIONS, HEAD, PATCH", response.getHeaders().getFirst("Access-Control-Allow-Methods"));
-			assertEquals("origin, content-type, accept, authorization, data-partition-id, correlation-id, appkey", response.getHeaders().getFirst("Access-Control-Allow-Headers"));
+			assertEquals("access-control-allow-origin, origin, content-type, accept, authorization, data-partition-id, correlation-id, appkey", response.getHeaders().getFirst("Access-Control-Allow-Headers"));
 			assertEquals("*", response.getHeaders().getFirst("Access-Control-Allow-Origin"));
 			assertEquals("true", response.getHeaders().getFirst("Access-Control-Allow-Credentials"));
 			assertEquals("DENY", response.getHeaders().getFirst("X-Frame-Options"));