diff --git a/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/subscriptions/RecordUtils.java b/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/subscriptions/RecordUtils.java
index 3c14f0b4dc5c28d8a5d569be55aa8e2942c0e20a..adef2dece6f330791b0903c877a2d1a1c9f793ef 100644
--- a/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/subscriptions/RecordUtils.java
+++ b/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/subscriptions/RecordUtils.java
@@ -76,11 +76,10 @@ public class RecordUtils {
         return record;
     }
 
-    public static final String getAclSuffix(boolean isTestPartition) {
+    public static String getAclSuffix(boolean isTestPartition) {
         String environment = getEnvironment();
         //build.gradle currently throws exception if a variable is set to empty or not set at all
         //workaround by setting it to an "empty" string to construct the url
-        if (environment.equalsIgnoreCase("empty")) environment = "";
         if (!environment.isEmpty())
             environment = "." + environment;
 
diff --git a/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/subscriptions/TestNotificationsEndpoint.java b/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/subscriptions/TestNotificationsEndpoint.java
index 1e4f99832929084047c889f965c49f5cea4d6d62..d12632fa79cb10249df1e3bb21508cafedd0d217 100644
--- a/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/subscriptions/TestNotificationsEndpoint.java
+++ b/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/subscriptions/TestNotificationsEndpoint.java
@@ -52,8 +52,7 @@ public class TestNotificationsEndpoint extends TestBase {
 
     @After
     @Override
-    public void tearDown() throws Exception {
-        //LegalTagUtils.delete(LEGAL_TAG, testUtils.getOpsToken());
+    public void tearDown() {
         this.testUtils = null;
     }
 
@@ -124,10 +123,9 @@ public class TestNotificationsEndpoint extends TestBase {
             int exitValue = process.exitValue();
             assertEquals(exitValue, 1);
         } catch (Exception e) {
-            System.out.println("Error while verifying notification service" + Arrays.toString(e.getStackTrace()));
+            System.out.println("Error while verifying notification service. Error = " + e.getMessage() + " Stack Trace= " + Arrays.toString(e.getStackTrace()));
         } finally {
             awssubscriptionService.delete(subscriptionId);
-            LegalTagUtils.delete(LEGAL_TAG_TEST, testUtils.getOpsToken(), true);
         }
     }
 
@@ -149,10 +147,9 @@ public class TestNotificationsEndpoint extends TestBase {
             int exitValue = process.exitValue();
             assertEquals(exitValue, 0);
         } catch (Exception e) {
-            System.out.println("Error while verifying notification service" + Arrays.toString(e.getStackTrace()));
+            System.out.println("Error while verifying notification service. Error = " + e.getMessage() + " Stack Trace= " + Arrays.toString(e.getStackTrace()));
         } finally {
             awssubscriptionService.delete(subscriptionId);
-            LegalTagUtils.delete(LEGAL_TAG_TEST, testUtils.getOpsToken(), false);
         }
     }
 }