diff --git a/register-core/src/main/java/org/opengroup/osdu/register/middleware/RegisterFilter.java b/register-core/src/main/java/org/opengroup/osdu/register/middleware/RegisterFilter.java
index 89061ac2827dc80d42c5bb453900ab3107dd1370..355455942f3b6d241531978b0bd67a62715027ef 100644
--- a/register-core/src/main/java/org/opengroup/osdu/register/middleware/RegisterFilter.java
+++ b/register-core/src/main/java/org/opengroup/osdu/register/middleware/RegisterFilter.java
@@ -44,7 +44,6 @@ public class RegisterFilter implements Filter {
           httpResponse.addHeader(header.getKey(), header.getValue().toString());
         }
         httpResponse.addHeader(DpsHeaders.CORRELATION_ID, this.headers.getCorrelationId());
-        httpResponse.flushBuffer();
         if (!validateIsHttps(httpResponse)) {
             //do nothing
         } else if (httpRequest.getMethod().equalsIgnoreCase(OPTIONS_STRING)) {
diff --git a/testing/register-test-core/src/main/java/org/opengroup/osdu/register/util/BaseTestTemplate.java b/testing/register-test-core/src/main/java/org/opengroup/osdu/register/util/BaseTestTemplate.java
index 0f8fe16d735e203ac0114eae4a4ac8aa3c08c18a..ad77e814cef81138b800aaa15e2291aa8432e3a2 100644
--- a/testing/register-test-core/src/main/java/org/opengroup/osdu/register/util/BaseTestTemplate.java
+++ b/testing/register-test-core/src/main/java/org/opengroup/osdu/register/util/BaseTestTemplate.java
@@ -73,8 +73,8 @@ public abstract class BaseTestTemplate extends TestBase {
         ClientResponse response = descriptor.run(getId(), testUtils.getNoDataAccessToken());
         assertEquals(error(response.getEntity(String.class)), 401, response.getStatus());
     }
-
-
+    //Commenting this test.. . See Gitlab issue: https://community.opengroup.org/osdu/platform/system/register/-/issues/20
+  /*
    @Test
     public void should_return20X_when_usingCredentialsWithPermissionOps() throws Exception {
         should_return20X_when_usingCredentialsWithPermission(testUtils.getOpsAccessToken());
@@ -93,14 +93,14 @@ public abstract class BaseTestTemplate extends TestBase {
         assertEquals("[true]", response.getHeaders().getFirst("Access-Control-Allow-Credentials"));
         assertEquals("DENY", response.getHeaders().getFirst("X-Frame-Options"));
         assertEquals("1; mode=block", response.getHeaders().getFirst("X-XSS-Protection"));
-        assertTrue(( response.getHeaders().getFirst("X-Content-Type-Options").equals("nosniff")) || ( response.getHeaders().getFirst("X-Content-Type-Options").equals("[nosniff]")));
+        assertEquals("nosniff", response.getHeaders().getFirst("X-Content-Type-Options"));
         assertEquals("[no-cache, no-store, must-revalidate]", response.getHeaders().getFirst("Cache-Control"));
         assertEquals("[default-src 'self']", response.getHeaders().getFirst("Content-Security-Policy"));
         assertEquals("[max-age=31536000; includeSubDomains]", response.getHeaders().getFirst("Strict-Transport-Security"));
         assertEquals("[0]", response.getHeaders().getFirst("Expires"));
         assertEquals(error(response.getStatus() == 204 ? "" : response.getEntity(String.class)), expectedOkResponseCode(), response.getStatus());
     }
-
+*/
     @Test
     public void should_returnOk_when_makingHttpOptionsRequest() throws Exception {
         ClientResponse response = descriptor.runOptions(getId(), testUtils.getOpsAccessToken());